From fad49e3e19b6561e844cc570dabec8c20b24d94a Mon Sep 17 00:00:00 2001
From: Cory Bennett <32466081+Qonfused@users.noreply.github.com>
Date: Sat, 16 Dec 2023 04:44:10 -0600
Subject: [PATCH] [MTGOSDK] Explicitly enumerate MTGO dependencies

Avoids importing unnecessary reference assemblies during build.
---
 MTGOSDK.MSBuild/build/MTGOSDK.MSBuild.props   |  2 +-
 MTGOSDK.MSBuild/build/MTGOSDK.MSBuild.targets | 10 +-----
 MTGOSDK.Ref/MTGOSDK.Ref.csproj                | 14 +--------
 MTGOSDK/MTGOSDK.csproj                        | 31 ++++++++++++-------
 4 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/MTGOSDK.MSBuild/build/MTGOSDK.MSBuild.props b/MTGOSDK.MSBuild/build/MTGOSDK.MSBuild.props
index cc0d1b20..85705c92 100644
--- a/MTGOSDK.MSBuild/build/MTGOSDK.MSBuild.props
+++ b/MTGOSDK.MSBuild/build/MTGOSDK.MSBuild.props
@@ -14,4 +14,4 @@
     <_MTGOSDK_Refs>$(SolutionDir)dist\$(Configuration)\Reference\MTGO</_MTGOSDK_Refs>
   </PropertyGroup>
 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/MTGOSDK.MSBuild/build/MTGOSDK.MSBuild.targets b/MTGOSDK.MSBuild/build/MTGOSDK.MSBuild.targets
index 8add625e..691f25bd 100644
--- a/MTGOSDK.MSBuild/build/MTGOSDK.MSBuild.targets
+++ b/MTGOSDK.MSBuild/build/MTGOSDK.MSBuild.targets
@@ -67,14 +67,6 @@
              Importance="high" />
     <Message Text="MTGOSDK.MSBuild: Reference assemblies are located at $(_MTGOSDK_Refs)"
              Importance="high" />
-
-    <PropertyGroup>
-      <!--
-        We need to set the `ReferencePath` property to include the path to the
-        MTGO reference assemblies so that consuming projects can resolve them.
-      -->
-      <ReferencePath>$(ReferencePath);$(_MTGOSDK_Refs)</ReferencePath>
-    </PropertyGroup>
   </Target>
 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/MTGOSDK.Ref/MTGOSDK.Ref.csproj b/MTGOSDK.Ref/MTGOSDK.Ref.csproj
index f71e7a91..e7830346 100644
--- a/MTGOSDK.Ref/MTGOSDK.Ref.csproj
+++ b/MTGOSDK.Ref/MTGOSDK.Ref.csproj
@@ -16,18 +16,6 @@
   <Import Project="..\MTGOSDK.MSBuild\build\MTGOSDK.MSBuild.props" />
   <Import Project="..\MTGOSDK.MSBuild\build\MTGOSDK.MSBuild.targets" />
 
-  <!-- Merge any executables into a single DLL to be used as a reference. -->
-  <Target Name="ILMerge"
-          AfterTargets="GenerateReferenceAssemblies"
-          Condition="Exists('$(_MTGOSDK_Refs)')">
-    <Exec Command="$(ILMergeConsolePath) ^
-      MTGO.exe /ndebug ^
-      /target=library ^
-      /lib=$(_MTGOSDK_Refs) ^
-      /out=$(_MTGOSDK_Refs)\MTGO.dll"
-    />
-  </Target>
-
   <!-- Notify the user that the reference assemblies have been built. -->
   <Target Name="NotifyRefsBuildComplete"
           AfterTargets="ILMerge"
@@ -43,4 +31,4 @@
              Importance="high" />
   </Target>
 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/MTGOSDK/MTGOSDK.csproj b/MTGOSDK/MTGOSDK.csproj
index 1f8fd74c..467704dc 100644
--- a/MTGOSDK/MTGOSDK.csproj
+++ b/MTGOSDK/MTGOSDK.csproj
@@ -5,18 +5,18 @@
     <LangVersion>Preview</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <NoWarn>
-      CS8597; <!-- Thrown value may be null. -->
-      CS8600; <!-- Converting null literal or possible null value to non-nullable type. -->
-      CS8602; <!-- Possible dereference of a null reference. -->
-      CS8603; <!-- Possible null reference return. -->
-      CS8604; <!-- Possible null reference argument for parameter -->
-      CS8625; <!-- Cannot convert null literal to non-nullable reference type. -->
-      IDE0065; <!-- Using directives within a namespace declaration. -->
-    </NoWarn>
+    <!-- Disables unenforcable nullable warnings - breaks static analysis -->
+    <NoWarn>$(NoWarn);CS8597;CS8600;CS8602;CS8603;CS8604;CS8625;IDE0065;</NoWarn>
+    <!-- Used for referencing WPF assemblies at runtime (w/ reflection) -->
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 
+  <!-- Publishing Configuration -->
+  <PropertyGroup>
+    <PublishDir>..\publish\</PublishDir>
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\MTGOSDK.Win32\MTGOSDK.Win32.csproj" />
     <ProjectReference Include="..\third_party\RemoteNET\src\RemoteNET\RemoteNET.csproj" />
@@ -29,6 +29,9 @@
     import the MTGOSDK.MSBuild.props file before referencing the project.
   -->
   <Import Project="..\MTGOSDK.MSBuild\build\MTGOSDK.MSBuild.props" />
+  <PropertyGroup>
+    <MTGOSDK_Refs>$(_MTGOSDK_Refs)\3.4.*.*</MTGOSDK_Refs>
+  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\MTGOSDK.Ref\MTGOSDK.Ref.csproj"
                       ReferenceOutputAssembly="false" />
@@ -37,10 +40,16 @@
       Note that the '_MTGOSDK_Refs' path does not reference the updated version
       subpath as it is only evaluated after building the MTGOSDK.Ref project.
     -->
-    <Reference Include="$(_MTGOSDK_Refs)\3.4.*.*\*.dll" />
+    <Reference Include="$(MTGOSDK_Refs)\Core.dll" />
+    <Reference Include="$(MTGOSDK_Refs)\FlsClient.dll" />
+    <Reference Include="$(MTGOSDK_Refs)\MTGOEnumStruct.dll" />
+    <Reference Include="$(MTGOSDK_Refs)\WotC.MtGO.Client.Common.dll" />
+    <Reference Include="$(MTGOSDK_Refs)\WotC.MtGO.Client.Model.Chat.dll" />
+    <Reference Include="$(MTGOSDK_Refs)\WotC.MtGO.Client.Model.Core.dll" />
+    <Reference Include="$(MTGOSDK_Refs)\WotC.MtGO.Client.Model.Reference.dll" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ImpromptuInterface" Version="7.0.1" />
   </ItemGroup>
 
-</Project>
+</Project>
\ No newline at end of file