From 29bfcced622714744933a235df9bb0db0eeb0427 Mon Sep 17 00:00:00 2001 From: zznty <94796179+zznty@users.noreply.github.com> Date: Mon, 8 Jan 2024 19:40:44 +0700 Subject: [PATCH] fix this cringe with rids --- .github/workflows/release.yaml | 4 +--- Directory.Build.props | 3 ++- Torch.API/packages.lock.json | 2 +- Torch.Server.Tests/packages.lock.json | 25 +++++++++++++++++++++++-- Torch.Server/packages.lock.json | 2 +- Torch.Tests/packages.lock.json | 25 +++++++++++++++++++++++-- Torch/packages.lock.json | 2 +- 7 files changed, 52 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c83558c..8bda689 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -77,10 +77,8 @@ jobs: - name: Restore dependencies run: dotnet restore Torch.Server/Torch.Server.csproj --locked-mode - - name: Build - run: dotnet build Torch.Server/Torch.Server.csproj --no-restore -c ${{ env.BUILD_CONFIGURATION }} -p:Version="${{ needs.get-version.outputs.version }}" -p:AssemblyVersion="${{ needs.get-version.outputs.version }}" - name: Publish - run: dotnet publish Torch.Server/Torch.Server.csproj --no-build --sc -c ${{ env.BUILD_CONFIGURATION }} -o ./publish + run: dotnet publish Torch.Server/Torch.Server.csproj --no-restore --sc -c ${{ env.BUILD_CONFIGURATION }} -o ./publish -p:Version="${{ needs.get-version.outputs.version }}" -p:AssemblyVersion="${{ needs.get-version.outputs.version }}" - uses: vimtor/action-zip@v1 name: Zip Release diff --git a/Directory.Build.props b/Directory.Build.props index 27bf1cc..4a1aea3 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,8 +1,9 @@  net8.0-windows - win-x64 + win10-x64 true true + true diff --git a/Torch.API/packages.lock.json b/Torch.API/packages.lock.json index 297f7bb..44b1119 100644 --- a/Torch.API/packages.lock.json +++ b/Torch.API/packages.lock.json @@ -209,7 +209,7 @@ "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==" } }, - "net8.0-windows7.0/win-x64": { + "net8.0-windows7.0/win10-x64": { "System.Security.Cryptography.Pkcs": { "type": "Transitive", "resolved": "6.0.4", diff --git a/Torch.Server.Tests/packages.lock.json b/Torch.Server.Tests/packages.lock.json index 1cbbb8b..94f07a8 100644 --- a/Torch.Server.Tests/packages.lock.json +++ b/Torch.Server.Tests/packages.lock.json @@ -1572,7 +1572,7 @@ } } }, - "net8.0-windows7.0/win-x64": { + "net8.0-windows7.0/win10-x64": { "Microsoft.Win32.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -1690,6 +1690,16 @@ "resolved": "4.3.0", "contentHash": "c3YNH1GQJbfIPJeCnr4avseugSqPrxwIqzthYyZDN6EuOyNOzq+y2KSUfRcXauya1sF4foESTgwM5e1A8arAKw==" }, + "runtime.native.System.IO.Compression": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "INBPonS5QPEgn7naufQFXJEp3zX6L4bwHgJ/ZH78aBTpeNfQMtf7C6VrAFhlq2xxWBveIOWyFzQjJ8XzHMhdOQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "runtime.win7-x64.runtime.native.System.IO.Compression": "4.3.0" + } + }, "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": { "type": "Transitive", "resolved": "4.3.0", @@ -1832,6 +1842,16 @@ "System.Private.Uri": "4.3.0" } }, + "runtime.win7-x64.runtime.native.System.IO.Compression": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "UamDlgSO/nIzc96M+g3wbvAGbAuXjvRYR5Ttm/FVJgt2iva8ouOqSJ0j6eGI7pZDLvD/ZISl9XRZOajE/Xvizg==" + }, + "runtime.win7.System.Private.Uri": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "Q+IBgaPYicSQs2tBlmXqbS25c/JLIthWrgrpMwxKSOobW/OqIMVFruUGfuaz4QABVzV8iKdCAbN7APY7Tclbnw==" + }, "System.Buffers": { "type": "Transitive", "resolved": "4.3.0", @@ -2082,7 +2102,8 @@ "contentHash": "I4SwANiUGho1esj4V4oSlPllXjzCZDE+5XXso2P03LW2vOda2Enzh8DWOxwN6hnrJyp314c7KuVu31QYhRzOGg==", "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" + "Microsoft.NETCore.Targets": "1.1.0", + "runtime.win7.System.Private.Uri": "4.3.0" } }, "System.Reflection": { diff --git a/Torch.Server/packages.lock.json b/Torch.Server/packages.lock.json index d494843..615db1d 100644 --- a/Torch.Server/packages.lock.json +++ b/Torch.Server/packages.lock.json @@ -599,7 +599,7 @@ } } }, - "net8.0-windows7.0/win-x64": { + "net8.0-windows7.0/win10-x64": { "Steamworks.NET": { "type": "Direct", "requested": "[20.1.0, )", diff --git a/Torch.Tests/packages.lock.json b/Torch.Tests/packages.lock.json index 7487336..f93d2e7 100644 --- a/Torch.Tests/packages.lock.json +++ b/Torch.Tests/packages.lock.json @@ -1362,7 +1362,7 @@ } } }, - "net8.0-windows7.0/win-x64": { + "net8.0-windows7.0/win10-x64": { "Microsoft.Win32.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -1480,6 +1480,16 @@ "resolved": "4.3.0", "contentHash": "c3YNH1GQJbfIPJeCnr4avseugSqPrxwIqzthYyZDN6EuOyNOzq+y2KSUfRcXauya1sF4foESTgwM5e1A8arAKw==" }, + "runtime.native.System.IO.Compression": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "INBPonS5QPEgn7naufQFXJEp3zX6L4bwHgJ/ZH78aBTpeNfQMtf7C6VrAFhlq2xxWBveIOWyFzQjJ8XzHMhdOQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "runtime.win7-x64.runtime.native.System.IO.Compression": "4.3.0" + } + }, "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": { "type": "Transitive", "resolved": "4.3.0", @@ -1622,6 +1632,16 @@ "System.Private.Uri": "4.3.0" } }, + "runtime.win7-x64.runtime.native.System.IO.Compression": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "UamDlgSO/nIzc96M+g3wbvAGbAuXjvRYR5Ttm/FVJgt2iva8ouOqSJ0j6eGI7pZDLvD/ZISl9XRZOajE/Xvizg==" + }, + "runtime.win7.System.Private.Uri": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "Q+IBgaPYicSQs2tBlmXqbS25c/JLIthWrgrpMwxKSOobW/OqIMVFruUGfuaz4QABVzV8iKdCAbN7APY7Tclbnw==" + }, "System.Buffers": { "type": "Transitive", "resolved": "4.3.0", @@ -1864,7 +1884,8 @@ "contentHash": "I4SwANiUGho1esj4V4oSlPllXjzCZDE+5XXso2P03LW2vOda2Enzh8DWOxwN6hnrJyp314c7KuVu31QYhRzOGg==", "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.NETCore.Targets": "1.1.0" + "Microsoft.NETCore.Targets": "1.1.0", + "runtime.win7.System.Private.Uri": "4.3.0" } }, "System.Reflection": { diff --git a/Torch/packages.lock.json b/Torch/packages.lock.json index ec10c40..b75a825 100644 --- a/Torch/packages.lock.json +++ b/Torch/packages.lock.json @@ -403,7 +403,7 @@ } } }, - "net8.0-windows7.0/win-x64": { + "net8.0-windows7.0/win10-x64": { "System.Security.Cryptography.Pkcs": { "type": "Transitive", "resolved": "6.0.4",