Revert "Revert "Upgrade to .NET 6 (#806)"" (#852)

* Revert "Revert "Upgrade to .NET 6 (#806)" (#817)"

This reverts commit 885877c12b.

* Don't treat ILLink warnings as errors
This commit is contained in:
Next Turn
2021-08-09 11:46:30 +08:00
committed by GitHub
parent 600a8edc11
commit b774ee1ca5
7 changed files with 28 additions and 37 deletions

View File

@@ -25,6 +25,12 @@ strategy:
Release:
BuildConfiguration: Release
steps:
- task: UseDotNet@2
displayName: Install .NET SDK
inputs:
packageType: sdk
version: 6.x
includePreviewVersions: true
- task: DotNetCoreCLI@2
displayName: Build
inputs:
@@ -32,10 +38,8 @@ steps:
projects: src\WinSW.sln
arguments: -c $(BuildConfiguration) -p:Version=$(BuildVersion)
- script: |
dotnet publish src\WinSW\WinSW.csproj -c $(BuildConfiguration) -f net5.0-windows -r win-x64 -p:Version=$(BuildVersion)
dotnet publish src\WinSW\WinSW.csproj -c $(BuildConfiguration) -f net5.0-windows -r win-x86 -p:Version=$(BuildVersion)
dotnet publish src\WinSW\WinSW.csproj -c $(BuildConfiguration) -f net5.0-windows -r win-x64 -p:Version=$(BuildVersion) -p:IncludeNativeLibrariesForSelfExtract=true
dotnet publish src\WinSW\WinSW.csproj -c $(BuildConfiguration) -f net5.0-windows -r win-x86 -p:Version=$(BuildVersion) -p:IncludeNativeLibrariesForSelfExtract=true
dotnet publish src\WinSW\WinSW.csproj -c $(BuildConfiguration) -f net6.0-windows -r win-x64 -p:Version=$(BuildVersion)
dotnet publish src\WinSW\WinSW.csproj -c $(BuildConfiguration) -f net6.0-windows -r win-x86 -p:Version=$(BuildVersion)
displayName: Build
- task: DotNetCoreCLI@2
displayName: Test
@@ -55,14 +59,6 @@ steps:
artifact: WinSW-net461.exe_$(BuildConfiguration)
displayName: Publish .NET 4.6.1
- publish: artifacts\publish\WinSW-x64.zip
artifact: WinSW-x64.zip_$(BuildConfiguration)
displayName: Publish .NET x64 .zip
- publish: artifacts\publish\WinSW-x86.zip
artifact: WinSW-x86.zip_$(BuildConfiguration)
displayName: Publish .NET x86 .zip
- publish: artifacts\publish\WinSW-x64.exe
artifact: WinSW-x64.exe_$(BuildConfiguration)
displayName: Publish .NET x64 .exe