videre-project · Qonfused · Apr 1, 2024 · Mar 29, 2024 · Mar 30, 2024 · Mar 30, 2024
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,12 +2,15 @@
 <Project>
 
   <PropertyGroup>
+    <!-- Project Directories -->
     <SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
     <DistDir>$(SolutionDir)\dist</DistDir>
+    <!-- User Directories -->
+    <LocalDir>$([MSBuild]::NormalizeDirectory($(AppData)\..\Local))</LocalDir>
   </PropertyGroup>
 
   <PropertyGroup>
-    <LocalDir>$([MSBuild]::NormalizeDirectory($(AppData)\..\Local))</LocalDir>
+    <RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>
   </PropertyGroup>
 
-</Project>
+</Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -16,4 +16,4 @@
     <RemoveDir Directories="@(FoldersToClean)" />
   </Target> -->
 
-</Project>
+</Project>
diff --git a/MTGOSDK.MSBuild/build/MTGOSDK.MSBuild.targets b/MTGOSDK.MSBuild/build/MTGOSDK.MSBuild.targets
@@ -39,9 +39,6 @@
       <Output TaskParameter="Version" PropertyName="MTGOVersion" />
     </ExtractMTGOInstallation>
 
-    <Message Text="MTGOSDK.MSBuild: Extracted MTGO version $(MTGOVersion)"
-             Importance="high" />
-
     <!--
       We build reference assemblies from the latest MTGO installation directory
       to ensure that we're only targeting the latest APIs of the MTGO client.
@@ -53,6 +50,10 @@
         MTGOAppDir="$(MTGOAppDir)"
         Version="$(MTGOVersion)"
         OutputPath="$(_MTGOSDK_Refs)">
+      <!--
+        Indicates whether the task has skipped generating reference assemblies.
+      -->
+      <Output TaskParameter="HasSkipped" PropertyName="HasSkipped" />
       <!--
         Updates the internal reference path to reflect the new subpath.
 
@@ -64,9 +65,11 @@
 
     <!-- TODO: Verify the output reference assemblies w/ ILVerify -->
     <Message Text="MTGOSDK.MSBuild: Updated reference assemblies for MTGO version $(MTGOVersion)"
-             Importance="high" />
+             Importance="high"
+             Condition="'$(HasSkipped)' != 'true'" />
     <Message Text="MTGOSDK.MSBuild: Reference assemblies are located at $(_MTGOSDK_Refs)"
-             Importance="high" />
+             Importance="high"
+             Condition="'$(HasSkipped)' != 'true'" />
   </Target>
 
 </Project>
diff --git a/MTGOSDK.MSBuild/src/Tasks/ExtractMTGOInstallation.cs b/MTGOSDK.MSBuild/src/Tasks/ExtractMTGOInstallation.cs
@@ -20,14 +20,14 @@ namespace MTGOSDK.MSBuild.Tasks;
 public class ExtractMTGOInstallation : Task
 {
   /// <summary>
-  ///  The path to the MTGO application directory.
+  /// The path to the MTGO application directory.
   /// </summary>
   [Required]
   [Output]
   public string MTGOAppDir { get; set; } = string.Empty;
 
   /// <summary>
-  ///  The path to the MTGO user data directory.
+  /// The path to the MTGO user data directory.
   /// </summary>
   [Output]
   public string MTGODataDir { get; set; } = string.Empty;

diff --git a/MTGOSDK.MSBuild/src/Tasks/GenerateReferenceAssemblies.cs b/MTGOSDK.MSBuild/src/Tasks/GenerateReferenceAssemblies.cs
@@ -17,7 +17,7 @@ namespace MTGOSDK.MSBuild.Tasks;
 public class GenerateReferenceAssemblies : Task
 {
   /// <summary>
-  ///  The path to the MTGO application directory.
+  /// The path to the MTGO application directory.
   /// </summary>
   [Required]
   public string MTGOAppDir { get; set; } = string.Empty;
@@ -28,10 +28,15 @@ public class GenerateReferenceAssemblies : Task
   [Required]
   public string Version { get; set; } = string.Empty;
 
+  /// <summary>
+  /// Whether the task has been skipped.
+  /// </summary>
+  [Output]
+  public bool HasSkipped { get; set; } = false;
+
   /// <summary>
   /// The path to store the generated reference assemblies.
   /// </summary>
-  ///
   [Required]
   [Output]
   public string OutputPath { get; set; } = string.Empty;
@@ -45,7 +50,9 @@ public override bool Execute()
       Log.LogMessage(MessageImportance.High,
           $"MTGOSDK.MSBuild: Reference assemblies for version {Version} already exist.");
 
+      HasSkipped = true;
       OutputPath = versionPath;
+
       return true;
     }
     // Clear out previous versions' reference assemblies

diff --git a/MTGOSDK.Win32/src/Extensions/ProcessExtensions.cs b/MTGOSDK.Win32/src/Extensions/ProcessExtensions.cs
@@ -77,6 +77,19 @@ public static IEnumerable<MODULEENTRY32> GetModules(this Process process)
     }
   }
 
+  /// <summary>
+  /// Converts a <see cref="ProcessModuleCollection"/> to an enumerable collection of <see cref="ProcessModule"/>.
+  /// </summary>
+  /// <param name="collection">The <see cref="ProcessModuleCollection"/> to convert.</param>
+  /// <returns>An enumerable collection of <see cref="ProcessModule"/>.</returns>
+  public static IEnumerable<ProcessModule> AsEnumerable(this ProcessModuleCollection collection)
+  {
+    foreach (ProcessModule module in collection)
+    {
+      yield return module;
+    }
+  }
+
   /// <summary>
   /// Determines whether the specified process is a 64-bit process.
   /// </summary>

diff --git a/MTGOSDK/MTGOSDK.csproj b/MTGOSDK/MTGOSDK.csproj
@@ -1,65 +1,72 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net8.0-windows</TargetFrameworks>
     <LangVersion>Latest</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <!-- 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>
+    <NoWarn>$(NoWarn);
+      <!-- Disables unenforcable nullable warnings - breaks static analysis -->
+      CS8597;CS8600;CS8602;CS8603;CS8604;CS8625;CS8767;CS9113;IDE0065;
+      <!-- FIXME: From RemoteNET library -->
+      CS8601;CS8608;CS8610;CS8618;CS8619;CS8620;CS8765;
+    </NoWarn>
   </PropertyGroup>
 
-  <!-- Package Properties -->
-  <PropertyGroup>
-    <PackageId>MTGOSDK</PackageId>
-    <Version>1.0.0</Version>
-    <Authors>Cory Bennett</Authors>
-    <Company>Videre Project</Company>
-  </PropertyGroup>
-
-  <!-- Publishing Configuration -->
-  <PropertyGroup>
-    <PublishDir>..\publish\</PublishDir>
-    <DebugType>embedded</DebugType>
-    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-  </PropertyGroup>
+  <!-- Import MTGOSDK package properties -->
+  <Import Project="MTGOSDK.pkg.props" />
 
   <ItemGroup>
+		<PackageReference Include="Microsoft.CSharp"
+                      Version="4.7.0" />
+    <PackageReference Include="Microsoft.Diagnostics.Runtime"
+                      Version="3.1.512801" />
+    <PackageReference Include="Meziantou.Polyfill"
+                      Version="1.0.37"
+                      Condition="'$(TargetFramework)' == 'netstandard2.0'" />
     <PackageReference Include="ImpromptuInterface"
                       Version="8.0.4" />
     <PackageReference Include="Newtonsoft.Json"
                       Version="13.0.3" />
     <ProjectReference Include="..\MTGOSDK.Win32\MTGOSDK.Win32.csproj" />
-    <ProjectReference Include="..\third_party\RemoteNET\src\RemoteNET\RemoteNET.csproj" />
-    <ProjectReference Include="..\third_party\RemoteNET\src\ScubaDiver.API\ScubaDiver.API.csproj" />
   </ItemGroup>
 
-  <!--
-    Bootstrap the MTGOSDK.Ref project to generate reference assemblies for
-    the current MTGO version. Due to the way that MSBuild works, this must
-    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>
+  <!-- For builds used by the ScubaDiver assembly, exclude compiling the API -->
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <DefaultItemExcludes>$(DefaultItemExcludes);src\API\**</DefaultItemExcludes>
   </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\MTGOSDK.Ref\MTGOSDK.Ref.csproj"
-                      ReferenceOutputAssembly="false" />
-    <!--
-      Include reference assemblies to compile against the current MTGO version.
-      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)\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>
+
+  <!-- Import MTGOSDK reference assemblies -->
+  <Import Project="MTGOSDK.ref.props"
+          Condition="'$(TargetFramework)' != 'netstandard2.0'" />
+
+  <!-- Configures build-time resource dependencies for the main library -->
+  <Target Name="CollectResourceProjects"
+          BeforeTargets="ResolveProjectReferences"
+          Condition="'$(TargetFramework)' != 'netstandard2.0'">
+    <ItemGroup>
+      <ResourceProjects Include="..\third_party\ScubaDiver\ScubaDiver.csproj" />
+      <ResourceProjects Include="..\third_party\SharpNeedle\src\Bootstrapper\*.vcxproj" />
+      <ResourceProjects Include="..\third_party\SharpNeedle\src\Launcher\*.vcxproj" />
+      <ProjectReference Include="@(ResourceProjects)"
+                        ReferenceOutputAssembly="false"
+                        Private="false" />
+    </ItemGroup>
+  </Target>
+
+  <!-- Bundle resource projects' build artifacts into the main library -->
+  <Target Name="EmbedResources"
+          BeforeTargets="CoreCompile"
+          AfterTargets="ResolveProjectReferences"
+          DependsOnTargets="CollectResourceProjects"
+          Condition="'@(ResourceProjects)' != ''">
+    <ItemGroup>
+      <ResourceFiles Include="$(SolutionDir)\dist\$(Configuration)\Win32\*.*" />
+      <ResourceFiles Include="$(SolutionDir)\dist\$(Configuration)\x64\*.*" />
+      <ResourceFiles Include="$(SolutionDir)\dist\$(Configuration)\*.*" />
+      <EmbeddedResource Include="@(ResourceFiles)"
+                        LogicalName="Resources\%(Filename)%(Extension)" />
+    </ItemGroup>
+	</Target>
 
 </Project>
diff --git a/MTGOSDK/MTGOSDK.pkg.props b/MTGOSDK/MTGOSDK.pkg.props
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- Package Properties -->
+  <PropertyGroup>
+    <PackageId>MTGOSDK</PackageId>
+    <Version>1.0.0</Version>
+    <Authors>Cory Bennett</Authors>
+    <Company>Videre Project</Company>
+  </PropertyGroup>
+
+  <!-- Publishing Configuration -->
+  <PropertyGroup>
+    <PublishDir>..\publish\</PublishDir>
+    <DebugType>embedded</DebugType>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+  </PropertyGroup>
+
+</Project>
diff --git a/MTGOSDK/MTGOSDK.ref.props b/MTGOSDK/MTGOSDK.ref.props
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <!-- Disables warnings for referencing incompatible project TFMs -->
+    <NoWarn>$(NoWarn);NU1702;MSB3277;</NoWarn>
+    <!-- Used for referencing WPF assemblies at runtime (w/ reflection) -->
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+
+  <!--
+    Bootstrap the MTGOSDK.Ref project to generate reference assemblies for
+    the current MTGO version. Due to the way that MSBuild works, this must
+    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" />
+    <!--
+      Include reference assemblies to compile against the current MTGO version.
+      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)\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>
+
+</Project>