diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index a9039eb94..b674ab446 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -34,10 +34,10 @@ jobs: ~/.nuget/packages !~/.nuget/packages/argon2.bindings !~/.nuget/packages/zlib.bindings - Projects/*/obj/project.assets.json - Projects/*/obj/project.nuget.cache - Projects/*/obj/*.csproj.nuget.* - key: ${{ matrix.os }}-nuget-cache-v3-${{ hashFiles('**/packages.lock.json') }} + ${{ github.workspace }}/Projects/*/obj/project.assets.json + ${{ github.workspace }}/Projects/*/obj/project.nuget.cache + ${{ github.workspace }}/Projects/*/obj/*.csproj.nuget.* + key: ${{ matrix.os }}-nuget-cache-v5-${{ hashFiles('**/packages.lock.json') }} restore-keys: | ${{ matrix.os }}-nuget-cache-v3 - name: Argon2 Library Cache @@ -46,9 +46,9 @@ jobs: with: path: | ~/.nuget/packages/argon2.bindings - Projects/Argon2/** - packages/Argon2.Bindings*.nupkg - key: ${{ matrix.os }}-argon2-cache-v4-${{ hashFiles('Projects/Argon2/*') }} + ${{ github.workspace }}/Projects/Argon2/** + ${{ github.workspace }}/packages/Argon2.Bindings*.nupkg + key: ${{ matrix.os }}-argon2-cache-v5-${{ hashFiles('Projects/Argon2/*') }} restore-keys: | ${{ matrix.os }}-argon2-cache-v4 - name: ZLib Library Cache @@ -57,9 +57,9 @@ jobs: with: path: | ~/.nuget/packages/zlib.bindings - Projects/ZLib/** - packages/ZLib.Bindings*.nupkg - key: ${{ matrix.os }}-zlib-cache-v4-${{ hashFiles('Projects/ZLib/*') }} + ${{ github.workspace }}/Projects/ZLib/** + ${{ github.workspace }}/packages/ZLib.Bindings*.nupkg + key: ${{ matrix.os }}-zlib-cache-v5-${{ hashFiles('Projects/ZLib/*') }} restore-keys: | ${{ matrix.os }}-zlib-cache-v4 - name: Build ZLib diff --git a/Projects/Argon2/Argon2.csproj b/Projects/Argon2/Argon2.csproj index 16775ddc7..619e5ecb7 100644 --- a/Projects/Argon2/Argon2.csproj +++ b/Projects/Argon2/Argon2.csproj @@ -1,13 +1,13 @@  - 1.2.6 + 1.2.7 System.Security.Cryptography Argon2.Bindings true false true Debug;Release;Analyze - 1.2.6 + 1.2.7 @@ -15,6 +15,11 @@ runtimes/win-x64/native PreserveNewest + + true + runtimes/osx-x64/native + PreserveNewest + true runtimes/linux-x64/native diff --git a/Projects/Server.Tests/packages.lock.json b/Projects/Server.Tests/packages.lock.json index 43424a6cc..9ffcc492f 100644 --- a/Projects/Server.Tests/packages.lock.json +++ b/Projects/Server.Tests/packages.lock.json @@ -40,8 +40,8 @@ }, "Argon2.Bindings": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "DGu6R+oH7zf1sBKLRYgqeXjRj68wlIsPDZhKY42WfJ4ECSU2v8qlD6zNW6TxSAERUATkq/9bH1ZxbhFdmmzCcA==" + "resolved": "1.2.7", + "contentHash": "6pip5MqEpx9QKXFtFYEYoHCz8rhKqw03xzNefHadFE38JZtt97l+JDif9quvpGnGyq6sGKU3BKsjLh/beyVI3w==" }, "Libuv": { "type": "Transitive", @@ -1371,7 +1371,7 @@ "ZLib.Bindings": { "type": "Transitive", "resolved": "1.0.2", - "contentHash": "0kZN3GZFO5PCzZWQ6QILfXvTQ9YIMtOjjQj4LXzvXuGNtC4Qd2Y9cR4pcVvd9sj0/a6P+R4xV6uaJM1ns0W9Gw==" + "contentHash": "rd7gUFhwKb9Pd5ehhsUUdZiGS/AQQ1v0UItP2J+EYIfKzq7H54yDQ509qcBmbNtr6zTz7AAax4zRUcg3j9mfyQ==" }, "ModernUO": { "type": "Project", @@ -1386,7 +1386,7 @@ "uocontent": { "type": "Project", "dependencies": { - "Argon2.Bindings": "1.2.6", + "Argon2.Bindings": "1.2.7", "MailKit": "2.6.0", "Microsoft.AspNetCore.Connections.Abstractions": "3.1.4", "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.4", @@ -1398,8 +1398,8 @@ ".NETCoreApp,Version=v3.1/linux-x64": { "Argon2.Bindings": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "DGu6R+oH7zf1sBKLRYgqeXjRj68wlIsPDZhKY42WfJ4ECSU2v8qlD6zNW6TxSAERUATkq/9bH1ZxbhFdmmzCcA==" + "resolved": "1.2.7", + "contentHash": "6pip5MqEpx9QKXFtFYEYoHCz8rhKqw03xzNefHadFE38JZtt97l+JDif9quvpGnGyq6sGKU3BKsjLh/beyVI3w==" }, "Libuv": { "type": "Transitive", @@ -2303,14 +2303,14 @@ "ZLib.Bindings": { "type": "Transitive", "resolved": "1.0.2", - "contentHash": "0kZN3GZFO5PCzZWQ6QILfXvTQ9YIMtOjjQj4LXzvXuGNtC4Qd2Y9cR4pcVvd9sj0/a6P+R4xV6uaJM1ns0W9Gw==" + "contentHash": "rd7gUFhwKb9Pd5ehhsUUdZiGS/AQQ1v0UItP2J+EYIfKzq7H54yDQ509qcBmbNtr6zTz7AAax4zRUcg3j9mfyQ==" } }, ".NETCoreApp,Version=v3.1/osx-x64": { "Argon2.Bindings": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "DGu6R+oH7zf1sBKLRYgqeXjRj68wlIsPDZhKY42WfJ4ECSU2v8qlD6zNW6TxSAERUATkq/9bH1ZxbhFdmmzCcA==" + "resolved": "1.2.7", + "contentHash": "6pip5MqEpx9QKXFtFYEYoHCz8rhKqw03xzNefHadFE38JZtt97l+JDif9quvpGnGyq6sGKU3BKsjLh/beyVI3w==" }, "Libuv": { "type": "Transitive", @@ -3214,14 +3214,14 @@ "ZLib.Bindings": { "type": "Transitive", "resolved": "1.0.2", - "contentHash": "0kZN3GZFO5PCzZWQ6QILfXvTQ9YIMtOjjQj4LXzvXuGNtC4Qd2Y9cR4pcVvd9sj0/a6P+R4xV6uaJM1ns0W9Gw==" + "contentHash": "rd7gUFhwKb9Pd5ehhsUUdZiGS/AQQ1v0UItP2J+EYIfKzq7H54yDQ509qcBmbNtr6zTz7AAax4zRUcg3j9mfyQ==" } }, ".NETCoreApp,Version=v3.1/win-x64": { "Argon2.Bindings": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "DGu6R+oH7zf1sBKLRYgqeXjRj68wlIsPDZhKY42WfJ4ECSU2v8qlD6zNW6TxSAERUATkq/9bH1ZxbhFdmmzCcA==" + "resolved": "1.2.7", + "contentHash": "6pip5MqEpx9QKXFtFYEYoHCz8rhKqw03xzNefHadFE38JZtt97l+JDif9quvpGnGyq6sGKU3BKsjLh/beyVI3w==" }, "Libuv": { "type": "Transitive", @@ -4122,7 +4122,7 @@ "ZLib.Bindings": { "type": "Transitive", "resolved": "1.0.2", - "contentHash": "0kZN3GZFO5PCzZWQ6QILfXvTQ9YIMtOjjQj4LXzvXuGNtC4Qd2Y9cR4pcVvd9sj0/a6P+R4xV6uaJM1ns0W9Gw==" + "contentHash": "rd7gUFhwKb9Pd5ehhsUUdZiGS/AQQ1v0UItP2J+EYIfKzq7H54yDQ509qcBmbNtr6zTz7AAax4zRUcg3j9mfyQ==" } } } diff --git a/Projects/Server/packages.lock.json b/Projects/Server/packages.lock.json index ada3cce27..f61829449 100644 --- a/Projects/Server/packages.lock.json +++ b/Projects/Server/packages.lock.json @@ -46,7 +46,7 @@ "type": "Direct", "requested": "[1.0.2, )", "resolved": "1.0.2", - "contentHash": "0kZN3GZFO5PCzZWQ6QILfXvTQ9YIMtOjjQj4LXzvXuGNtC4Qd2Y9cR4pcVvd9sj0/a6P+R4xV6uaJM1ns0W9Gw==" + "contentHash": "rd7gUFhwKb9Pd5ehhsUUdZiGS/AQQ1v0UItP2J+EYIfKzq7H54yDQ509qcBmbNtr6zTz7AAax4zRUcg3j9mfyQ==" }, "Libuv": { "type": "Transitive", @@ -116,7 +116,7 @@ "type": "Direct", "requested": "[1.0.2, )", "resolved": "1.0.2", - "contentHash": "0kZN3GZFO5PCzZWQ6QILfXvTQ9YIMtOjjQj4LXzvXuGNtC4Qd2Y9cR4pcVvd9sj0/a6P+R4xV6uaJM1ns0W9Gw==" + "contentHash": "rd7gUFhwKb9Pd5ehhsUUdZiGS/AQQ1v0UItP2J+EYIfKzq7H54yDQ509qcBmbNtr6zTz7AAax4zRUcg3j9mfyQ==" }, "Libuv": { "type": "Transitive", @@ -132,7 +132,7 @@ "type": "Direct", "requested": "[1.0.2, )", "resolved": "1.0.2", - "contentHash": "0kZN3GZFO5PCzZWQ6QILfXvTQ9YIMtOjjQj4LXzvXuGNtC4Qd2Y9cR4pcVvd9sj0/a6P+R4xV6uaJM1ns0W9Gw==" + "contentHash": "rd7gUFhwKb9Pd5ehhsUUdZiGS/AQQ1v0UItP2J+EYIfKzq7H54yDQ509qcBmbNtr6zTz7AAax4zRUcg3j9mfyQ==" }, "Libuv": { "type": "Transitive", @@ -148,7 +148,7 @@ "type": "Direct", "requested": "[1.0.2, )", "resolved": "1.0.2", - "contentHash": "0kZN3GZFO5PCzZWQ6QILfXvTQ9YIMtOjjQj4LXzvXuGNtC4Qd2Y9cR4pcVvd9sj0/a6P+R4xV6uaJM1ns0W9Gw==" + "contentHash": "rd7gUFhwKb9Pd5ehhsUUdZiGS/AQQ1v0UItP2J+EYIfKzq7H54yDQ509qcBmbNtr6zTz7AAax4zRUcg3j9mfyQ==" }, "Libuv": { "type": "Transitive", diff --git a/Projects/UOContent.Tests/packages.lock.json b/Projects/UOContent.Tests/packages.lock.json index 43424a6cc..9ffcc492f 100644 --- a/Projects/UOContent.Tests/packages.lock.json +++ b/Projects/UOContent.Tests/packages.lock.json @@ -40,8 +40,8 @@ }, "Argon2.Bindings": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "DGu6R+oH7zf1sBKLRYgqeXjRj68wlIsPDZhKY42WfJ4ECSU2v8qlD6zNW6TxSAERUATkq/9bH1ZxbhFdmmzCcA==" + "resolved": "1.2.7", + "contentHash": "6pip5MqEpx9QKXFtFYEYoHCz8rhKqw03xzNefHadFE38JZtt97l+JDif9quvpGnGyq6sGKU3BKsjLh/beyVI3w==" }, "Libuv": { "type": "Transitive", @@ -1371,7 +1371,7 @@ "ZLib.Bindings": { "type": "Transitive", "resolved": "1.0.2", - "contentHash": "0kZN3GZFO5PCzZWQ6QILfXvTQ9YIMtOjjQj4LXzvXuGNtC4Qd2Y9cR4pcVvd9sj0/a6P+R4xV6uaJM1ns0W9Gw==" + "contentHash": "rd7gUFhwKb9Pd5ehhsUUdZiGS/AQQ1v0UItP2J+EYIfKzq7H54yDQ509qcBmbNtr6zTz7AAax4zRUcg3j9mfyQ==" }, "ModernUO": { "type": "Project", @@ -1386,7 +1386,7 @@ "uocontent": { "type": "Project", "dependencies": { - "Argon2.Bindings": "1.2.6", + "Argon2.Bindings": "1.2.7", "MailKit": "2.6.0", "Microsoft.AspNetCore.Connections.Abstractions": "3.1.4", "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.4", @@ -1398,8 +1398,8 @@ ".NETCoreApp,Version=v3.1/linux-x64": { "Argon2.Bindings": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "DGu6R+oH7zf1sBKLRYgqeXjRj68wlIsPDZhKY42WfJ4ECSU2v8qlD6zNW6TxSAERUATkq/9bH1ZxbhFdmmzCcA==" + "resolved": "1.2.7", + "contentHash": "6pip5MqEpx9QKXFtFYEYoHCz8rhKqw03xzNefHadFE38JZtt97l+JDif9quvpGnGyq6sGKU3BKsjLh/beyVI3w==" }, "Libuv": { "type": "Transitive", @@ -2303,14 +2303,14 @@ "ZLib.Bindings": { "type": "Transitive", "resolved": "1.0.2", - "contentHash": "0kZN3GZFO5PCzZWQ6QILfXvTQ9YIMtOjjQj4LXzvXuGNtC4Qd2Y9cR4pcVvd9sj0/a6P+R4xV6uaJM1ns0W9Gw==" + "contentHash": "rd7gUFhwKb9Pd5ehhsUUdZiGS/AQQ1v0UItP2J+EYIfKzq7H54yDQ509qcBmbNtr6zTz7AAax4zRUcg3j9mfyQ==" } }, ".NETCoreApp,Version=v3.1/osx-x64": { "Argon2.Bindings": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "DGu6R+oH7zf1sBKLRYgqeXjRj68wlIsPDZhKY42WfJ4ECSU2v8qlD6zNW6TxSAERUATkq/9bH1ZxbhFdmmzCcA==" + "resolved": "1.2.7", + "contentHash": "6pip5MqEpx9QKXFtFYEYoHCz8rhKqw03xzNefHadFE38JZtt97l+JDif9quvpGnGyq6sGKU3BKsjLh/beyVI3w==" }, "Libuv": { "type": "Transitive", @@ -3214,14 +3214,14 @@ "ZLib.Bindings": { "type": "Transitive", "resolved": "1.0.2", - "contentHash": "0kZN3GZFO5PCzZWQ6QILfXvTQ9YIMtOjjQj4LXzvXuGNtC4Qd2Y9cR4pcVvd9sj0/a6P+R4xV6uaJM1ns0W9Gw==" + "contentHash": "rd7gUFhwKb9Pd5ehhsUUdZiGS/AQQ1v0UItP2J+EYIfKzq7H54yDQ509qcBmbNtr6zTz7AAax4zRUcg3j9mfyQ==" } }, ".NETCoreApp,Version=v3.1/win-x64": { "Argon2.Bindings": { "type": "Transitive", - "resolved": "1.2.6", - "contentHash": "DGu6R+oH7zf1sBKLRYgqeXjRj68wlIsPDZhKY42WfJ4ECSU2v8qlD6zNW6TxSAERUATkq/9bH1ZxbhFdmmzCcA==" + "resolved": "1.2.7", + "contentHash": "6pip5MqEpx9QKXFtFYEYoHCz8rhKqw03xzNefHadFE38JZtt97l+JDif9quvpGnGyq6sGKU3BKsjLh/beyVI3w==" }, "Libuv": { "type": "Transitive", @@ -4122,7 +4122,7 @@ "ZLib.Bindings": { "type": "Transitive", "resolved": "1.0.2", - "contentHash": "0kZN3GZFO5PCzZWQ6QILfXvTQ9YIMtOjjQj4LXzvXuGNtC4Qd2Y9cR4pcVvd9sj0/a6P+R4xV6uaJM1ns0W9Gw==" + "contentHash": "rd7gUFhwKb9Pd5ehhsUUdZiGS/AQQ1v0UItP2J+EYIfKzq7H54yDQ509qcBmbNtr6zTz7AAax4zRUcg3j9mfyQ==" } } } diff --git a/Projects/UOContent/UOContent.csproj b/Projects/UOContent/UOContent.csproj index f10c78e8c..5f5cb5d65 100644 --- a/Projects/UOContent/UOContent.csproj +++ b/Projects/UOContent/UOContent.csproj @@ -66,7 +66,7 @@ - + diff --git a/Projects/UOContent/packages.lock.json b/Projects/UOContent/packages.lock.json index b5e5e6e88..b17fa4684 100644 --- a/Projects/UOContent/packages.lock.json +++ b/Projects/UOContent/packages.lock.json @@ -4,9 +4,9 @@ ".NETCoreApp,Version=v3.1": { "Argon2.Bindings": { "type": "Direct", - "requested": "[1.2.6, )", - "resolved": "1.2.6", - "contentHash": "DGu6R+oH7zf1sBKLRYgqeXjRj68wlIsPDZhKY42WfJ4ECSU2v8qlD6zNW6TxSAERUATkq/9bH1ZxbhFdmmzCcA==" + "requested": "[1.2.7, )", + "resolved": "1.2.7", + "contentHash": "6pip5MqEpx9QKXFtFYEYoHCz8rhKqw03xzNefHadFE38JZtt97l+JDif9quvpGnGyq6sGKU3BKsjLh/beyVI3w==" }, "MailKit": { "type": "Direct", @@ -52,7 +52,7 @@ "type": "Direct", "requested": "[1.0.2, )", "resolved": "1.0.2", - "contentHash": "0kZN3GZFO5PCzZWQ6QILfXvTQ9YIMtOjjQj4LXzvXuGNtC4Qd2Y9cR4pcVvd9sj0/a6P+R4xV6uaJM1ns0W9Gw==" + "contentHash": "rd7gUFhwKb9Pd5ehhsUUdZiGS/AQQ1v0UItP2J+EYIfKzq7H54yDQ509qcBmbNtr6zTz7AAax4zRUcg3j9mfyQ==" }, "Libuv": { "type": "Transitive", @@ -847,15 +847,15 @@ ".NETCoreApp,Version=v3.1/linux-x64": { "Argon2.Bindings": { "type": "Direct", - "requested": "[1.2.6, )", - "resolved": "1.2.6", - "contentHash": "DGu6R+oH7zf1sBKLRYgqeXjRj68wlIsPDZhKY42WfJ4ECSU2v8qlD6zNW6TxSAERUATkq/9bH1ZxbhFdmmzCcA==" + "requested": "[1.2.7, )", + "resolved": "1.2.7", + "contentHash": "6pip5MqEpx9QKXFtFYEYoHCz8rhKqw03xzNefHadFE38JZtt97l+JDif9quvpGnGyq6sGKU3BKsjLh/beyVI3w==" }, "ZLib.Bindings": { "type": "Direct", "requested": "[1.0.2, )", "resolved": "1.0.2", - "contentHash": "0kZN3GZFO5PCzZWQ6QILfXvTQ9YIMtOjjQj4LXzvXuGNtC4Qd2Y9cR4pcVvd9sj0/a6P+R4xV6uaJM1ns0W9Gw==" + "contentHash": "rd7gUFhwKb9Pd5ehhsUUdZiGS/AQQ1v0UItP2J+EYIfKzq7H54yDQ509qcBmbNtr6zTz7AAax4zRUcg3j9mfyQ==" }, "Libuv": { "type": "Transitive", @@ -1571,15 +1571,15 @@ ".NETCoreApp,Version=v3.1/osx-x64": { "Argon2.Bindings": { "type": "Direct", - "requested": "[1.2.6, )", - "resolved": "1.2.6", - "contentHash": "DGu6R+oH7zf1sBKLRYgqeXjRj68wlIsPDZhKY42WfJ4ECSU2v8qlD6zNW6TxSAERUATkq/9bH1ZxbhFdmmzCcA==" + "requested": "[1.2.7, )", + "resolved": "1.2.7", + "contentHash": "6pip5MqEpx9QKXFtFYEYoHCz8rhKqw03xzNefHadFE38JZtt97l+JDif9quvpGnGyq6sGKU3BKsjLh/beyVI3w==" }, "ZLib.Bindings": { "type": "Direct", "requested": "[1.0.2, )", "resolved": "1.0.2", - "contentHash": "0kZN3GZFO5PCzZWQ6QILfXvTQ9YIMtOjjQj4LXzvXuGNtC4Qd2Y9cR4pcVvd9sj0/a6P+R4xV6uaJM1ns0W9Gw==" + "contentHash": "rd7gUFhwKb9Pd5ehhsUUdZiGS/AQQ1v0UItP2J+EYIfKzq7H54yDQ509qcBmbNtr6zTz7AAax4zRUcg3j9mfyQ==" }, "Libuv": { "type": "Transitive", @@ -2295,15 +2295,15 @@ ".NETCoreApp,Version=v3.1/win-x64": { "Argon2.Bindings": { "type": "Direct", - "requested": "[1.2.6, )", - "resolved": "1.2.6", - "contentHash": "DGu6R+oH7zf1sBKLRYgqeXjRj68wlIsPDZhKY42WfJ4ECSU2v8qlD6zNW6TxSAERUATkq/9bH1ZxbhFdmmzCcA==" + "requested": "[1.2.7, )", + "resolved": "1.2.7", + "contentHash": "6pip5MqEpx9QKXFtFYEYoHCz8rhKqw03xzNefHadFE38JZtt97l+JDif9quvpGnGyq6sGKU3BKsjLh/beyVI3w==" }, "ZLib.Bindings": { "type": "Direct", "requested": "[1.0.2, )", "resolved": "1.0.2", - "contentHash": "0kZN3GZFO5PCzZWQ6QILfXvTQ9YIMtOjjQj4LXzvXuGNtC4Qd2Y9cR4pcVvd9sj0/a6P+R4xV6uaJM1ns0W9Gw==" + "contentHash": "rd7gUFhwKb9Pd5ehhsUUdZiGS/AQQ1v0UItP2J+EYIfKzq7H54yDQ509qcBmbNtr6zTz7AAax4zRUcg3j9mfyQ==" }, "Libuv": { "type": "Transitive", diff --git a/Tools/publish.cmd b/Tools/publish.cmd index 22e25eaca..d070536f7 100755 --- a/Tools/publish.cmd +++ b/Tools/publish.cmd @@ -11,7 +11,7 @@ else fi Tools/build-native-libraries.cmd $2 -dotnet restore --force-evaluate +dotnet restore --force-evaluate if [[ $1 ]] then