From 2085c306ab8aa24a9fd28e181772bbc9abaf28f6 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Mon, 18 Sep 2023 12:52:42 -0400
Subject: [PATCH] Move stormlibsharp to main library

---
 .gitmodules                                   |  3 ++
 .../BinaryObjectScanner.Compression.csproj    | 37 -------------------
 .../BinaryObjectScanner.csproj                | 12 ++++--
 .../_EXTERNAL/README.MD                       |  0
 BinaryObjectScanner/_EXTERNAL/stormlibsharp   |  1 +
 BurnOutSharp.sln                              |  6 ---
 BurnOutSharp/BurnOutSharp.csproj              |  4 --
 7 files changed, 13 insertions(+), 50 deletions(-)
 create mode 100644 .gitmodules
 delete mode 100644 BinaryObjectScanner.Compression/BinaryObjectScanner.Compression.csproj
 rename {BinaryObjectScanner.Compression => BinaryObjectScanner}/_EXTERNAL/README.MD (100%)
 create mode 160000 BinaryObjectScanner/_EXTERNAL/stormlibsharp

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..00469374
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "BinaryObjectScanner/_EXTERNAL/stormlibsharp"]
+	path = BinaryObjectScanner/_EXTERNAL/stormlibsharp
+	url = https://github.com/robpaveza/stormlibsharp.git
diff --git a/BinaryObjectScanner.Compression/BinaryObjectScanner.Compression.csproj b/BinaryObjectScanner.Compression/BinaryObjectScanner.Compression.csproj
deleted file mode 100644
index d3ce068e..00000000
--- a/BinaryObjectScanner.Compression/BinaryObjectScanner.Compression.csproj
+++ /dev/null
@@ -1,37 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <!-- Assembly Properties -->
-    <TargetFrameworks>net48;net6.0;net7.0</TargetFrameworks>
-    <RuntimeIdentifiers>win-x86;win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
-    <Version>2.8</Version>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-
-    <!-- Package Properties -->
-    <Authors>Matt Nadareski</Authors>
-    <Product>BurnOutSharp</Product>
-    <Copyright>Copyright (c)2022-2023 Matt Nadareski</Copyright>
-    <PackageProjectUrl>https://github.com/SabreTools/</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/mnadareski/BurnOutSharp</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <IncludeSource>true</IncludeSource>
-    <IncludeSymbols>true</IncludeSymbols>
-  </PropertyGroup>
-
-  <!-- These are needed for dealing with submodules -->
-  <PropertyGroup>
-    <DefaultItemExcludes>
-      $(DefaultItemExcludes);
-      **\AssemblyInfo.cs;
-      External\stormlibsharp\lib\**;
-      External\stormlibsharp\TestConsole\**
-    </DefaultItemExcludes>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="SabreTools.IO" Version="1.1.1" />
-    <PackageReference Include="SabreTools.Models" Version="1.1.2" />
-  </ItemGroup>
-
-</Project>
diff --git a/BinaryObjectScanner/BinaryObjectScanner.csproj b/BinaryObjectScanner/BinaryObjectScanner.csproj
index 85863866..a20e2851 100644
--- a/BinaryObjectScanner/BinaryObjectScanner.csproj
+++ b/BinaryObjectScanner/BinaryObjectScanner.csproj
@@ -23,9 +23,15 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\BinaryObjectScanner.Compression\BinaryObjectScanner.Compression.csproj" />
-  </ItemGroup>
+  <!-- These are needed for dealing with submodules -->
+  <PropertyGroup>
+    <DefaultItemExcludes>
+      $(DefaultItemExcludes);
+      **\AssemblyInfo.cs;
+      _EXTERNAL\stormlibsharp\lib\**;
+      _EXTERNAL\stormlibsharp\src\TestConsole\**
+    </DefaultItemExcludes>
+  </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="OpenMcdf" Version="2.2.1.12" />
diff --git a/BinaryObjectScanner.Compression/_EXTERNAL/README.MD b/BinaryObjectScanner/_EXTERNAL/README.MD
similarity index 100%
rename from BinaryObjectScanner.Compression/_EXTERNAL/README.MD
rename to BinaryObjectScanner/_EXTERNAL/README.MD
diff --git a/BinaryObjectScanner/_EXTERNAL/stormlibsharp b/BinaryObjectScanner/_EXTERNAL/stormlibsharp
new file mode 160000
index 00000000..3bf13753
--- /dev/null
+++ b/BinaryObjectScanner/_EXTERNAL/stormlibsharp
@@ -0,0 +1 @@
+Subproject commit 3bf13753171d8d1e430f5f044fcbc10b1fd7089f
diff --git a/BurnOutSharp.sln b/BurnOutSharp.sln
index 0b3c430e..258321e8 100644
--- a/BurnOutSharp.sln
+++ b/BurnOutSharp.sln
@@ -16,8 +16,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BinaryObjectScanner.Compression", "BinaryObjectScanner.Compression\BinaryObjectScanner.Compression.csproj", "{B55206B2-58FD-4A47-AADC-74982FEA8FAD}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -32,10 +30,6 @@ Global
 		{88735BA2-778D-4192-8EB2-FFF6843719E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{88735BA2-778D-4192-8EB2-FFF6843719E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{88735BA2-778D-4192-8EB2-FFF6843719E2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B55206B2-58FD-4A47-AADC-74982FEA8FAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B55206B2-58FD-4A47-AADC-74982FEA8FAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B55206B2-58FD-4A47-AADC-74982FEA8FAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B55206B2-58FD-4A47-AADC-74982FEA8FAD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/BurnOutSharp/BurnOutSharp.csproj b/BurnOutSharp/BurnOutSharp.csproj
index f18e24e3..2402c73a 100644
--- a/BurnOutSharp/BurnOutSharp.csproj
+++ b/BurnOutSharp/BurnOutSharp.csproj
@@ -42,10 +42,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </ProjectReference>
-    <ProjectReference Include="..\BinaryObjectScanner.Compression\BinaryObjectScanner.Compression.csproj">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </ProjectReference>
   </ItemGroup>
 
 </Project>