Changeset 16419

Timestamp:

12/20/18 12:52:01 (6 years ago)

Author:

ddorfmei

Message:

#2931:

• removed unnecessary NuGet packages from HeuristicLab.OrTools
• updated commit ID in Google.OrTools_version.txt
• removed generated files from HeuristicLab.MathematicalOptimization.Views

Location:

branches/2931_OR-Tools_LP_MIP

Files:

• HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/Google.OrTools_version.txt (modified) (1 diff)
• HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/HeuristicLab.OrTools-6.10.0.csproj (modified) (2 diffs)
• HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/packages.config (deleted)
• HeuristicLab.MathematicalOptimization.Views/3.3/Plugin.cs (deleted)
• HeuristicLab.MathematicalOptimization.Views/3.3/Properties/AssemblyInfo.cs (deleted)

branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/Google.OrTools_version.txt

@@ -3 +3 @@
 GitHub [2]. The library was compiled with Visual Studio 2017 for x64.
 
-[1]: https://github.com/ddorfmeister/or-tools/commit/62b433751564a627416143c3ba9469d855c098de
+[1]: https://github.com/ddorfmeister/or-tools/commit/e13f4bb73f09966332206204d443747e3762555f
 [2]: https://github.com/google/or-tools

branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/6.10.0/HeuristicLab.OrTools-6.10.0/HeuristicLab.OrTools-6.10.0.csproj

@@ -103 +103 @@
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="Plugin.cs.frame" />
     <None Include="Properties\AssemblyInfo.cs.frame" />
@@ -147 +146 @@
 call PreBuildEvent.cmd</PreBuildEvent>
   </PropertyGroup>
-  <Import Project="..\..\..\..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\..\..\..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.