Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/10/14 10:31:41 (10 years ago)
Author:
pfleck
Message:

#2269 Merged trunk. Updated .net version of ALPS plugin.

Location:
branches/ALPS
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/ALPS

  • branches/ALPS/HeuristicLab.Tracing/3.3/HeuristicLab.Tracing-3.3.csproj

    r8600 r11677  
    1111    <RootNamespace>HeuristicLab.Tracing</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Tracing-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    1414    <TargetFrameworkProfile>
    1515    </TargetFrameworkProfile>
     
    4646    <WarningLevel>4</WarningLevel>
    4747    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     48    <Prefer32Bit>false</Prefer32Bit>
    4849  </PropertyGroup>
    4950  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     
    5758    </DocumentationFile>
    5859    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     60    <Prefer32Bit>false</Prefer32Bit>
    5961  </PropertyGroup>
    6062  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     
    6668    <ErrorReport>prompt</ErrorReport>
    6769    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     70    <Prefer32Bit>false</Prefer32Bit>
    6871  </PropertyGroup>
    6972  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     
    7780    </DocumentationFile>
    7881    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     82    <Prefer32Bit>false</Prefer32Bit>
    7983  </PropertyGroup>
    8084  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     
    8690    <ErrorReport>prompt</ErrorReport>
    8791    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     92    <Prefer32Bit>false</Prefer32Bit>
    8893  </PropertyGroup>
    8994  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     
    97102    </DocumentationFile>
    98103    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     104    <Prefer32Bit>false</Prefer32Bit>
    99105  </PropertyGroup>
    100106  <ItemGroup>
     
    156162  -->
    157163  <PropertyGroup>
    158    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     164    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    159165set ProjectDir=$(ProjectDir)
    160166set SolutionDir=$(SolutionDir)
     
    163169call PreBuildEvent.cmd
    164170</PreBuildEvent>
    165 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     171    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    166172export ProjectDir=$(ProjectDir)
    167173export SolutionDir=$(SolutionDir)
  • branches/ALPS/HeuristicLab.Tracing/3.3/app.config

    r6179 r11677  
    44    <trace autoflush="true" indentsize="4">
    55      <listeners>
    6         <add name="HeuristicLabListener"
    7           type="System.Diagnostics.TextWriterTraceListener"
    8           initializeData="HeuristicLab.log" />
    9         <remove name="Default" />
     6        <add name="HeuristicLabListener" type="System.Diagnostics.TextWriterTraceListener" initializeData="HeuristicLab.log"/>
     7        <remove name="Default"/>
    108      </listeners>
    119    </trace>
    1210  </system.diagnostics>
    13 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
     11<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
Note: See TracChangeset for help on using the changeset viewer.