From fb9c7f396a33bcabe160a2065ddec57fd1a38385 Mon Sep 17 00:00:00 2001
From: Next Turn <45985406+nxtn@users.noreply.github.com>
Date: Sun, 29 Jan 2023 18:42:24 +0800
Subject: [PATCH] Upgrade to .NET 7

---
 Directory.Build.targets                |  2 +-
 eng/build.yml                          |  9 ++-------
 src/WinSW.Core/AssemblyInfo.cs         |  8 +++++++-
 src/WinSW.Core/ILLink.Descriptors.xml  |  5 +++++
 src/WinSW.Core/WinSW.Core.csproj       | 16 +++++++++++-----
 src/WinSW.Plugins/WinSW.Plugins.csproj |  9 ++++++---
 src/WinSW.Tests/WinSW.Tests.csproj     | 11 +++++++----
 src/WinSW/Properties/AssemblyInfo.cs   |  8 +++++++-
 src/WinSW/WinSW.csproj                 | 21 ++++++++++++++-------
 9 files changed, 60 insertions(+), 29 deletions(-)
 create mode 100644 src/WinSW.Core/ILLink.Descriptors.xml

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 93b21a9..612dce6 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,6 +1,6 @@
 <Project>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net461' or '$(TargetFramework)' == 'net6.0-windows'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net461' or '$(TargetFramework)' == 'net7.0-windows'">
     <DefineConstants>VNEXT</DefineConstants>
   </PropertyGroup>
 
diff --git a/eng/build.yml b/eng/build.yml
index a4b6b89..68d4eb9 100644
--- a/eng/build.yml
+++ b/eng/build.yml
@@ -26,11 +26,6 @@ strategy:
     Release:
       BuildConfiguration: Release
 steps:
-- task: UseDotNet@2
-  displayName: Install .NET SDK
-  inputs:
-    packageType: sdk
-    version: 6.x
 - task: DotNetCoreCLI@2
   displayName: Build
   inputs:
@@ -38,8 +33,8 @@ steps:
     projects: src\WinSW.sln
     arguments: -c $(BuildConfiguration) -p:Version=$(BuildVersion)
 - script: |
-    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)
+    dotnet publish -c $(BuildConfiguration) -f net7.0-windows -r win-x64 --sc src\WinSW\WinSW.csproj -p:Version=$(BuildVersion)
+    dotnet publish -c $(BuildConfiguration) -f net7.0-windows -r win-x86 --sc 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
diff --git a/src/WinSW.Core/AssemblyInfo.cs b/src/WinSW.Core/AssemblyInfo.cs
index 3e8e4d2..b24df4c 100644
--- a/src/WinSW.Core/AssemblyInfo.cs
+++ b/src/WinSW.Core/AssemblyInfo.cs
@@ -1,3 +1,9 @@
-using System.Runtime.CompilerServices;
+#if NET
+using System.Reflection;
+#endif
+using System.Runtime.CompilerServices;
 
+#if NET
+[assembly: AssemblyMetadata("IsTrimmable", "True")]
+#endif
 [assembly: InternalsVisibleTo("WinSW")]
diff --git a/src/WinSW.Core/ILLink.Descriptors.xml b/src/WinSW.Core/ILLink.Descriptors.xml
new file mode 100644
index 0000000..11fc0a3
--- /dev/null
+++ b/src/WinSW.Core/ILLink.Descriptors.xml
@@ -0,0 +1,5 @@
+<linker>
+  <assembly fullname="WinSW.Core">
+    <namespace fullname="WinSW.Configuration" />
+  </assembly>
+</linker>
diff --git a/src/WinSW.Core/WinSW.Core.csproj b/src/WinSW.Core/WinSW.Core.csproj
index a438d2a..0b1693e 100644
--- 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;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net20;net40;net461;net7.0-windows</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -18,12 +18,18 @@
     </PackageReference>
   </ItemGroup>
 
-  <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 Condition="'$(TargetFramework)' == 'net7.0-windows'">
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.0" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' != 'net6.0-windows'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0-windows'">
+    <EmbeddedResource Include="ILLink.Descriptors.xml">
+      <LogicalName>ILLink.Descriptors.xml</LogicalName>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' != 'net7.0-windows'">
     <Reference Include="System.ServiceProcess" />
   </ItemGroup>
 
diff --git a/src/WinSW.Plugins/WinSW.Plugins.csproj b/src/WinSW.Plugins/WinSW.Plugins.csproj
index 3c331a6..5dec5a0 100644
--- a/src/WinSW.Plugins/WinSW.Plugins.csproj
+++ b/src/WinSW.Plugins/WinSW.Plugins.csproj
@@ -1,14 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net20;net40;net461;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net20;net40;net461;net7.0-windows</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' != 'net6.0-windows'">
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
+  <ItemGroup Condition="'$(TargetFramework)' != 'net7.0-windows'">
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WinSW.Tests/WinSW.Tests.csproj b/src/WinSW.Tests/WinSW.Tests.csproj
index bd0ddc5..3afcb24 100644
--- 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;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net40;net461;net7.0-windows</TargetFrameworks>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
@@ -10,13 +10,16 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' != 'net6.0-windows'">
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
+  <ItemGroup Condition="'$(TargetFramework)' != 'net7.0-windows'">
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <Reference Include="System.ServiceProcess" />
   </ItemGroup>
 
diff --git a/src/WinSW/Properties/AssemblyInfo.cs b/src/WinSW/Properties/AssemblyInfo.cs
index 46e0067..8a01a15 100644
--- a/src/WinSW/Properties/AssemblyInfo.cs
+++ b/src/WinSW/Properties/AssemblyInfo.cs
@@ -1,3 +1,9 @@
-using System.Runtime.CompilerServices;
+#if NET
+using System.Reflection;
+#endif
+using System.Runtime.CompilerServices;
 
+#if NET
+[assembly: AssemblyMetadata("IsTrimmable", "True")]
+#endif
 [assembly: InternalsVisibleTo("Winsw.Tests")]
diff --git a/src/WinSW/WinSW.csproj b/src/WinSW/WinSW.csproj
index 9885557..f7288a4 100644
--- a/src/WinSW/WinSW.csproj
+++ b/src/WinSW/WinSW.csproj
@@ -2,11 +2,10 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net20;net40;net461;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net20;net40;net461;net7.0-windows</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <PublishTrimmed>true</PublishTrimmed>
 
     <AssemblyTitle>Windows Service Wrapper</AssemblyTitle>
     <Description>Allows arbitrary process to run as a Windows service by wrapping it.</Description>
@@ -15,15 +14,23 @@
     <Copyright>Copyright (c) 2008-2020 Kohsuke Kawaguchi, Sun Microsystems, Inc., CloudBees, Inc., Oleg Nenashev and other contributors</Copyright>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net6.0-windows' AND '$(RuntimeIdentifier)' != ''">
+  <PropertyGroup>
+    <PublishTrimmed>true</PublishTrimmed>
+    <TrimMode>partial</TrimMode>
+    <DebuggerSupport>false</DebuggerSupport>
+    <NullabilityInfoContextSupport>false</NullabilityInfoContextSupport>
+    <_AggressiveAttributeTrimming>true</_AggressiveAttributeTrimming>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net7.0-windows' AND '$(RuntimeIdentifier)' != ''">
     <PublishSingleFile>true</PublishSingleFile>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' != 'net6.0-windows'">
+  <PropertyGroup Condition="'$(TargetFramework)' != 'net7.0-windows'">
     <ILMergeVersion>3.0.41</ILMergeVersion>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' != 'net6.0-windows'">
+  <ItemGroup Condition="'$(TargetFramework)' != 'net7.0-windows'">
     <PackageReference Include="ilmerge" Version="$(ILMergeVersion)" />
     <Reference Include="System.ServiceProcess" />
   </ItemGroup>
@@ -33,7 +40,7 @@
     <ProjectReference Include="..\WinSW.Plugins\WinSW.Plugins.csproj" />
   </ItemGroup>
 
-  <Target Name="PublishCoreExe" AfterTargets="Publish" Condition="'$(TargetFramework)' == 'net6.0-windows'">
+  <Target Name="PublishCoreExe" AfterTargets="Publish" Condition="'$(TargetFramework)' == 'net7.0-windows'">
 
     <MakeDir Directories="$(ArtifactsPublishDir)" />
     <Copy SourceFiles="$(PublishDir)$(TargetName).exe" DestinationFiles="$(ArtifactsPublishDir)WinSW-$(PlatformTarget).exe" />
@@ -41,7 +48,7 @@
   </Target>
 
   <!-- Merge plugins and other DLLs into the executable -->
-  <Target Name="Merge" BeforeTargets="AfterBuild" Condition="'$(TargetFramework)' != 'net6.0-windows'">
+  <Target Name="Merge" BeforeTargets="AfterBuild" Condition="'$(TargetFramework)' != 'net7.0-windows'">
 
     <PropertyGroup Condition="'$(TargetFramework)' == 'net20'">
       <TargetPlatform>v2</TargetPlatform>