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

#2280 merged r11623, r11631, r11634 into stable

Location:
stable
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Services.OKB.DataAccess/3.3/HeuristicLab.Services.OKB.DataAccess-3.3.csproj

    r8600 r11920  
    1111    <RootNamespace>HeuristicLab.Services.OKB.DataAccess</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Services.OKB.DataAccess-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    1515    <FileUpgradeFlags>
     
    4343    <WarningLevel>4</WarningLevel>
    4444    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     45    <Prefer32Bit>false</Prefer32Bit>
    4546  </PropertyGroup>
    4647  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     
    5455    </DocumentationFile>
    5556    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     57    <Prefer32Bit>false</Prefer32Bit>
    5658  </PropertyGroup>
    5759  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     
    6365    <ErrorReport>prompt</ErrorReport>
    6466    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     67    <Prefer32Bit>false</Prefer32Bit>
    6568  </PropertyGroup>
    6669  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     
    7477    <ErrorReport>prompt</ErrorReport>
    7578    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     79    <Prefer32Bit>false</Prefer32Bit>
    7680  </PropertyGroup>
    7781  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     
    8387    <ErrorReport>prompt</ErrorReport>
    8488    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     89    <Prefer32Bit>false</Prefer32Bit>
    8590  </PropertyGroup>
    8691  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     
    9499    <ErrorReport>prompt</ErrorReport>
    95100    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     101    <Prefer32Bit>false</Prefer32Bit>
    96102  </PropertyGroup>
    97103  <PropertyGroup>
     
    190196  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    191197  <PropertyGroup>
    192    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     198    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    193199set ProjectDir=$(ProjectDir)
    194200set SolutionDir=$(SolutionDir)
     
    196202
    197203call PreBuildEvent.cmd</PreBuildEvent>
    198 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     204    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    199205export ProjectDir=$(ProjectDir)
    200206export SolutionDir=$(SolutionDir)
  • stable/HeuristicLab.Services.OKB.DataAccess/3.3/OKB.designer.cs

    r8049 r11920  
    33// <auto-generated>
    44//     This code was generated by a tool.
    5 //     Runtime Version:4.0.30319.239
     5//     Runtime Version:4.0.30319.34014
    66//
    77//     Changes to this file may cause incorrect behavior and will be lost if
  • stable/HeuristicLab.Services.OKB.DataAccess/3.3/Properties/Settings.Designer.cs

    r8049 r11920  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:4.0.30319.1
     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.Services.OKB.DataAccess/3.3/app.config

    r8049 r11920  
    44  </configSections>
    55  <connectionStrings>
    6     <add name="HeuristicLab.Services.OKB.DataAccess.Properties.Settings.OKBConnectionString"
    7          connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB"
    8          providerName="System.Data.SqlClient" />
     6    <add name="HeuristicLab.Services.OKB.DataAccess.Properties.Settings.OKBConnectionString" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.OKB" providerName="System.Data.SqlClient"/>
    97  </connectionStrings>
    10 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
     8<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
Note: See TracChangeset for help on using the changeset viewer.