Merge pull request #78 from nooperation/develop

Develop to master
nooperation · Mar 5, 2018 · ade5a87 · ade5a87
2 parents d1ced45 + e24fb17
commit ade5a87
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/AtlasView/AtlasView.csproj b/AtlasView/AtlasView.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\LibSanBag.1.2.7\build\LibSanBag.props" Condition="Exists('..\packages\LibSanBag.1.2.7\build\LibSanBag.props')" />
+  <Import Project="..\packages\LibSanBag.1.2.10\build\LibSanBag.props" Condition="Exists('..\packages\LibSanBag.1.2.10\build\LibSanBag.props')" />
   <Import Project="..\packages\SanTools.LibFSB.1.0.0\build\SanTools.LibFSB.props" Condition="Exists('..\packages\SanTools.LibFSB.1.0.0\build\SanTools.LibFSB.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -40,8 +40,8 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="LibSanBag, Version=1.2.7.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\LibSanBag.1.2.7\lib\net46\LibSanBag.dll</HintPath>
+    <Reference Include="LibSanBag, Version=1.2.10.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\LibSanBag.1.2.10\lib\net46\LibSanBag.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -149,6 +149,6 @@
       <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\SanTools.LibFSB.1.0.0\build\SanTools.LibFSB.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SanTools.LibFSB.1.0.0\build\SanTools.LibFSB.props'))" />
-    <Error Condition="!Exists('..\packages\LibSanBag.1.2.7\build\LibSanBag.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibSanBag.1.2.7\build\LibSanBag.props'))" />
+    <Error Condition="!Exists('..\packages\LibSanBag.1.2.10\build\LibSanBag.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibSanBag.1.2.10\build\LibSanBag.props'))" />
   </Target>
 </Project>
diff --git a/AtlasView/packages.config b/AtlasView/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="LibSanBag" version="1.2.7" targetFramework="net46" />
+  <package id="LibSanBag" version="1.2.10" targetFramework="net46" />
   <package id="Newtonsoft.Json" version="11.0.1" targetFramework="net462" />
   <package id="SanTools.LibFSB" version="1.0.0" targetFramework="net46" />
 </packages>
diff --git a/CommonUI/CommonUI.csproj b/CommonUI/CommonUI.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\LibSanBag.1.2.10\build\LibSanBag.props" Condition="Exists('..\packages\LibSanBag.1.2.10\build\LibSanBag.props')" />
   <Import Project="..\packages\SanTools.LibFSB.1.0.0\build\SanTools.LibFSB.props" Condition="Exists('..\packages\SanTools.LibFSB.1.0.0\build\SanTools.LibFSB.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -41,8 +42,8 @@
     <Reference Include="HelixToolkit.Wpf, Version=1.0.0.0, Culture=neutral, PublicKeyToken=52aa3500039caf0d, processorArchitecture=MSIL">
       <HintPath>..\packages\HelixToolkit.Wpf.1.0.0\lib\net45\HelixToolkit.Wpf.dll</HintPath>
     </Reference>
-    <Reference Include="LibSanBag, Version=1.2.7.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\LibSanBag.1.2.7\lib\net46\LibSanBag.dll</HintPath>
+    <Reference Include="LibSanBag, Version=1.2.10.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\LibSanBag.1.2.10\lib\net46\LibSanBag.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -184,5 +185,6 @@
       <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\SanTools.LibFSB.1.0.0\build\SanTools.LibFSB.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SanTools.LibFSB.1.0.0\build\SanTools.LibFSB.props'))" />
+    <Error Condition="!Exists('..\packages\LibSanBag.1.2.10\build\LibSanBag.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibSanBag.1.2.10\build\LibSanBag.props'))" />
   </Target>
 </Project>
diff --git a/CommonUI/packages.config b/CommonUI/packages.config
@@ -2,6 +2,7 @@
 <packages>
   <package id="HelixToolkit" version="1.0.0" targetFramework="net46" />
   <package id="HelixToolkit.Wpf" version="1.0.0" targetFramework="net46" />
+  <package id="LibSanBag" version="1.2.10" targetFramework="net46" />
   <package id="SanTools.LibFSB" version="1.0.0" targetFramework="net46" />
   <package id="WPFHexaEditor" version="1.2.1" targetFramework="net46" />
 </packages>