Ignore:
Timestamp:
02/05/15 17:37:03 (6 years ago)
Author:
ascheibe
Message:

#2280 merged r11623, r11631, r11634 into stable

Location:
stable
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Clients.Common/3.3/HeuristicLab.Clients.Common-3.3.csproj

    r8600 r11920  
    1111    <RootNamespace>HeuristicLab.Clients.Common</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Clients.Common-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    1414    <TargetFrameworkProfile>
    1515    </TargetFrameworkProfile>
     
    2525    <ErrorReport>prompt</ErrorReport>
    2626    <WarningLevel>4</WarningLevel>
     27    <Prefer32Bit>false</Prefer32Bit>
    2728  </PropertyGroup>
    2829  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     
    3334    <ErrorReport>prompt</ErrorReport>
    3435    <WarningLevel>4</WarningLevel>
     36    <Prefer32Bit>false</Prefer32Bit>
    3537  </PropertyGroup>
    3638  <PropertyGroup>
     
    5658    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
    5759    <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
     60    <Prefer32Bit>false</Prefer32Bit>
    5861  </PropertyGroup>
    5962  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     
    7275    <CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    7376    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
     77    <Prefer32Bit>false</Prefer32Bit>
    7478  </PropertyGroup>
    7579  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     
    8791    <CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    8892    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
     93    <Prefer32Bit>false</Prefer32Bit>
    8994  </PropertyGroup>
    9095  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     
    103108    <CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    104109    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
     110    <Prefer32Bit>false</Prefer32Bit>
    105111  </PropertyGroup>
    106112  <ItemGroup>
     
    108114    <Reference Include="System.Core" />
    109115    <Reference Include="System.Drawing" />
     116    <Reference Include="System.IdentityModel" />
    110117    <Reference Include="System.Security" />
    111118    <Reference Include="System.ServiceModel" />
     
    152159  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    153160  <PropertyGroup>
    154    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     161    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    155162set ProjectDir=$(ProjectDir)
    156163set SolutionDir=$(SolutionDir)
     
    159166call PreBuildEvent.cmd
    160167</PreBuildEvent>
    161 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     168    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    162169export ProjectDir=$(ProjectDir)
    163170export SolutionDir=$(SolutionDir)
  • stable/HeuristicLab.Clients.Common/3.3/Properties/Settings.Designer.cs

    r7690 r11920  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:4.0.30319.530
     4//     Runtime Version:4.0.30319.34014
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
     
    1313   
    1414    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    15     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
     15    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
    1616    public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
    1717       
  • stable/HeuristicLab.Clients.Common/3.3/app.config

    r7690 r11920  
    1 <?xml version="1.0" encoding="utf-8" ?>
     1<?xml version="1.0" encoding="utf-8"?>
    22<configuration>
    33    <configSections>
    4         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
    5             <section name="HeuristicLab.Clients.Common.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
     4        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     5            <section name="HeuristicLab.Clients.Common.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
    66        </sectionGroup>
    77    </configSections>
     
    1919        </HeuristicLab.Clients.Common.Properties.Settings>
    2020    </userSettings>
    21 </configuration>
     21<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
Note: See TracChangeset for help on using the changeset viewer.