Fix

BUTR · Dec 11, 2024 · 7495906 · 7495906
1 parent 9853a63
commit 7495906
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 37 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -6,7 +6,3 @@
 	path = external/ZString
 	url = https://github.com/Cysharp/ZString
 	branch = master
-[submodule "external/prism-sharp"]
-	path = external/prism-sharp
-	url = https://github.com/BUTR/prism-sharp.git
-	branch = main
diff --git a/external/prism-sharp b/external/prism-sharp
diff --git a/src/BUTR.CrashReport.Renderer.ImGui.WASM/BUTR.CrashReport.Renderer.ImGui.WASM.csproj b/src/BUTR.CrashReport.Renderer.ImGui.WASM/BUTR.CrashReport.Renderer.ImGui.WASM.csproj
@@ -58,13 +58,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <!-- Publish Trim has a bad time finding the references otherwise -->
-    <ProjectReference Include="..\..\external\prism-sharp\PrismSharp.Core\PrismSharp.Core.csproj" />
-    <!-- TODO: Move to a separate package -->
-    <Reference Include="PrismSharp.RegEx">
-      <HintPath>C:\Git\Level0\BUTR.CrashReport\external\prism-sharp\PrismSharp.Core\bin\$(Configuration)\net9.0\PrismSharp.RegEx.dll</HintPath>
-    </Reference>
-
     <!-- Linker otherwise skips them -->
     <ProjectReference Include="..\BUTR.CrashReport.Native\BUTR.CrashReport.Native.csproj" />
     <ProjectReference Include="..\ImGuiColorTextEditNet\ImGuiColorTextEditNet.csproj" />

diff --git a/src/BUTR.CrashReport.Renderer.ImGui/BUTR.CrashReport.Renderer.ImGui.csproj b/src/BUTR.CrashReport.Renderer.ImGui/BUTR.CrashReport.Renderer.ImGui.csproj
@@ -26,14 +26,12 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="BUTR.PrismSharp.Core" Version="1.0.0.14" />
+
     <PackageReference Include="Polyfill" Version="7.4.0" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
-    <!--
-    <PackageReference Include="BUTR.PrismSharp.Core" Version="0.1.4" />
-    -->
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\external\prism-sharp\PrismSharp.Core\PrismSharp.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\ImGuiColorTextEditNet\ImGuiColorTextEditNet.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\BUTR.CrashReport.ImGui\BUTR.CrashReport.ImGui.csproj" />
     <ProjectReference Include="..\BUTR.CrashReport.Models\BUTR.CrashReport.Models.csproj" />

diff --git a/src/BUTR.CrashReport.sln b/src/BUTR.CrashReport.sln
@@ -63,12 +63,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BUTR.CrashReport.CImGui", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BUTR.CrashReport.ImGui", "BUTR.CrashReport.ImGui\BUTR.CrashReport.ImGui.csproj", "{5B6FC58F-DD17-4E1D-9E54-8D0B3089325D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PrismSharp.Core", "..\external\prism-sharp\PrismSharp.Core\PrismSharp.Core.csproj", "{63E215E5-EDC3-4C57-BC87-D4D0803AEEE8}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PrismSharp.SourceGenerator", "..\external\prism-sharp\PrismSharp.SourceGenerator\PrismSharp.SourceGenerator.csproj", "{C8BBE6A5-864E-4CF9-8021-8D4C105B9DF9}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PrismSharp.RegExCompiler", "..\external\prism-sharp\PrismSharp.RegExCompiler\PrismSharp.RegExCompiler.csproj", "{89DA1FB0-CE0E-466A-897A-F96B541A8B6B}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "etc", "etc", "{F4E2D353-AD2D-455B-81B6-F743E0CAD7DF}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImGuiColorTextEditNet", "ImGuiColorTextEditNet\ImGuiColorTextEditNet.csproj", "{CCA2F514-2028-47E4-8BDD-0C46B371836B}"
@@ -171,18 +165,6 @@ Global
 		{5B6FC58F-DD17-4E1D-9E54-8D0B3089325D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5B6FC58F-DD17-4E1D-9E54-8D0B3089325D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5B6FC58F-DD17-4E1D-9E54-8D0B3089325D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{63E215E5-EDC3-4C57-BC87-D4D0803AEEE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{63E215E5-EDC3-4C57-BC87-D4D0803AEEE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{63E215E5-EDC3-4C57-BC87-D4D0803AEEE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{63E215E5-EDC3-4C57-BC87-D4D0803AEEE8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C8BBE6A5-864E-4CF9-8021-8D4C105B9DF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C8BBE6A5-864E-4CF9-8021-8D4C105B9DF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C8BBE6A5-864E-4CF9-8021-8D4C105B9DF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C8BBE6A5-864E-4CF9-8021-8D4C105B9DF9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{89DA1FB0-CE0E-466A-897A-F96B541A8B6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{89DA1FB0-CE0E-466A-897A-F96B541A8B6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{89DA1FB0-CE0E-466A-897A-F96B541A8B6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{89DA1FB0-CE0E-466A-897A-F96B541A8B6B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CCA2F514-2028-47E4-8BDD-0C46B371836B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CCA2F514-2028-47E4-8BDD-0C46B371836B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CCA2F514-2028-47E4-8BDD-0C46B371836B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -242,9 +224,6 @@ Global
 		{813A7D2A-F144-40A7-B3F0-34CFF8D660D0} = {8013DEFB-F940-4891-9F74-BFE1A8106506}
 		{56C91033-3CBB-4FBB-9DC8-C0227F336C1A} = {14BFD4AE-BB54-40F6-96F8-D6F4D4A33B54}
 		{30E6FC2B-9331-454C-9FB6-E63A5503E23E} = {14BFD4AE-BB54-40F6-96F8-D6F4D4A33B54}
-		{63E215E5-EDC3-4C57-BC87-D4D0803AEEE8} = {14BFD4AE-BB54-40F6-96F8-D6F4D4A33B54}
-		{C8BBE6A5-864E-4CF9-8021-8D4C105B9DF9} = {14BFD4AE-BB54-40F6-96F8-D6F4D4A33B54}
-		{89DA1FB0-CE0E-466A-897A-F96B541A8B6B} = {14BFD4AE-BB54-40F6-96F8-D6F4D4A33B54}
 		{D8AB3D2C-6026-4ACA-BFBB-A341E4D913AD} = {F4E2D353-AD2D-455B-81B6-F743E0CAD7DF}
 		{3A6C3D77-82EA-4B83-BE30-22D0EE3A230F} = {F4E2D353-AD2D-455B-81B6-F743E0CAD7DF}
 		{CCA2F514-2028-47E4-8BDD-0C46B371836B} = {8013DEFB-F940-4891-9F74-BFE1A8106506}