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

Fixes publishing (#156)

Browse source
This commit is contained in:
Kamron Batman 2020-05-29 17:31:47 -07:00 • committed by GitHub
parent 69ebb45e59
commit f408662af1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 7686 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

1
Directory.Build.props
View file

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

1
Projects/Argon2/Argon2.csproj
View file

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

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

File diff suppressed because it is too large Load diff

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

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

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

File diff suppressed because it is too large Load diff

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

File diff suppressed because it is too large Load diff

1
Projects/ZLib/ZLib.csproj
View file

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

12
Tools/publish.cmd
View file

@ -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} --self-contained=false -o Distribution/Assemblies Projects/UOContent/UOContent.csproj
dotnet publish ${c} ${r} --no-restore --self-contained=false -o Distribution Projects/Server/Server.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% --self-contained=false -o Distribution\Assemblies Projects\UOContent\UOContent.csproj
dotnet publish %c% %r% --no-restore --self-contained=false -o Distribution Projects\Server\Server.csproj
dotnet publish %c% %r% --no-restore --self-contained=false -o Distribution\Assemblies Projects\UOContent\UOContent.csproj