Changeset 16138 for branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs

Timestamp:

09/13/18 13:04:36 (6 years ago)

Author:

ddorfmei

Message:

#2931: project upgrades and changes to building

Location:

branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.8.0-pre/HeuristicLab.OrTools-6.8.0-pre

Files:

• HeuristicLab.OrTools-6.8.0-pre.csproj (modified) (2 diffs)
• Plugin.cs.frame (modified) (2 diffs)
• Properties/AssemblyInfo.cs (modified) (1 diff)

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

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -24 +24 @@
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <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

@@ -24 +24 @@
 
 namespace HeuristicLab.OrTools {
-  [Plugin("HeuristicLab.OrTools", "Provides functionality of Google OR-Tools in HeuristicLab", "6.8.0.$WCREV$")]
+  [Plugin("HeuristicLab.OrTools", "Provides functionality of Google OR-Tools in HeuristicLab. Requires Windows 64-bit", "6.8.0.$WCREV$")]
   [PluginFile("HeuristicLab.OrTools-6.8.0-pre.dll", PluginFileType.Assembly)]
   [PluginFile("Google.OrTools.dll", PluginFileType.Assembly)]
@@ -33 +33 @@
   [PluginFile("GLPK-4.65-license.txt", PluginFileType.License)]
   public class HeuristicLabOrToolsPlugin : PluginBase {
-      public override void OnLoad() {
-      if (!Environment.Is64BitProcess)
-        throw new InvalidPluginException("Google OR-Tools integration is availabe only on 64-bit platforms.");
-      if (Environment.OSVersion.Platform != PlatformID.Win32NT)
-        throw new InvalidPluginException("Google OR-Tools integration is currently availabe only on Windows.");
-      base.OnLoad();
-    }
   }
 }

branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.8.0-pre/HeuristicLab.OrTools-6.8.0-pre/Properties/AssemblyInfo.cs

@@ -54 +54 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("6.8.0.0")]
-[assembly: AssemblyFileVersion("6.8.0.0")]
+[assembly: AssemblyFileVersion("6.8.0.16070")]