Changeset 16829 for branches/2994-AutoDiffForIntervals/HeuristicLab.ExtLibs

Timestamp:

04/19/19 09:09:45 (6 years ago)

Author:

gkronber

Message:

#2994: merged changesets r16740:16822 from trunk to branch

Location:

branches/2994-AutoDiffForIntervals

Files:

• . (modified) (1 prop)
• HeuristicLab.ExtLibs (modified) (1 prop)
• HeuristicLab.ExtLibs/HeuristicLab.Attic/1.0.0/HeuristicLab.Attic.csproj (modified) (2 diffs)
• HeuristicLab.ExtLibs/HeuristicLab.Attic/1.0.0/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.ExtLibs/HeuristicLab.Protobuf (copied) (copied from trunk/HeuristicLab.ExtLibs/HeuristicLab.Protobuf)
• HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.11 (deleted)
• HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.1.1 (copied) (copied from trunk/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.1.1)

branches/2994-AutoDiffForIntervals/HeuristicLab.ExtLibs/HeuristicLab.Attic/1.0.0/HeuristicLab.Attic.csproj

@@ -36 +36 @@
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
-      <HintPath>..\..\..\..\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -67 +64 @@
     </PackageReference>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
+      <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
+      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Protobuf\3.6.1\HeuristicLab.Protobuf.csproj">
+      <Project>{44b10478-d290-43d3-9757-c08f5292fea5}</Project>
+      <Name>HeuristicLab.Protobuf</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/2994-AutoDiffForIntervals/HeuristicLab.ExtLibs/HeuristicLab.Attic/1.0.0/Plugin.cs.frame

@@ -31 +31 @@
   [PluginFile("HEAL.Attic.dll", PluginFileType.Assembly)]
   [PluginFile("HEAL.Attic.License.txt", PluginFileType.License)]
-  [PluginFile("Google.Protobuf.dll", PluginFileType.Assembly)]
   [PluginFile("System.Drawing.Common.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.Protobuf", "3.6.1")]
   public class Plugin : PluginBase {
   }