Merge bb4e0e3 into 384042b

nooperation · May 10, 2018 · 49f280c · 49f280c
2 parents 384042b + bb4e0e3
commit 49f280c
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 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.5.0\build\LibSanBag.props" Condition="Exists('..\packages\LibSanBag.1.5.0\build\LibSanBag.props')" />
+  <Import Project="..\packages\LibSanBag.1.5.4\build\LibSanBag.props" Condition="Exists('..\packages\LibSanBag.1.5.4\build\LibSanBag.props')" />
   <Import Project="..\packages\SanTools.LibCRN.1.0.7\build\SanTools.LibCRN.props" Condition="Exists('..\packages\SanTools.LibCRN.1.0.7\build\SanTools.LibCRN.props')" />
   <Import Project="..\packages\SanTools.LibUserPreferences.1.0.6\build\SanTools.LibUserPreferences.props" Condition="Exists('..\packages\SanTools.LibUserPreferences.1.0.6\build\SanTools.LibUserPreferences.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')" />
@@ -42,8 +42,8 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="LibSanBag, Version=1.5.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\LibSanBag.1.5.0\lib\net46\LibSanBag.dll</HintPath>
+    <Reference Include="LibSanBag, Version=1.5.4.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\LibSanBag.1.5.4\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>
@@ -146,6 +146,6 @@
     <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\SanTools.LibUserPreferences.1.0.6\build\SanTools.LibUserPreferences.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SanTools.LibUserPreferences.1.0.6\build\SanTools.LibUserPreferences.props'))" />
     <Error Condition="!Exists('..\packages\SanTools.LibCRN.1.0.7\build\SanTools.LibCRN.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SanTools.LibCRN.1.0.7\build\SanTools.LibCRN.props'))" />
-    <Error Condition="!Exists('..\packages\LibSanBag.1.5.0\build\LibSanBag.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibSanBag.1.5.0\build\LibSanBag.props'))" />
+    <Error Condition="!Exists('..\packages\LibSanBag.1.5.4\build\LibSanBag.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibSanBag.1.5.4\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.5.0" targetFramework="net46" />
+  <package id="LibSanBag" version="1.5.4" targetFramework="net46" />
   <package id="Newtonsoft.Json" version="11.0.1" targetFramework="net462" />
   <package id="SanTools.LibCRN" version="1.0.7" targetFramework="net46" />
   <package id="SanTools.LibFSB" version="1.0.0" targetFramework="net46" />

diff --git a/CommonUI/CommonUI.csproj b/CommonUI/CommonUI.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.5.0\build\LibSanBag.props" Condition="Exists('..\packages\LibSanBag.1.5.0\build\LibSanBag.props')" />
+  <Import Project="..\packages\LibSanBag.1.5.4\build\LibSanBag.props" Condition="Exists('..\packages\LibSanBag.1.5.4\build\LibSanBag.props')" />
   <Import Project="..\packages\SanTools.LibCRN.1.0.7\build\SanTools.LibCRN.props" Condition="Exists('..\packages\SanTools.LibCRN.1.0.7\build\SanTools.LibCRN.props')" />
   <Import Project="..\packages\SanTools.LibUserPreferences.1.0.6\build\SanTools.LibUserPreferences.props" Condition="Exists('..\packages\SanTools.LibUserPreferences.1.0.6\build\SanTools.LibUserPreferences.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')" />
@@ -44,8 +44,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.5.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\LibSanBag.1.5.0\lib\net46\LibSanBag.dll</HintPath>
+    <Reference Include="LibSanBag, Version=1.5.4.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\LibSanBag.1.5.4\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.2\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -234,6 +234,6 @@
     <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\SanTools.LibUserPreferences.1.0.6\build\SanTools.LibUserPreferences.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SanTools.LibUserPreferences.1.0.6\build\SanTools.LibUserPreferences.props'))" />
     <Error Condition="!Exists('..\packages\SanTools.LibCRN.1.0.7\build\SanTools.LibCRN.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SanTools.LibCRN.1.0.7\build\SanTools.LibCRN.props'))" />
-    <Error Condition="!Exists('..\packages\LibSanBag.1.5.0\build\LibSanBag.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibSanBag.1.5.0\build\LibSanBag.props'))" />
+    <Error Condition="!Exists('..\packages\LibSanBag.1.5.4\build\LibSanBag.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibSanBag.1.5.4\build\LibSanBag.props'))" />
   </Target>
 </Project>
diff --git a/CommonUI/packages.config b/CommonUI/packages.config
@@ -2,7 +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.5.0" targetFramework="net46" />
+  <package id="LibSanBag" version="1.5.4" targetFramework="net46" />
   <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" />
   <package id="SanTools.LibCRN" version="1.0.7" targetFramework="net46" />
   <package id="SanTools.LibFSB" version="1.0.0" targetFramework="net46" />

diff --git a/SanBag/SanBag.csproj b/SanBag/SanBag.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.5.0\build\LibSanBag.props" Condition="Exists('..\packages\LibSanBag.1.5.0\build\LibSanBag.props')" />
+  <Import Project="..\packages\LibSanBag.1.5.4\build\LibSanBag.props" Condition="Exists('..\packages\LibSanBag.1.5.4\build\LibSanBag.props')" />
   <Import Project="..\packages\SanTools.LibCRN.1.0.7\build\SanTools.LibCRN.props" Condition="Exists('..\packages\SanTools.LibCRN.1.0.7\build\SanTools.LibCRN.props')" />
   <Import Project="..\packages\SanTools.LibUserPreferences.1.0.6\build\SanTools.LibUserPreferences.props" Condition="Exists('..\packages\SanTools.LibUserPreferences.1.0.6\build\SanTools.LibUserPreferences.props')" />
   <Import Project="..\packages\SanTools.LibFSB.1.0.2\build\SanTools.LibFSB.props" Condition="Exists('..\packages\SanTools.LibFSB.1.0.2\build\SanTools.LibFSB.props')" />
@@ -42,8 +42,8 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="LibSanBag, Version=1.5.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\LibSanBag.1.5.0\lib\net46\LibSanBag.dll</HintPath>
+    <Reference Include="LibSanBag, Version=1.5.4.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\LibSanBag.1.5.4\lib\net46\LibSanBag.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -159,6 +159,6 @@
     <Error Condition="!Exists('..\packages\SanTools.LibFSB.1.0.2\build\SanTools.LibFSB.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SanTools.LibFSB.1.0.2\build\SanTools.LibFSB.props'))" />
     <Error Condition="!Exists('..\packages\SanTools.LibUserPreferences.1.0.6\build\SanTools.LibUserPreferences.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SanTools.LibUserPreferences.1.0.6\build\SanTools.LibUserPreferences.props'))" />
     <Error Condition="!Exists('..\packages\SanTools.LibCRN.1.0.7\build\SanTools.LibCRN.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SanTools.LibCRN.1.0.7\build\SanTools.LibCRN.props'))" />
-    <Error Condition="!Exists('..\packages\LibSanBag.1.5.0\build\LibSanBag.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibSanBag.1.5.0\build\LibSanBag.props'))" />
+    <Error Condition="!Exists('..\packages\LibSanBag.1.5.4\build\LibSanBag.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibSanBag.1.5.4\build\LibSanBag.props'))" />
   </Target>
 </Project>
diff --git a/SanBag/packages.config b/SanBag/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="LibSanBag" version="1.5.0" targetFramework="net46" />
+  <package id="LibSanBag" version="1.5.4" targetFramework="net46" />
   <package id="SanTools.LibCRN" version="1.0.7" targetFramework="net46" />
   <package id="SanTools.LibFSB" version="1.0.2" targetFramework="net46" />
   <package id="SanTools.LibUserPreferences" version="1.0.6" targetFramework="net46" />