warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes argon2 for osx and github action workflow issues (#157)

Browse source
This commit is contained in:
Kamron Batman 2020-05-29 18:02:00 -07:00 • committed by GitHub
parent f408662af1
commit 4f1825152c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 65 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

20
.github/workflows/dotnet-core.yml vendored
View file

@ -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

9
Projects/Argon2/Argon2.csproj
View file

@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<PackageVersion>1.2.6</PackageVersion>
<PackageVersion>1.2.7</PackageVersion>
<RootNamespace>System.Security.Cryptography</RootNamespace>
<AssemblyName>Argon2.Bindings</AssemblyName>
<IsPackable>true</IsPackable>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Configurations>Debug;Release;Analyze</Configurations>
<AssemblyVersion>1.2.6</AssemblyVersion>
<AssemblyVersion>1.2.7</AssemblyVersion>
</PropertyGroup>
<ItemGroup>
<Content Include="runtimes\win-x64\native\libargon2.dll">
@ -15,6 +15,11 @@
<PackagePath>runtimes/win-x64/native</PackagePath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="runtimes\osx-x64\native\libargon2.dylib">
<Pack>true</Pack>
<PackagePath>runtimes/osx-x64/native</PackagePath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="runtimes\linux-x64\native\libargon2.so">
<Pack>true</Pack>
<PackagePath>runtimes/linux-x64/native</PackagePath>

26
Projects/Server.Tests/packages.lock.json
View file

@ -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=="
}
}
}

8
Projects/Server/packages.lock.json
View file

@ -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",

26
Projects/UOContent.Tests/packages.lock.json
View file

@ -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=="
}
}
}

2
Projects/UOContent/UOContent.csproj
View file

@ -66,7 +66,7 @@
<PackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.4" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.4" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.4" />
<PackageReference Include="Argon2.Bindings" Version="1.2.6" />
<PackageReference Include="Argon2.Bindings" Version="1.2.7" />
<PackageReference Include="Zlib.Bindings" Version="1.0.2" />
</ItemGroup>
<ItemGroup Condition="'$(Configuration)'=='Analyze'">

32
Projects/UOContent/packages.lock.json
View file

@ -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",

2
Tools/publish.cmd
View file

@ -11,7 +11,7 @@ else
fi
Tools/build-native-libraries.cmd $2
dotnet restore --force-evaluate
dotnet restore --force-evaluate
if [[ $1 ]]
then