Changeset 16748


Ignore:
Timestamp:
04/02/19 15:13:14 (3 months ago)
Author:
ddorfmei
Message:

#2931: Removed Google.Protobuf.dll from HeurisiticLb.OrTools (Assembly is already provided by HEAL.Attic)

Location:
branches/2931_OR-Tools_LP_MIP
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExactOptimization/3.3/HeuristicLab.ExactOptimization-3.3.csproj

    r16736 r16748  
    118118      <SpecificVersion>False</SpecificVersion>
    119119      <HintPath>..\..\bin\HEAL.Attic.dll</HintPath>
    120     </Reference>
    121     <Reference Include="HeuristicLab.OrTools-7.0.0, Version=6.10.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    122       <SpecificVersion>False</SpecificVersion>
    123       <HintPath>..\..\bin\HeuristicLab.OrTools-7.0.0.dll</HintPath>
    124120    </Reference>
    125121    <Reference Include="System" />
  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/7.0.0/HeuristicLab.OrTools-7.0.0/HeuristicLab.OrTools-7.0.0.csproj

    r16717 r16748  
    8282  </PropertyGroup>
    8383  <ItemGroup>
    84     <Reference Include="Google.OrTools, Version=0.0.0.0, Culture=neutral, PublicKeyToken=e028b7d783ee8af0, processorArchitecture=AMD64">
    85       <SpecificVersion>False</SpecificVersion>
    86       <HintPath>.\Google.OrTools.dll</HintPath>
    87     </Reference>
    88     <Reference Include="Google.Protobuf, Version=3.5.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
    89       <SpecificVersion>False</SpecificVersion>
    90       <HintPath>.\Google.Protobuf.dll</HintPath>
    91     </Reference>
    9284    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    9385      <SpecificVersion>False</SpecificVersion>
     
    127119      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    128120    </Content>
    129     <Content Include="Google.Protobuf.dll">
    130       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    131     </Content>
    132121  </ItemGroup>
    133122  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  • branches/2931_OR-Tools_LP_MIP/HeuristicLab.ExtLibs/HeuristicLab.OrTools/7.0.0/HeuristicLab.OrTools-7.0.0/Plugin.cs.frame

    r16717 r16748  
    3535  [PluginFile("Google.OrTools.runtime.win-x64.dll", PluginFileType.NativeDll)]
    3636  [PluginFile("Google.OrTools_version.txt", PluginFileType.Data)]
    37   [PluginFile("Google.Protobuf.dll", PluginFileType.Assembly)]
    3837  public class HeuristicLabOrToolsPlugin : PluginBase {
    3938
Note: See TracChangeset for help on using the changeset viewer.