Changeset 12732


Ignore:
Timestamp:
07/11/15 19:29:32 (5 years ago)
Author:
abeham
Message:

#2420: merged 12657,12671 to stable

Location:
stable
Files:
2 deleted
6 edited
3 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.ExtLibs

  • stable/HeuristicLab.ExtLibs.sln

    r12707 r12732  
    6868EndProject
    6969Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.EPPlus-4.0.3", "HeuristicLab.ExtLibs\HeuristicLab.EPPlus\4.0.3\HeuristicLab.EPPlus-4.0.3\HeuristicLab.EPPlus-4.0.3.csproj", "{675A6EE4-DE7C-413E-8BEF-EB21E0384C87}"
     70EndProject
     71Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimSharp-3.0.7", "HeuristicLab.ExtLibs\HeuristicLab.SimSharp\3.0.7\SimSharp-3.0.7\SimSharp-3.0.7.csproj", "{9FE9C740-7859-4D01-AD07-7D4E15A6320B}"
     72EndProject
     73Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.SimSharp-3.0.7", "HeuristicLab.ExtLibs\HeuristicLab.SimSharp\3.0.7\HeuristicLab.SimSharp-3.0.7\HeuristicLab.SimSharp-3.0.7.csproj", "{5C93CAF7-AE6A-4540-95B2-5DA6761A2677}"
    7074EndProject
    7175Global
     
    439443    {675A6EE4-DE7C-413E-8BEF-EB21E0384C87}.Release|x86.ActiveCfg = Release|x86
    440444    {675A6EE4-DE7C-413E-8BEF-EB21E0384C87}.Release|x86.Build.0 = Release|x86
     445    {9FE9C740-7859-4D01-AD07-7D4E15A6320B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     446    {9FE9C740-7859-4D01-AD07-7D4E15A6320B}.Debug|Any CPU.Build.0 = Debug|Any CPU
     447    {9FE9C740-7859-4D01-AD07-7D4E15A6320B}.Debug|x64.ActiveCfg = Debug|x64
     448    {9FE9C740-7859-4D01-AD07-7D4E15A6320B}.Debug|x64.Build.0 = Debug|x64
     449    {9FE9C740-7859-4D01-AD07-7D4E15A6320B}.Debug|x86.ActiveCfg = Debug|x86
     450    {9FE9C740-7859-4D01-AD07-7D4E15A6320B}.Debug|x86.Build.0 = Debug|x86
     451    {9FE9C740-7859-4D01-AD07-7D4E15A6320B}.Release|Any CPU.ActiveCfg = Release|Any CPU
     452    {9FE9C740-7859-4D01-AD07-7D4E15A6320B}.Release|Any CPU.Build.0 = Release|Any CPU
     453    {9FE9C740-7859-4D01-AD07-7D4E15A6320B}.Release|x64.ActiveCfg = Release|x64
     454    {9FE9C740-7859-4D01-AD07-7D4E15A6320B}.Release|x64.Build.0 = Release|x64
     455    {9FE9C740-7859-4D01-AD07-7D4E15A6320B}.Release|x86.ActiveCfg = Release|x86
     456    {9FE9C740-7859-4D01-AD07-7D4E15A6320B}.Release|x86.Build.0 = Release|x86
     457    {5C93CAF7-AE6A-4540-95B2-5DA6761A2677}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     458    {5C93CAF7-AE6A-4540-95B2-5DA6761A2677}.Debug|Any CPU.Build.0 = Debug|Any CPU
     459    {5C93CAF7-AE6A-4540-95B2-5DA6761A2677}.Debug|x64.ActiveCfg = Debug|x64
     460    {5C93CAF7-AE6A-4540-95B2-5DA6761A2677}.Debug|x64.Build.0 = Debug|x64
     461    {5C93CAF7-AE6A-4540-95B2-5DA6761A2677}.Debug|x86.ActiveCfg = Debug|x86
     462    {5C93CAF7-AE6A-4540-95B2-5DA6761A2677}.Debug|x86.Build.0 = Debug|x86
     463    {5C93CAF7-AE6A-4540-95B2-5DA6761A2677}.Release|Any CPU.ActiveCfg = Release|Any CPU
     464    {5C93CAF7-AE6A-4540-95B2-5DA6761A2677}.Release|Any CPU.Build.0 = Release|Any CPU
     465    {5C93CAF7-AE6A-4540-95B2-5DA6761A2677}.Release|x64.ActiveCfg = Release|x64
     466    {5C93CAF7-AE6A-4540-95B2-5DA6761A2677}.Release|x64.Build.0 = Release|x64
     467    {5C93CAF7-AE6A-4540-95B2-5DA6761A2677}.Release|x86.ActiveCfg = Release|x86
     468    {5C93CAF7-AE6A-4540-95B2-5DA6761A2677}.Release|x86.Build.0 = Release|x86
    441469  EndGlobalSection
    442470  GlobalSection(SolutionProperties) = preSolution
  • stable/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.7/HeuristicLab.SimSharp-3.0.7

    • Property svn:ignore
      •  

        old new  
        22bin
        33*.user
         4Plugin.cs
  • stable/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.7/HeuristicLab.SimSharp-3.0.7/HeuristicLab.SimSharp-3.0.7.csproj

    r12657 r12732  
    7878  </ItemGroup>
    7979  <ItemGroup>
     80    <None Include="Plugin.cs.frame" />
    8081    <Compile Include="Plugin.cs" />
     82    <None Include="Properties\AssemblyInfo.cs.frame" />
    8183    <Compile Include="Properties\AssemblyInfo.cs" />
    8284  </ItemGroup>
     
    101103  </ItemGroup>
    102104  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
     105  <PropertyGroup>
     106    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     107set ProjectDir=$(ProjectDir)
     108set SolutionDir=$(SolutionDir)
     109set Outdir=$(Outdir)
     110
     111call PreBuildEvent.cmd
     112</PreBuildEvent>
     113  </PropertyGroup>
    103114  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    104115       Other similar extension points exist, see Microsoft.Common.targets.
  • stable/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.7/HeuristicLab.SimSharp-3.0.7/Properties

    • Property svn:ignore set to
      AssemblyInfo.cs
Note: See TracChangeset for help on using the changeset viewer.