Changeset 13172 for stable/HeuristicLab.ExtLibs

Timestamp:

11/16/15 14:20:27 (9 years ago)

Author:

ascheibe

Message:

#2475 merged r13008 and r13016 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.ExtLibs (modified) (1 prop)
• HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/2.4.1/ProtobufCS/src/ProtoGen/ProtoGen-2.4.1.473.csproj (modified) (1 diff)
• HeuristicLab.ExtLibs/HeuristicLab.WinFormsUI/2.7.0/WinFormsUI-2.7.0/WinFormsUI-2.7.0.csproj (modified) (1 diff)

stable/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/2.4.1/ProtobufCS/src/ProtoGen/ProtoGen-2.4.1.473.csproj

@@ -195 +195 @@
   </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-    cp "$(TargetPath)" "$(SolutionDir)"
+    cp "$(TargetPath)*" "$(SolutionDir)"
     cp "$(TargetDir)Google.ProtocolBuffers-2.4.1.473.dll" "$(SolutionDir)"
-    cp "$(ProjectDir)..\..\lib\protoc.exe" "$(SolutionDir)"
+    cp "$(ProjectDir)../../lib/protoc.exe" "$(SolutionDir)"
   </PostBuildEvent>
-  </PropertyGroup>  
+  </PropertyGroup>
   <!-- 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.

stable/HeuristicLab.ExtLibs/HeuristicLab.WinFormsUI/2.7.0/WinFormsUI-2.7.0/WinFormsUI-2.7.0.csproj

@@ -134 +134 @@
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="Docking\DockPanel.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="Docking\DockPanel.cs" />
     <Compile Include="Docking\DockPanel.DockDragHandler.cs">
       <SubType>Component</SubType>