Merge pull request #135 from nooperation/develop

Develop to master (Dependency check)
nooperation · Jan 17, 2019 · db5fcc7 · db5fcc7
2 parents 8e3f604 + 7245526
commit db5fcc7
Show file tree

Hide file tree

Showing 8 changed files with 35 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.6.6\build\LibSanBag.props" Condition="Exists('..\packages\LibSanBag.1.6.6\build\LibSanBag.props')" />
+  <Import Project="..\packages\LibSanBag.1.6.8\build\LibSanBag.props" Condition="Exists('..\packages\LibSanBag.1.6.8\build\LibSanBag.props')" />
   <Import Project="..\packages\SanTools.LibCRN.1.0.8\build\SanTools.LibCRN.props" Condition="Exists('..\packages\SanTools.LibCRN.1.0.8\build\SanTools.LibCRN.props')" />
   <Import Project="..\packages\SanTools.LibKraken.1.0.0\build\SanTools.LibKraken.props" Condition="Exists('..\packages\SanTools.LibKraken.1.0.0\build\SanTools.LibKraken.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')" />
@@ -43,8 +43,8 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="LibSanBag, Version=1.6.6.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\LibSanBag.1.6.6\lib\net46\LibSanBag.dll</HintPath>
+    <Reference Include="LibSanBag, Version=1.6.8.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\LibSanBag.1.6.8\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>
@@ -148,6 +148,6 @@
     <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.LibKraken.1.0.0\build\SanTools.LibKraken.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SanTools.LibKraken.1.0.0\build\SanTools.LibKraken.props'))" />
     <Error Condition="!Exists('..\packages\SanTools.LibCRN.1.0.8\build\SanTools.LibCRN.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SanTools.LibCRN.1.0.8\build\SanTools.LibCRN.props'))" />
-    <Error Condition="!Exists('..\packages\LibSanBag.1.6.6\build\LibSanBag.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibSanBag.1.6.6\build\LibSanBag.props'))" />
+    <Error Condition="!Exists('..\packages\LibSanBag.1.6.8\build\LibSanBag.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibSanBag.1.6.8\build\LibSanBag.props'))" />
   </Target>
 </Project>
diff --git a/AtlasView/ViewModels/MainWindowViewModel.cs b/AtlasView/ViewModels/MainWindowViewModel.cs
@@ -23,6 +23,16 @@ public MainWindowViewModel()
         {
             Environment.CurrentDirectory = AppDomain.CurrentDomain.BaseDirectory;
 
+            if(!LibSanBag.ResourceUtils.Unpacker.IsAvailable)
+            {
+                MessageBox.Show(
+                    "This program requires additional dependencies to run. Please obtain one of the following DLLs and place it in the directory containing " + System.AppDomain.CurrentDomain.FriendlyName + ":\n" +
+                    "  oo2core_6_win64.dll\n" +
+                    "  oo2core_7_win64.dll",
+                    "Error", MessageBoxButton.OK, MessageBoxImage.Error
+                );
+            }
+
             try
             {
                 CurrentView = new Views.AtlasView

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.6.6" targetFramework="net46" />
+  <package id="LibSanBag" version="1.6.8" targetFramework="net46" />
   <package id="Newtonsoft.Json" version="11.0.1" targetFramework="net462" />
   <package id="SanTools.LibCRN" version="1.0.8" 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.6.6\build\LibSanBag.props" Condition="Exists('..\packages\LibSanBag.1.6.6\build\LibSanBag.props')" />
+  <Import Project="..\packages\LibSanBag.1.6.8\build\LibSanBag.props" Condition="Exists('..\packages\LibSanBag.1.6.8\build\LibSanBag.props')" />
   <Import Project="..\packages\SanTools.LibCRN.1.0.8\build\SanTools.LibCRN.props" Condition="Exists('..\packages\SanTools.LibCRN.1.0.8\build\SanTools.LibCRN.props')" />
   <Import Project="..\packages\SanTools.LibKraken.1.0.0\build\SanTools.LibKraken.props" Condition="Exists('..\packages\SanTools.LibKraken.1.0.0\build\SanTools.LibKraken.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')" />
@@ -51,8 +51,8 @@
     <Reference Include="ICSharpCode.Decompiler, Version=4.0.0.4509, Culture=neutral, PublicKeyToken=d4bfe873e7598c49, processorArchitecture=MSIL">
       <HintPath>..\packages\ICSharpCode.Decompiler.4.0.0.4509-rc1\lib\net46\ICSharpCode.Decompiler.dll</HintPath>
     </Reference>
-    <Reference Include="LibSanBag, Version=1.6.6.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\LibSanBag.1.6.6\lib\net46\LibSanBag.dll</HintPath>
+    <Reference Include="LibSanBag, Version=1.6.8.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\LibSanBag.1.6.8\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>
@@ -254,6 +254,6 @@
     <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.LibKraken.1.0.0\build\SanTools.LibKraken.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SanTools.LibKraken.1.0.0\build\SanTools.LibKraken.props'))" />
     <Error Condition="!Exists('..\packages\SanTools.LibCRN.1.0.8\build\SanTools.LibCRN.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SanTools.LibCRN.1.0.8\build\SanTools.LibCRN.props'))" />
-    <Error Condition="!Exists('..\packages\LibSanBag.1.6.6\build\LibSanBag.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibSanBag.1.6.6\build\LibSanBag.props'))" />
+    <Error Condition="!Exists('..\packages\LibSanBag.1.6.8\build\LibSanBag.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibSanBag.1.6.8\build\LibSanBag.props'))" />
   </Target>
 </Project>
diff --git a/CommonUI/packages.config b/CommonUI/packages.config
@@ -4,7 +4,7 @@
   <package id="HelixToolkit.Wpf" version="1.0.0" targetFramework="net46" />
   <package id="Humanizer.Core" version="2.2.0" targetFramework="net46" />
   <package id="ICSharpCode.Decompiler" version="4.0.0.4509-rc1" targetFramework="net46" />
-  <package id="LibSanBag" version="1.6.6" targetFramework="net46" />
+  <package id="LibSanBag" version="1.6.8" targetFramework="net46" />
   <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" />
   <package id="SanTools.LibCRN" version="1.0.8" 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.6.6\build\LibSanBag.props" Condition="Exists('..\packages\LibSanBag.1.6.6\build\LibSanBag.props')" />
+  <Import Project="..\packages\LibSanBag.1.6.8\build\LibSanBag.props" Condition="Exists('..\packages\LibSanBag.1.6.8\build\LibSanBag.props')" />
   <Import Project="..\packages\SanTools.LibCRN.1.0.8\build\SanTools.LibCRN.props" Condition="Exists('..\packages\SanTools.LibCRN.1.0.8\build\SanTools.LibCRN.props')" />
   <Import Project="..\packages\SanTools.LibKraken.1.0.0\build\SanTools.LibKraken.props" Condition="Exists('..\packages\SanTools.LibKraken.1.0.0\build\SanTools.LibKraken.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')" />
@@ -43,8 +43,8 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="LibSanBag, Version=1.6.6.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\LibSanBag.1.6.6\lib\net46\LibSanBag.dll</HintPath>
+    <Reference Include="LibSanBag, Version=1.6.8.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\LibSanBag.1.6.8\lib\net46\LibSanBag.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -161,6 +161,6 @@
     <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.LibKraken.1.0.0\build\SanTools.LibKraken.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SanTools.LibKraken.1.0.0\build\SanTools.LibKraken.props'))" />
     <Error Condition="!Exists('..\packages\SanTools.LibCRN.1.0.8\build\SanTools.LibCRN.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SanTools.LibCRN.1.0.8\build\SanTools.LibCRN.props'))" />
-    <Error Condition="!Exists('..\packages\LibSanBag.1.6.6\build\LibSanBag.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibSanBag.1.6.6\build\LibSanBag.props'))" />
+    <Error Condition="!Exists('..\packages\LibSanBag.1.6.8\build\LibSanBag.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibSanBag.1.6.8\build\LibSanBag.props'))" />
   </Target>
 </Project>
diff --git a/SanBag/ViewModels/MainWindowViewModel.cs b/SanBag/ViewModels/MainWindowViewModel.cs
@@ -31,6 +31,16 @@ public MainWindowViewModel()
         {
             Environment.CurrentDirectory = AppDomain.CurrentDomain.BaseDirectory;
 
+            if(!LibSanBag.ResourceUtils.Unpacker.IsAvailable)
+            {
+                MessageBox.Show(
+                        "This program requires additional dependencies to run. Please obtain one of the following DLLs and place it in the directory containing " + System.AppDomain.CurrentDomain.FriendlyName + ":\n" +
+                        "  oo2core_6_win64.dll\n" +
+                        "  oo2core_7_win64.dll",
+                        "Error", MessageBoxButton.OK, MessageBoxImage.Error
+                );
+            }
+
             try
             {
                 var arguments = Environment.GetCommandLineArgs();

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.6.6" targetFramework="net46" />
+  <package id="LibSanBag" version="1.6.8" targetFramework="net46" />
   <package id="SanTools.LibCRN" version="1.0.8" targetFramework="net46" />
   <package id="SanTools.LibFSB" version="1.0.2" targetFramework="net46" />
   <package id="SanTools.LibKraken" version="1.0.0" targetFramework="net46" />