Changeset 16138


Ignore:
Timestamp:
09/13/18 13:04:36 (10 months ago)
Author:
ddorfmei
Message:

#2931: project upgrades and changes to building

Location:
branches/2931_OR-Tools_LP_MIP
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • branches/2931_OR-Tools_LP_MIP/Build.cmd

    r15682 r16138  
    7474
    7575:main
    76 REM First find the path to the msbuild.exe by performing a registry query
    77 FOR /F "tokens=1,3 delims=   " %%A IN ('REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0"') DO (
    78   IF "%%A"=="MSBuildToolsPath" SET MSBUILDPATH=%%B)
    79 
    8076REM Then execute msbuild to clean and build the solution
    8177REM Disable that msbuild creates a cache file of the solution
     
    8480IF "%CLEANBEFOREBUILD%" NEQ "n" (
    8581  ECHO Cleaning ...
    86   %MSBUILDPATH%msbuild.exe %SELECTED% /target:Clean /p:Configuration="%CONFIGURATION%",Platform="%PLATFORM%" /m:2 /nologo /verbosity:q /clp:ErrorsOnly
     82  msbuild.exe %SELECTED% /target:Clean /p:Configuration="%CONFIGURATION%",Platform="%PLATFORM%" /m:2 /nologo /verbosity:q /clp:ErrorsOnly
    8783)
    8884ECHO Building ...
    89 %MSBUILDPATH%msbuild.exe %SELECTED% /target:Build /p:Configuration="%CONFIGURATION%",Platform="%PLATFORM%" /m:2 /nologo /verbosity:q /clp:ErrorsOnly
     85msbuild.exe %SELECTED% /target:Build /p:Configuration="%CONFIGURATION%",Platform="%PLATFORM%" /m:2 /nologo /verbosity:q /clp:ErrorsOnly
    9086
    9187ECHO.
  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.8.0-pre/HeuristicLab.OrTools-6.8.0-pre/HeuristicLab.OrTools-6.8.0-pre.csproj

    r16070 r16138  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     2<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
    44  <PropertyGroup>
     
    2424    <WarningLevel>4</WarningLevel>
    2525    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     26    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    2627  </PropertyGroup>
    2728  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.8.0-pre/HeuristicLab.OrTools-6.8.0-pre/Plugin.cs.frame

    r16070 r16138  
    2424
    2525namespace HeuristicLab.OrTools {
    26   [Plugin("HeuristicLab.OrTools", "Provides functionality of Google OR-Tools in HeuristicLab", "6.8.0.$WCREV$")]
     26  [Plugin("HeuristicLab.OrTools", "Provides functionality of Google OR-Tools in HeuristicLab. Requires Windows 64-bit", "6.8.0.$WCREV$")]
    2727  [PluginFile("HeuristicLab.OrTools-6.8.0-pre.dll", PluginFileType.Assembly)]
    2828  [PluginFile("Google.OrTools.dll", PluginFileType.Assembly)]
     
    3333  [PluginFile("GLPK-4.65-license.txt", PluginFileType.License)]
    3434  public class HeuristicLabOrToolsPlugin : PluginBase {
    35       public override void OnLoad() {
    36       if (!Environment.Is64BitProcess)
    37         throw new InvalidPluginException("Google OR-Tools integration is availabe only on 64-bit platforms.");
    38       if (Environment.OSVersion.Platform != PlatformID.Win32NT)
    39         throw new InvalidPluginException("Google OR-Tools integration is currently availabe only on Windows.");
    40       base.OnLoad();
    41     }
    4235  }
    4336}
  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.8.0-pre/HeuristicLab.OrTools-6.8.0-pre/Properties/AssemblyInfo.cs

    r16070 r16138  
    5454// [assembly: AssemblyVersion("1.0.*")]
    5555[assembly: AssemblyVersion("6.8.0.0")]
    56 [assembly: AssemblyFileVersion("6.8.0.0")]
     56[assembly: AssemblyFileVersion("6.8.0.16070")]
  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.MathematicalOptimization/3.3/HeuristicLab.MathematicalOptimization-3.3.csproj

    r16070 r16138  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     2<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <PropertyGroup>
    44    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     
    2424    <WarningLevel>4</WarningLevel>
    2525    <Prefer32Bit>false</Prefer32Bit>
     26    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     27    <LangVersion>default</LangVersion>
    2628  </PropertyGroup>
    2729  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     
    109111  </PropertyGroup>
    110112  <ItemGroup>
    111     <Reference Include="Google.OrTools-6.8.0-pre-x64, Version=0.0.0.0, Culture=neutral, PublicKeyToken=e028b7d783ee8af0, processorArchitecture=AMD64">
     113    <Reference Include="Google.OrTools, Version=0.0.0.0, Culture=neutral, PublicKeyToken=e028b7d783ee8af0, processorArchitecture=AMD64">
    112114      <SpecificVersion>False</SpecificVersion>
    113       <HintPath>..\..\bin\Google.OrTools-6.8.0-pre-x64.dll</HintPath>
     115      <HintPath>..\..\bin\Google.OrTools.dll</HintPath>
    114116    </Reference>
    115117    <Reference Include="Google.Protobuf, Version=3.5.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     
    118120      <Private>False</Private>
    119121    </Reference>
    120     <Reference Include="HeuristicLab.OrTools-6.8.0-pre, Version=6.8.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     122    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
    121123      <SpecificVersion>False</SpecificVersion>
    122       <HintPath>..\..\bin\HeuristicLab.OrTools-6.8.0-pre.dll</HintPath>
    123       <Private>False</Private>
    124     </Reference>
    125     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    126       <HintPath>C:\Program Files\HeuristicLab 3.3\PluginInfrastructure-3.3.dll</HintPath>
    127       <Private>False</Private>
     124      <HintPath>..\..\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    128125    </Reference>
    129126    <Reference Include="System" />
     
    132129  </ItemGroup>
    133130  <ItemGroup>
     131    <Compile Include="LinearProgramming\BasisStatus.cs" />
     132    <Compile Include="LinearProgramming\LinearSolverExtensions.cs" />
     133    <Compile Include="LinearProgramming\LinearSolver.cs" />
     134    <Compile Include="LinearProgramming\OptimizationProblemType.cs" />
     135    <Compile Include="LinearProgramming\ResultStatus.cs" />
    134136    <Compile Include="Properties\AssemblyInfo.cs" />
    135137    <None Include="Plugin.cs.frame" />
     
    140142    <None Include="HeuristicLab.snk" />
    141143  </ItemGroup>
     144  <ItemGroup />
    142145  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    143146  <PropertyGroup>
Note: See TracChangeset for help on using the changeset viewer.