Fixes publishing (#156)

.github/workflows/dotnet-core.yml

@@ -46,7 +46,7 @@ jobs:
       with:
         path: |
           ~/.nuget/packages/argon2.bindings
-          Projects/Argon2/*
+          Projects/Argon2/**
           packages/Argon2.Bindings*.nupkg
         key: ${{ matrix.os }}-argon2-cache-v4-${{ hashFiles('Projects/Argon2/*') }}
         restore-keys: |
@@ -57,7 +57,7 @@ jobs:
       with:
         path: |
           ~/.nuget/packages/zlib.bindings
-          Projects/ZLib/*
+          Projects/ZLib/**
           packages/ZLib.Bindings*.nupkg
         key: ${{ matrix.os }}-zlib-cache-v4-${{ hashFiles('Projects/ZLib/*') }}
         restore-keys: |
@@ -65,12 +65,12 @@ jobs:
     - name: Build ZLib
       run: dotnet build -c Release Projects/ZLib/ZLib.csproj
     - name: Pack ZLib NuGet
-      if: steps.nuget-cache.outputs.cache-hit != 'true'
+      if: steps.zlib-cache.outputs.cache-hit != 'true'
       run: dotnet pack -c Release -o packages Projects/ZLib/ZLib.csproj
     - name: Build Argon2
       run: dotnet build -c Release Projects/Argon2/Argon2.csproj
     - name: Pack Argon2 NuGet
-      if: steps.nuget-cache.outputs.cache-hit != 'true'
+      if: steps.argon2-cache.outputs.cache-hit != 'true'
       run: dotnet pack -c Release -o packages Projects/Argon2/Argon2.csproj
     - name: Restore dependencies
       if: steps.nuget-cache.outputs.cache-hit != 'true' || steps.argon2-cache.outputs.cache-hit != 'true' || steps.zlib-cache.outputs.cache-hit != 'true'

Directory.Build.props

@@ -19,5 +19,6 @@
     <RestoreLockedMode>true</RestoreLockedMode>
     <NoWarn>NU1603</NoWarn>
     <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
+    <RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
   </PropertyGroup>
 </Project>

Projects/Argon2/Argon2.csproj

@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
     <PackageVersion>1.2.6</PackageVersion>
     <RootNamespace>System.Security.Cryptography</RootNamespace>
     <AssemblyName>Argon2.Bindings</AssemblyName>

Projects/Server/packages.lock.json

@@ -110,6 +110,54 @@
         "resolved": "1.0.1",
         "contentHash": "2G6OjjJzwBfNOO8myRV/nFrbTw5iA+DEm0N+qUqhrOmaVtn4pC77h38I1jsXGw5VH55+dPfQsqHD0We9sCl9FQ=="
       }
+    },
+    ".NETCoreApp,Version=v3.1/linux-x64": {
+      "ZLib.Bindings": {
+        "type": "Direct",
+        "requested": "[1.0.2, )",
+        "resolved": "1.0.2",
+        "contentHash": "0kZN3GZFO5PCzZWQ6QILfXvTQ9YIMtOjjQj4LXzvXuGNtC4Qd2Y9cR4pcVvd9sj0/a6P+R4xV6uaJM1ns0W9Gw=="
+      },
+      "Libuv": {
+        "type": "Transitive",
+        "resolved": "1.10.0",
+        "contentHash": "GsCf4q+eyaI49rCPlgYxdxa1SQCysXFFdSJWdstrwxytg4+VPYLYrXD4AT2rjHVJ+UF7SSWX9CapWEYaU4ejVQ==",
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "1.0.1"
+        }
+      }
+    },
+    ".NETCoreApp,Version=v3.1/osx-x64": {
+      "ZLib.Bindings": {
+        "type": "Direct",
+        "requested": "[1.0.2, )",
+        "resolved": "1.0.2",
+        "contentHash": "0kZN3GZFO5PCzZWQ6QILfXvTQ9YIMtOjjQj4LXzvXuGNtC4Qd2Y9cR4pcVvd9sj0/a6P+R4xV6uaJM1ns0W9Gw=="
+      },
+      "Libuv": {
+        "type": "Transitive",
+        "resolved": "1.10.0",
+        "contentHash": "GsCf4q+eyaI49rCPlgYxdxa1SQCysXFFdSJWdstrwxytg4+VPYLYrXD4AT2rjHVJ+UF7SSWX9CapWEYaU4ejVQ==",
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "1.0.1"
+        }
+      }
+    },
+    ".NETCoreApp,Version=v3.1/win-x64": {
+      "ZLib.Bindings": {
+        "type": "Direct",
+        "requested": "[1.0.2, )",
+        "resolved": "1.0.2",
+        "contentHash": "0kZN3GZFO5PCzZWQ6QILfXvTQ9YIMtOjjQj4LXzvXuGNtC4Qd2Y9cR4pcVvd9sj0/a6P+R4xV6uaJM1ns0W9Gw=="
+      },
+      "Libuv": {
+        "type": "Transitive",
+        "resolved": "1.10.0",
+        "contentHash": "GsCf4q+eyaI49rCPlgYxdxa1SQCysXFFdSJWdstrwxytg4+VPYLYrXD4AT2rjHVJ+UF7SSWX9CapWEYaU4ejVQ==",
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "1.0.1"
+        }
+      }
     }
   }
 }

Projects/ZLib/ZLib.csproj

@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
     <PackageVersion>1.0.2</PackageVersion>
     <RootNamespace>Server</RootNamespace>
     <AssemblyName>ZLib.Bindings</AssemblyName>

Tools/publish.cmd

@@ -11,7 +11,7 @@ else
 fi
 
 Tools/build-native-libraries.cmd $2
-dotnet restore
+dotnet restore  --force-evaluate
 
 if [[ $1 ]]
 then
@@ -25,8 +25,8 @@ else
   fi
 fi
 
-dotnet publish ${c} ${r} --self-contained=false -o Distribution Projects/Server/Server.csproj
+dotnet publish ${c} ${r} --no-restore --self-contained=false -o Distribution Projects/Server/Server.csproj
-dotnet publish ${c} ${r} --self-contained=false -o Distribution/Assemblies Projects/UOContent/UOContent.csproj
+dotnet publish ${c} ${r} --no-restore --self-contained=false -o Distribution/Assemblies Projects/UOContent/UOContent.csproj
 exit $?
 
 :CMDSCRIPT
@@ -37,7 +37,7 @@ IF "%~2" == "" (
 )
 
 CALL Tools\build-native-libraries.cmd %~2
-dotnet restore
+dotnet restore --force-evaluate
 
 IF "%~1" == "" (
   SET r=-r win-x64
@@ -45,5 +45,5 @@ IF "%~1" == "" (
   SET r=-r %~1-x64
 )
 
-dotnet publish %c% %r% --self-contained=false -o Distribution Projects\Server\Server.csproj
+dotnet publish %c% %r% --no-restore --self-contained=false -o Distribution Projects\Server\Server.csproj
-dotnet publish %c% %r% --self-contained=false -o Distribution\Assemblies Projects\UOContent\UOContent.csproj
+dotnet publish %c% %r% --no-restore --self-contained=false -o Distribution\Assemblies Projects\UOContent\UOContent.csproj