Fix NuGet private feed packaging

videre-project · Dec 27, 2023 · 5fdfc90 · 5fdfc90
1 parent 809f2c8
commit 5fdfc90
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 13 deletions.
diff --git a/MTGOSDK.Win32/MTGOSDK.Win32.csproj b/MTGOSDK.Win32/MTGOSDK.Win32.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
 		<LangVersion>Latest</LangVersion>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
   </PropertyGroup>
 
-</Project>
+</Project>
diff --git a/MTGOSDK/packages.lock.json b/MTGOSDK/packages.lock.json
@@ -13,6 +13,12 @@
           "System.Reflection.Emit": "4.7.0"
         }
       },
+      "Newtonsoft.Json": {
+        "type": "Direct",
+        "requested": "[13.0.3, )",
+        "resolved": "13.0.3",
+        "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
+      },
       "Dynamitey": {
         "type": "Transitive",
         "resolved": "3.0.3",
@@ -124,11 +130,6 @@
         "resolved": "1.1.0",
         "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg=="
       },
-      "Newtonsoft.Json": {
-        "type": "Transitive",
-        "resolved": "13.0.3",
-        "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
-      },
       "System.Collections.Immutable": {
         "type": "Transitive",
         "resolved": "6.0.0",

diff --git a/examples/BasicBot/packages.lock.json b/examples/BasicBot/packages.lock.json
@@ -173,6 +173,7 @@
         "dependencies": {
           "ImpromptuInterface": "[8.0.4, )",
           "MTGOSDK.Win32": "[1.0.0, )",
+          "Newtonsoft.Json": "[13.0.3, )",
           "RemoteNET": "[1.0.0, )",
           "ScubaDiver.API": "[1.0.0, )"
         }

diff --git a/examples/BasicInjector/packages.lock.json b/examples/BasicInjector/packages.lock.json
@@ -173,6 +173,7 @@
         "dependencies": {
           "ImpromptuInterface": "[8.0.4, )",
           "MTGOSDK.Win32": "[1.0.0, )",
+          "Newtonsoft.Json": "[13.0.3, )",
           "RemoteNET": "[1.0.0, )",
           "ScubaDiver.API": "[1.0.0, )"
         }

diff --git a/examples/GameTracker/packages.lock.json b/examples/GameTracker/packages.lock.json
@@ -173,6 +173,7 @@
         "dependencies": {
           "ImpromptuInterface": "[8.0.4, )",
           "MTGOSDK.Win32": "[1.0.0, )",
+          "Newtonsoft.Json": "[13.0.3, )",
           "RemoteNET": "[1.0.0, )",
           "ScubaDiver.API": "[1.0.0, )"
         }

diff --git a/package.sh b/package.sh
@@ -20,4 +20,12 @@ trap 'exit $?' 1 2 3 15
 
 curl.exe -sSL -k "$NUGET_URL" > "$NUGET_PATH"
 
-$NUGET_PATH add MTGOSDK/bin/Release/MTGOSDK.*.nupkg -source "$PACKAGE_DIR"
+#
+# Projects have to be bundled explicitly for packaging due to a bug with
+# NuGet that expects project references to be published separately.
+# Tracking issue: https://github.com/NuGet/Home/issues/3891
+#
+$NUGET_PATH add MTGOSDK/bin/Release/*.nupkg -source "$PACKAGE_DIR"
+$NUGET_PATH add MTGOSDK.Win32/bin/Release/*.nupkg -source "$PACKAGE_DIR"
+$NUGET_PATH add third_party/RemoteNET/src/RemoteNET/bin/Release/*.nupkg -source "$PACKAGE_DIR"
+$NUGET_PATH add third_party/RemoteNET/src/ScubaDiver.API/bin/Release/*.nupkg -source "$PACKAGE_DIR"
diff --git a/third_party/RemoteNET/src/RemoteNET/RemoteNET.csproj b/third_party/RemoteNET/src/RemoteNET/RemoteNET.csproj
@@ -3,8 +3,8 @@
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
 		<LangVersion>Latest</LangVersion>
-    <IsPackable>false</IsPackable>
 		<RunPostBuildEvent>Always</RunPostBuildEvent>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -66,4 +66,4 @@
 		<Exec Command="powershell &quot;Get-ChildItem -Path '$(ProjectDir)\Resources' | Set-Content -Value 'dummy'&quot;" />
 	</Target>
 
-</Project>
+</Project>
diff --git a/third_party/RemoteNET/src/ScubaDiver.API/ScubaDiver.API.csproj b/third_party/RemoteNET/src/ScubaDiver.API/ScubaDiver.API.csproj
@@ -5,7 +5,7 @@
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <NoWarn>1701;1702;8600;8602;8603;8618;8625</NoWarn>
-    <IsPackable>false</IsPackable>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <ItemGroup>
@@ -15,4 +15,4 @@
                       Version="13.0.3" />
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/third_party/RemoteNET/src/ScubaDiver/ScubaDiver.csproj b/third_party/RemoteNET/src/ScubaDiver/ScubaDiver.csproj
@@ -10,7 +10,6 @@
 	</PropertyGroup>
 
   <!-- Compiler Options -->
-  <!-- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> -->
   <PropertyGroup>
     <Deterministic>true</Deterministic>
     <FileAlignment>512</FileAlignment>
@@ -79,4 +78,4 @@
     <Exec Command="xcopy /Y &quot;$(TargetDir)\Microsoft.Diagnostics.Runtime.dll&quot; &quot;$(SolutionDir)dist\$(ConfigurationName)\Microsoft.Diagnostics.Runtime.dll*&quot;" />
   </Target>
 
-</Project>
+</Project>