Free cookie consent management tool by TermsFeed Policy Generator

Changeset 12650


Ignore:
Timestamp:
07/07/15 14:54:44 (9 years ago)
Author:
abeham
Message:

#2319: integrated into trunk

Location:
trunk/sources
Files:
1 edited
17 copied

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab 3.3.sln

    r12629 r12650  
    7575    {3B90F866-70F8-43EF-A541-51819D255B7B} = {3B90F866-70F8-43EF-A541-51819D255B7B}
    7676    {07486E68-1517-4B9D-A58D-A38E99AE71AB} = {07486E68-1517-4B9D-A58D-A38E99AE71AB}
     77    {BE698769-975A-429E-828C-72BB2B6182C8} = {BE698769-975A-429E-828C-72BB2B6182C8}
    7778    {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5} = {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}
    7879    {56F9106A-079F-4C61-92F6-86A84C2D84B7} = {56F9106A-079F-4C61-92F6-86A84C2D84B7}
     
    422423EndProject
    423424Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.CMAEvolutionStrategy-3.4", "HeuristicLab.Algorithms.CMAEvolutionStrategy\3.4\HeuristicLab.Algorithms.CMAEvolutionStrategy-3.4.csproj", "{291010E4-2F4E-4D29-A795-753CFF293FDB}"
     425EndProject
     426Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Encodings.LinearLinkageEncoding-3.3", "HeuristicLab.Encodings.LinearLinkageEncoding\3.3\HeuristicLab.Encodings.LinearLinkageEncoding-3.3.csproj", "{BE698769-975A-429E-828C-72BB2B6182C8}"
    424427EndProject
    425428Global
     
    20532056    {291010E4-2F4E-4D29-A795-753CFF293FDB}.Release|x86.ActiveCfg = Release|x86
    20542057    {291010E4-2F4E-4D29-A795-753CFF293FDB}.Release|x86.Build.0 = Release|x86
     2058    {BE698769-975A-429E-828C-72BB2B6182C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2059    {BE698769-975A-429E-828C-72BB2B6182C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
     2060    {BE698769-975A-429E-828C-72BB2B6182C8}.Debug|x64.ActiveCfg = Debug|x64
     2061    {BE698769-975A-429E-828C-72BB2B6182C8}.Debug|x64.Build.0 = Debug|x64
     2062    {BE698769-975A-429E-828C-72BB2B6182C8}.Debug|x86.ActiveCfg = Debug|x86
     2063    {BE698769-975A-429E-828C-72BB2B6182C8}.Debug|x86.Build.0 = Debug|x86
     2064    {BE698769-975A-429E-828C-72BB2B6182C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
     2065    {BE698769-975A-429E-828C-72BB2B6182C8}.Release|Any CPU.Build.0 = Release|Any CPU
     2066    {BE698769-975A-429E-828C-72BB2B6182C8}.Release|x64.ActiveCfg = Release|x64
     2067    {BE698769-975A-429E-828C-72BB2B6182C8}.Release|x64.Build.0 = Release|x64
     2068    {BE698769-975A-429E-828C-72BB2B6182C8}.Release|x86.ActiveCfg = Release|x86
     2069    {BE698769-975A-429E-828C-72BB2B6182C8}.Release|x86.Build.0 = Release|x86
    20552070  EndGlobalSection
    20562071  GlobalSection(SolutionProperties) = preSolution
  • trunk/sources/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/HeuristicLab.Encodings.LinearLinkageEncoding-3.3.csproj

    r12643 r12650  
    1717    <DebugType>full</DebugType>
    1818    <Optimize>false</Optimize>
    19     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     19    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    2020    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2121    <ErrorReport>prompt</ErrorReport>
    2222    <WarningLevel>4</WarningLevel>
     23    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     24    <Prefer32Bit>false</Prefer32Bit>
    2325  </PropertyGroup>
    2426  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    2527    <DebugType>pdbonly</DebugType>
    2628    <Optimize>true</Optimize>
    27     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     29    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    2830    <DefineConstants>TRACE</DefineConstants>
    2931    <ErrorReport>prompt</ErrorReport>
    3032    <WarningLevel>4</WarningLevel>
     33    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     34    <DocumentationFile>
     35    </DocumentationFile>
     36    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     37    <Prefer32Bit>false</Prefer32Bit>
     38  </PropertyGroup>
     39  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     40    <DebugSymbols>true</DebugSymbols>
     41    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     42    <DefineConstants>DEBUG;TRACE</DefineConstants>
     43    <DebugType>full</DebugType>
     44    <PlatformTarget>x86</PlatformTarget>
     45    <ErrorReport>prompt</ErrorReport>
     46    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     47    <Prefer32Bit>false</Prefer32Bit>
     48  </PropertyGroup>
     49  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     50    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     51    <DefineConstants>TRACE</DefineConstants>
     52    <DocumentationFile>
     53    </DocumentationFile>
     54    <Optimize>true</Optimize>
     55    <DebugType>pdbonly</DebugType>
     56    <PlatformTarget>x86</PlatformTarget>
     57    <ErrorReport>prompt</ErrorReport>
     58    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     59    <Prefer32Bit>false</Prefer32Bit>
     60  </PropertyGroup>
     61  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     62    <DebugSymbols>true</DebugSymbols>
     63    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     64    <DefineConstants>DEBUG;TRACE</DefineConstants>
     65    <DebugType>full</DebugType>
     66    <PlatformTarget>x64</PlatformTarget>
     67    <ErrorReport>prompt</ErrorReport>
     68    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     69    <Prefer32Bit>false</Prefer32Bit>
     70  </PropertyGroup>
     71  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     72    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     73    <DefineConstants>TRACE</DefineConstants>
     74    <DocumentationFile>
     75    </DocumentationFile>
     76    <Optimize>true</Optimize>
     77    <DebugType>pdbonly</DebugType>
     78    <PlatformTarget>x64</PlatformTarget>
     79    <ErrorReport>prompt</ErrorReport>
     80    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     81    <Prefer32Bit>false</Prefer32Bit>
    3182  </PropertyGroup>
    3283  <PropertyGroup>
     
    3788  </PropertyGroup>
    3889  <ItemGroup>
    39     <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    40       <SpecificVersion>False</SpecificVersion>
    41       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
    42       <Private>False</Private>
    43     </Reference>
    44     <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    45       <SpecificVersion>False</SpecificVersion>
    46       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
    47       <Private>False</Private>
    48     </Reference>
    49     <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    50       <SpecificVersion>False</SpecificVersion>
    51       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
    52       <Private>False</Private>
    53     </Reference>
    54     <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    55       <SpecificVersion>False</SpecificVersion>
    56       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
    57       <Private>False</Private>
    58     </Reference>
    59     <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    60       <SpecificVersion>False</SpecificVersion>
    61       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
    62       <Private>False</Private>
    63     </Reference>
    64     <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    65       <SpecificVersion>False</SpecificVersion>
    66       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
    67       <Private>False</Private>
    68     </Reference>
    69     <Reference Include="HeuristicLab.Optimization.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    70       <SpecificVersion>False</SpecificVersion>
    71       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
    72       <Private>False</Private>
    73     </Reference>
    74     <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    75       <SpecificVersion>False</SpecificVersion>
    76       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
    77       <Private>False</Private>
    78     </Reference>
    79     <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    80       <SpecificVersion>False</SpecificVersion>
    81       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
    82       <Private>False</Private>
    83     </Reference>
    84     <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    85       <SpecificVersion>False</SpecificVersion>
    86       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    87       <Private>False</Private>
    88     </Reference>
    89     <Reference Include="HeuristicLab.Random-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    90       <SpecificVersion>False</SpecificVersion>
    91       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>
    92       <Private>False</Private>
    93     </Reference>
     90    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     91      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
     92      <Name>HeuristicLab.Collections-3.3</Name>
     93      <Private>False</Private>
     94    </ProjectReference>
     95    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     96      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
     97      <Name>HeuristicLab.Common-3.3</Name>
     98      <Private>False</Private>
     99    </ProjectReference>
     100    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     101      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
     102      <Name>HeuristicLab.Core-3.3</Name>
     103      <Private>False</Private>
     104    </ProjectReference>
     105    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     106      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     107      <Name>HeuristicLab.Data-3.3</Name>
     108      <Private>False</Private>
     109    </ProjectReference>
     110    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
     111      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
     112      <Name>HeuristicLab.Operators-3.3</Name>
     113      <Private>False</Private>
     114    </ProjectReference>
     115    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
     116      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
     117      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
     118      <Private>False</Private>
     119    </ProjectReference>
     120    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     121      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
     122      <Name>HeuristicLab.Optimization-3.3</Name>
     123      <Private>False</Private>
     124    </ProjectReference>
     125    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     126      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
     127      <Name>HeuristicLab.Parameters-3.3</Name>
     128      <Private>False</Private>
     129    </ProjectReference>
     130    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     131      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
     132      <Name>HeuristicLab.Persistence-3.3</Name>
     133      <Private>False</Private>
     134    </ProjectReference>
     135    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     136      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     137      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     138      <Private>False</Private>
     139    </ProjectReference>
     140    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
     141      <Project>{f4539fb6-4708-40c9-be64-0a1390aea197}</Project>
     142      <Name>HeuristicLab.Random-3.3</Name>
     143      <Private>False</Private>
     144    </ProjectReference>
     145  </ItemGroup>
     146  <ItemGroup>
    94147    <Reference Include="System" />
    95148    <Reference Include="System.Core" />
     
    144197  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    145198  <PropertyGroup>
    146     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     199    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    147200set ProjectDir=$(ProjectDir)
    148201set SolutionDir=$(SolutionDir)
    149202set Outdir=$(Outdir)
    150203
    151 call PreBuildEvent.cmd</PreBuildEvent>
     204call PreBuildEvent.cmd
     205    </PreBuildEvent>
     206    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     207export ProjectDir=$(ProjectDir)
     208export SolutionDir=$(SolutionDir)
     209
     210$SolutionDir/PreBuildEvent.sh
     211    </PreBuildEvent>
    152212  </PropertyGroup>
    153213  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Note: See TracChangeset for help on using the changeset viewer.