Free cookie consent management tool by TermsFeed Policy Generator

Changeset 11336 for stable


Ignore:
Timestamp:
09/03/14 15:07:47 (10 years ago)
Author:
mkommend
Message:

#2230: Merged r11298 into stable.

Location:
stable
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.ExtLibs

  • stable/HeuristicLab.ExtLibs.sln

    r11155 r11336  
    303303    {F2F242B0-9996-4B49-828D-2BFC5925FDE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    304304    {F2F242B0-9996-4B49-828D-2BFC5925FDE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
    305     {F2F242B0-9996-4B49-828D-2BFC5925FDE0}.Debug|x64.ActiveCfg = Debug|Any CPU
    306     {F2F242B0-9996-4B49-828D-2BFC5925FDE0}.Debug|x86.ActiveCfg = Debug|Any CPU
     305    {F2F242B0-9996-4B49-828D-2BFC5925FDE0}.Debug|x64.ActiveCfg = Debug|x64
     306    {F2F242B0-9996-4B49-828D-2BFC5925FDE0}.Debug|x64.Build.0 = Debug|x64
     307    {F2F242B0-9996-4B49-828D-2BFC5925FDE0}.Debug|x86.ActiveCfg = Debug|x86
     308    {F2F242B0-9996-4B49-828D-2BFC5925FDE0}.Debug|x86.Build.0 = Debug|x86
    307309    {F2F242B0-9996-4B49-828D-2BFC5925FDE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
    308310    {F2F242B0-9996-4B49-828D-2BFC5925FDE0}.Release|Any CPU.Build.0 = Release|Any CPU
    309     {F2F242B0-9996-4B49-828D-2BFC5925FDE0}.Release|x64.ActiveCfg = Release|Any CPU
    310     {F2F242B0-9996-4B49-828D-2BFC5925FDE0}.Release|x86.ActiveCfg = Release|Any CPU
     311    {F2F242B0-9996-4B49-828D-2BFC5925FDE0}.Release|x64.ActiveCfg = Release|x64
     312    {F2F242B0-9996-4B49-828D-2BFC5925FDE0}.Release|x64.Build.0 = Release|x64
     313    {F2F242B0-9996-4B49-828D-2BFC5925FDE0}.Release|x86.ActiveCfg = Release|x86
     314    {F2F242B0-9996-4B49-828D-2BFC5925FDE0}.Release|x86.Build.0 = Release|x86
    311315    {52C66DEA-0250-477B-97F8-5CD2CD4B7332}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    312316    {52C66DEA-0250-477B-97F8-5CD2CD4B7332}.Debug|Any CPU.Build.0 = Debug|Any CPU
    313     {52C66DEA-0250-477B-97F8-5CD2CD4B7332}.Debug|x64.ActiveCfg = Debug|Any CPU
    314     {52C66DEA-0250-477B-97F8-5CD2CD4B7332}.Debug|x86.ActiveCfg = Debug|Any CPU
     317    {52C66DEA-0250-477B-97F8-5CD2CD4B7332}.Debug|x64.ActiveCfg = Debug|x64
     318    {52C66DEA-0250-477B-97F8-5CD2CD4B7332}.Debug|x64.Build.0 = Debug|x64
     319    {52C66DEA-0250-477B-97F8-5CD2CD4B7332}.Debug|x86.ActiveCfg = Debug|x86
     320    {52C66DEA-0250-477B-97F8-5CD2CD4B7332}.Debug|x86.Build.0 = Debug|x86
    315321    {52C66DEA-0250-477B-97F8-5CD2CD4B7332}.Release|Any CPU.ActiveCfg = Release|Any CPU
    316322    {52C66DEA-0250-477B-97F8-5CD2CD4B7332}.Release|Any CPU.Build.0 = Release|Any CPU
    317     {52C66DEA-0250-477B-97F8-5CD2CD4B7332}.Release|x64.ActiveCfg = Release|Any CPU
    318     {52C66DEA-0250-477B-97F8-5CD2CD4B7332}.Release|x86.ActiveCfg = Release|Any CPU
     323    {52C66DEA-0250-477B-97F8-5CD2CD4B7332}.Release|x64.ActiveCfg = Release|x64
     324    {52C66DEA-0250-477B-97F8-5CD2CD4B7332}.Release|x64.Build.0 = Release|x64
     325    {52C66DEA-0250-477B-97F8-5CD2CD4B7332}.Release|x86.ActiveCfg = Release|x86
     326    {52C66DEA-0250-477B-97F8-5CD2CD4B7332}.Release|x86.Build.0 = Release|x86
    319327  EndGlobalSection
    320328  GlobalSection(SolutionProperties) = preSolution
  • stable/HeuristicLab.ExtLibs/HeuristicLab.DotNetScilab/1.0/HeuristicLab.DotNetScilab-1.0/HeuristicLab.DotNetScilab-1.0.csproj

    r11151 r11336  
    3636    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
    3737  </PropertyGroup>
     38  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     39    <DebugSymbols>true</DebugSymbols>
     40    <OutputPath>..\..\..\..\bin\</OutputPath>
     41    <DefineConstants>DEBUG;TRACE</DefineConstants>
     42    <DebugType>full</DebugType>
     43    <PlatformTarget>x64</PlatformTarget>
     44    <ErrorReport>prompt</ErrorReport>
     45    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     46  </PropertyGroup>
     47  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     48    <OutputPath>..\..\..\..\bin\</OutputPath>
     49    <DefineConstants>TRACE</DefineConstants>
     50    <Optimize>true</Optimize>
     51    <DebugType>pdbonly</DebugType>
     52    <PlatformTarget>x64</PlatformTarget>
     53    <ErrorReport>prompt</ErrorReport>
     54    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     55  </PropertyGroup>
     56  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     57    <DebugSymbols>true</DebugSymbols>
     58    <OutputPath>..\..\..\..\bin\</OutputPath>
     59    <DefineConstants>DEBUG;TRACE</DefineConstants>
     60    <DebugType>full</DebugType>
     61    <PlatformTarget>x86</PlatformTarget>
     62    <ErrorReport>prompt</ErrorReport>
     63    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     64  </PropertyGroup>
     65  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     66    <OutputPath>..\..\..\..\bin\</OutputPath>
     67    <DefineConstants>TRACE</DefineConstants>
     68    <Optimize>true</Optimize>
     69    <DebugType>pdbonly</DebugType>
     70    <PlatformTarget>x86</PlatformTarget>
     71    <ErrorReport>prompt</ErrorReport>
     72    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     73  </PropertyGroup>
    3874  <ItemGroup>
    3975    <Reference Include="System" />
     
    71107  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    72108  <PropertyGroup>
    73     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     109    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    74110set ProjectDir=$(ProjectDir)
    75111set SolutionDir=$(SolutionDir)
    76112set Outdir=$(Outdir)
    77113
    78 call PreBuildEvent.cmd</PreBuildEvent>
     114call PreBuildEvent.cmd
     115    </PreBuildEvent>
     116    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     117export ProjectDir=$(ProjectDir)
     118export SolutionDir=$(SolutionDir)
     119
     120$SolutionDir/PreBuildEvent.sh
     121    </PreBuildEvent>
    79122  </PropertyGroup>
    80123  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • stable/HeuristicLab.ExtLibs/HeuristicLab.MatlabConnector/1.0/HeuristicLab.MatlabConnector-1.0/HeuristicLab.MatlabConnector-1.0.csproj

    r11128 r11336  
    3535  <PropertyGroup>
    3636    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
     37  </PropertyGroup>
     38  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     39    <DebugSymbols>true</DebugSymbols>
     40    <OutputPath>..\..\..\..\bin\</OutputPath>
     41    <DefineConstants>DEBUG;TRACE</DefineConstants>
     42    <DebugType>full</DebugType>
     43    <PlatformTarget>x64</PlatformTarget>
     44    <ErrorReport>prompt</ErrorReport>
     45    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     46  </PropertyGroup>
     47  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     48    <OutputPath>..\..\..\..\bin\</OutputPath>
     49    <DefineConstants>TRACE</DefineConstants>
     50    <Optimize>true</Optimize>
     51    <DebugType>pdbonly</DebugType>
     52    <PlatformTarget>x64</PlatformTarget>
     53    <ErrorReport>prompt</ErrorReport>
     54    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     55  </PropertyGroup>
     56  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     57    <DebugSymbols>true</DebugSymbols>
     58    <OutputPath>..\..\..\..\bin\</OutputPath>
     59    <DefineConstants>DEBUG;TRACE</DefineConstants>
     60    <DebugType>full</DebugType>
     61    <PlatformTarget>x86</PlatformTarget>
     62    <ErrorReport>prompt</ErrorReport>
     63    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     64  </PropertyGroup>
     65  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     66    <OutputPath>..\..\..\..\bin\</OutputPath>
     67    <DefineConstants>TRACE</DefineConstants>
     68    <Optimize>true</Optimize>
     69    <DebugType>pdbonly</DebugType>
     70    <PlatformTarget>x86</PlatformTarget>
     71    <ErrorReport>prompt</ErrorReport>
     72    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    3773  </PropertyGroup>
    3874  <ItemGroup>
Note: See TracChangeset for help on using the changeset viewer.