From 66ea19d4a4140958d66854e27e7312745a822873 Mon Sep 17 00:00:00 2001
From: nilaoda <nilaoda@live.com>
Date: Wed, 28 Sep 2022 20:49:02 +0800
Subject: [PATCH] upgrade to .net7-rc

---
 Directory.Build.props | 47 ++++++++++++++++++++-----------------------
 WVCore.Server.csproj  |  2 +-
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 0b34136..084980e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,30 +1,27 @@
 <Project>
 
-  <PropertyGroup>
-    <IlcOptimizationPreference>Speed</IlcOptimizationPreference>
-    <IlcFoldIdenticalMethodBodies>true</IlcFoldIdenticalMethodBodies>
-	<IlcTrimMetadata>false</IlcTrimMetadata>
-    <StaticallyLinked Condition="$(RuntimeIdentifier.StartsWith('win'))">true</StaticallyLinked>
-    <TrimMode>Link</TrimMode>
-    <TrimmerDefaultAction>link</TrimmerDefaultAction>
-    <NativeAotCompilerVersion>7.0.0-*</NativeAotCompilerVersion>
-  </PropertyGroup>
+	<PropertyGroup>
+		<IlcOptimizationPreference>Speed</IlcOptimizationPreference>
+		<IlcFoldIdenticalMethodBodies>true</IlcFoldIdenticalMethodBodies>
+		<IlcTrimMetadata>false</IlcTrimMetadata>
+		<StaticallyLinked Condition="$(RuntimeIdentifier.StartsWith('win'))">true</StaticallyLinked>
+		<TrimMode>Link</TrimMode>
+		<TrimmerDefaultAction>link</TrimmerDefaultAction>
+		<PublishAot>true</PublishAot>
+		<ObjCopyName Condition="'$(RuntimeIdentifier)' == 'linux-arm64'">aarch64-linux-gnu-objcopy</ObjCopyName>
+	</PropertyGroup>
+	
+	<ItemGroup Condition="'$(PublishAot)' == 'true' and '$(RuntimeIdentifier)' != 'win-arm64'">
+		<PackageReference Include="PublishAotCompressed" Version="0.0.3" />
+	</ItemGroup>
+	
+	<ItemGroup>
+		<!-- Do not generate partial metadata for types - always include all members even if they're unused -->
+		<IlcArg Include="--completetypemetadata" />
+		<!-- Generate extra data to make stack traces nicer -->
+		<IlcArg Include="--stacktracedata" />
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.ILCompiler" Version="$(NativeAotCompilerVersion)" />
-    <!-- Cross-compilation for Windows x64-arm64 and Linux x64-arm64 -->
-    <PackageReference Condition="'$(RuntimeIdentifier)'=='win-arm64'" Include="runtime.win-x64.Microsoft.DotNet.ILCompiler" Version="$(NativeAotCompilerVersion)" />
-    <PackageReference Condition="'$(RuntimeIdentifier)'=='linux-arm64'" Include="runtime.linux-x64.Microsoft.DotNet.ILCompiler" Version="$(NativeAotCompilerVersion)" />
-  </ItemGroup>
-
-  <ItemGroup>
-	<!-- Do not generate partial metadata for types - always include all members even if they're unused -->
-    <IlcArg Include="--completetypemetadata" />
-	<!-- Generate extra data to make stack traces nicer -->
-    <IlcArg Include="--stacktracedata" />
-    
-	<IlcArg Include="--reflectedonly" />
-    <RdXmlFile Include="rd.xml" />
-  </ItemGroup>
+		<RdXmlFile Include="rd.xml" />
+	</ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/WVCore.Server.csproj b/WVCore.Server.csproj
index d83fb1d..f586d98 100644
--- a/WVCore.Server.csproj
+++ b/WVCore.Server.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>