Upgrade to .NET 6 (#807)

* Upgrade to .NET 6 * Bump Codecov.Tool to 1.13.0 * Don't treat ILLink warnings as errors * Update build.yml
2021-08-09 11:47:34 +08:00 · 2021-08-09 11:47:34 +08:00 · 20846238ea
parent e380e6c64e
commit 20846238ea
9 changed files with 31 additions and 32 deletions
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@ -3,7 +3,7 @@
  "isRoot": true,
  "tools": {
    "codecov.tool": {
-      "version": "1.12.1",
+      "version": "1.13.0",
      "commands": [
        "codecov"
      ]
--- a/Directory.Build.props
+++ b/Directory.Build.props
@ -2,6 +2,7 @@

  <PropertyGroup>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <ILLinkTreatWarningsAsErrors>false</ILLinkTreatWarningsAsErrors>
    <DebugType>full</DebugType>
    <ArtifactsDir>$(MSBuildThisFileDirectory)artifacts\</ArtifactsDir>
    <ArtifactsBinDir>$(ArtifactsDir)bin\</ArtifactsBinDir>
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@ -1,6 +1,6 @@
 <Project>

-  <PropertyGroup Condition="'$(TargetFramework)' == 'net461' or '$(TargetFramework)' == 'net5.0-windows'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net461' or '$(TargetFramework)' == 'net6.0-windows'">
    <DefineConstants>VNEXT</DefineConstants>
  </PropertyGroup>

--- a/eng/build.yml
+++ b/eng/build.yml
@ -26,6 +26,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:
@ -33,8 +39,8 @@ steps:
    projects: src\WinSW.sln
    arguments: -c $(BuildConfiguration) -p:Version=$(BuildVersion)
 - script: |
-    dotnet publish -c $(BuildConfiguration) -f net5.0-windows -r win-x64 src\WinSW\WinSW.csproj -p:PublishSingleFile=true -p:PublishTrimmed=true -p:Version=$(BuildVersion)
-    dotnet publish -c $(BuildConfiguration) -f net5.0-windows -r win-x86 src\WinSW\WinSW.csproj -p:PublishSingleFile=true -p:PublishTrimmed=true -p:Version=$(BuildVersion)
+    dotnet publish -c $(BuildConfiguration) -f net6.0-windows -r win-x64 src\WinSW\WinSW.csproj -p:Version=$(BuildVersion)
+    dotnet publish -c $(BuildConfiguration) -f net6.0-windows -r win-x86 src\WinSW\WinSW.csproj -p:Version=$(BuildVersion)
  displayName: Build
 - script: dotnet test -c $(BuildConfiguration) --collect "XPlat Code Coverage" --no-build src\WinSW.Tests\WinSW.Tests.csproj
  displayName: Test
@ -47,8 +53,8 @@ steps:
    versionEnvVar: BuildVersion
 - script: dotnet tool restore
  displayName: Restore tools
- script: dotnet tool run codecov -- -f "src\**\TestResults\*\coverage.cobertura.xml" --required
-  displayName: Upload code coverage reports
+# - script: dotnet tool run codecov -- -f "src\**\TestResults\*\coverage.cobertura.xml" --required
+#   displayName: Upload code coverage reports

 - publish: artifacts\publish\WinSW.NET2.exe
  artifact: WinSW.NET2.exe_$(BuildConfiguration)
@ -64,11 +70,11 @@ steps:

 - publish: artifacts\publish\WinSW-x64.exe
  artifact: WinSW-x64.exe_$(BuildConfiguration)
-  displayName: Publish .NET Core x64
+  displayName: Publish .NET x64

 - publish: artifacts\publish\WinSW-x86.exe
  artifact: WinSW-x86.exe_$(BuildConfiguration)
-  displayName: Publish .NET Core x86
+  displayName: Publish .NET x86

 - publish: $(Build.ArtifactStagingDirectory)\WinSW.$(BuildVersion).nupkg
  artifact: WinSW.nupkg_$(BuildConfiguration)
--- a/src/WinSW.Core/Download.cs
+++ b/src/WinSW.Core/Download.cs
@ -150,7 +150,9 @@ namespace WinSW
        public void Perform()
 #endif
        {
+#pragma warning disable SYSLIB0014 // Type or member is obsolete
            var request = WebRequest.Create(this.From);
+#pragma warning restore SYSLIB0014 // Type or member is obsolete
            if (!string.IsNullOrEmpty(this.Proxy))
            {
                var proxyInformation = new CustomProxyInformation(this.Proxy!);
--- a/src/WinSW.Core/WinSW.Core.csproj
+++ b/src/WinSW.Core/WinSW.Core.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net20;net40;net461;net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net20;net40;net461;net6.0-windows</TargetFrameworks>
    <LangVersion>latest</LangVersion>
    <Nullable>enable</Nullable>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@ -18,12 +18,12 @@
    </PackageReference>
  </ItemGroup>

-  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0-windows'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows'">
    <PackageReference Include="System.Security.AccessControl" Version="5.0.0" />
    <PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0" />
  </ItemGroup>

-  <ItemGroup Condition="'$(TargetFramework)' != 'net5.0-windows'">
+  <ItemGroup Condition="'$(TargetFramework)' != 'net6.0-windows'">
    <Reference Include="System.ServiceProcess" />
  </ItemGroup>

--- a/src/WinSW.Plugins/WinSW.Plugins.csproj
+++ b/src/WinSW.Plugins/WinSW.Plugins.csproj
@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net20;net40;net461;net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net20;net40;net461;net6.0-windows</TargetFrameworks>
    <LangVersion>latest</LangVersion>
    <Nullable>enable</Nullable>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  </PropertyGroup>

-  <ItemGroup Condition="'$(TargetFramework)' != 'net5.0-windows'">
+  <ItemGroup Condition="'$(TargetFramework)' != 'net6.0-windows'">
    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
  </ItemGroup>

--- a/src/WinSW.Tests/WinSW.Tests.csproj
+++ b/src/WinSW.Tests/WinSW.Tests.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>net40;net461;net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net40;net461;net6.0-windows</TargetFrameworks>
    <LangVersion>latest</LangVersion>
  </PropertyGroup>

@ -15,7 +15,7 @@
    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
  </ItemGroup>

-  <ItemGroup Condition="'$(TargetFramework)' != 'net5.0-windows'">
+  <ItemGroup Condition="'$(TargetFramework)' != 'net6.0-windows'">
    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
    <Reference Include="System.ServiceProcess" />
  </ItemGroup>
--- a/src/WinSW/WinSW.csproj
+++ b/src/WinSW/WinSW.csproj
@ -2,12 +2,11 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net20;net40;net461;net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net20;net40;net461;net6.0-windows</TargetFrameworks>
    <LangVersion>latest</LangVersion>
    <Nullable>enable</Nullable>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <PublishTrimmed>true</PublishTrimmed>
-    <TrimMode>Link</TrimMode>

    <AssemblyTitle>Windows Service Wrapper</AssemblyTitle>
    <Description>Allows arbitrary process to run as a Windows service by wrapping it.</Description>
@ -16,16 +15,15 @@
    <Copyright>Copyright (c) 2008-2020 Kohsuke Kawaguchi, Sun Microsystems, Inc., CloudBees, Inc., Oleg Nenashev and other contributors</Copyright>
  </PropertyGroup>

-  <PropertyGroup Condition="'$(TargetFramework)' == 'net5.0-windows' AND '$(RuntimeIdentifier)' != ''">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net6.0-windows' AND '$(RuntimeIdentifier)' != ''">
    <PublishSingleFile>true</PublishSingleFile>
-    <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
  </PropertyGroup>

-  <PropertyGroup Condition="'$(TargetFramework)' != 'net5.0-windows'">
+  <PropertyGroup Condition="'$(TargetFramework)' != 'net6.0-windows'">
    <ILMergeVersion>3.0.41</ILMergeVersion>
  </PropertyGroup>

-  <ItemGroup Condition="'$(TargetFramework)' != 'net5.0-windows'">
+  <ItemGroup Condition="'$(TargetFramework)' != 'net6.0-windows'">
    <PackageReference Include="ilmerge" Version="$(ILMergeVersion)" />
    <Reference Include="System.ServiceProcess" />
  </ItemGroup>
@ -35,23 +33,15 @@
    <ProjectReference Include="..\WinSW.Plugins\WinSW.Plugins.csproj" />
  </ItemGroup>

-  <Target Name="PublishCoreExe" AfterTargets="Publish" Condition="'$(TargetFramework)' == 'net5.0-windows'">
-
-    <PropertyGroup Condition="'$(RuntimeIdentifier)' == 'win-x64'">
-      <IdentifierSuffix>x64</IdentifierSuffix>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(RuntimeIdentifier)' == 'win-x86'">
-      <IdentifierSuffix>x86</IdentifierSuffix>
-    </PropertyGroup>
+  <Target Name="PublishCoreExe" AfterTargets="Publish" Condition="'$(TargetFramework)' == 'net6.0-windows'">

    <MakeDir Directories="$(ArtifactsPublishDir)" />
-    <Copy SourceFiles="$(PublishDir)$(TargetName).exe" DestinationFiles="$(ArtifactsPublishDir)WinSW-$(IdentifierSuffix).exe" />
+    <Copy SourceFiles="$(PublishDir)$(TargetName).exe" DestinationFiles="$(ArtifactsPublishDir)WinSW-$(PlatformTarget).exe" />

  </Target>

  <!-- Merge plugins and other DLLs into the executable -->
-  <Target Name="Merge" BeforeTargets="AfterBuild" Condition="'$(TargetFramework)' != 'net5.0-windows'">
+  <Target Name="Merge" BeforeTargets="AfterBuild" Condition="'$(TargetFramework)' != 'net6.0-windows'">

    <PropertyGroup Condition="'$(TargetFramework)' == 'net20'">
      <TargetPlatform>v2</TargetPlatform>