chore: Update all TFMs to net7.0

unoplatform · Nov 8, 2023 · ad3599a · ad3599a
1 parent 11ea4c2
commit ad3599a
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 26 deletions.
diff --git a/src/UWP/TestLibrary/TestLibrary.csproj b/src/UWP/TestLibrary/TestLibrary.csproj
@@ -4,7 +4,7 @@
 	Please see https://github.com/unoplatform/uno/issues/3909 for more details.
 	-->
 	<PropertyGroup>
-		<TargetFrameworks>uap10.0.19041;netstandard2.0;net6.0-ios;net6.0-macos;net6.0-maccatalyst;net6.0-android</TargetFrameworks>
+		<TargetFrameworks>uap10.0.19041;netstandard2.0;net7.0-ios;net7.0-macos;net7.0-maccatalyst;net7.0-android</TargetFrameworks>
 		<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
 		<GenerateLibraryLayout>true</GenerateLibraryLayout>
 	</PropertyGroup>
@@ -56,4 +56,4 @@
 			<UndefineProperties>TargetFramework</UndefineProperties>
 		</ProjectReference>
 	</ItemGroup>
-</Project>
+</Project>
diff --git a/src/UWP/TestLibrarySingleFile/TestLibrarySingleFile.csproj b/src/UWP/TestLibrarySingleFile/TestLibrarySingleFile.csproj
@@ -4,7 +4,7 @@
 	Please see https://github.com/unoplatform/uno/issues/3909 for more details.
 	-->
 	<PropertyGroup>
-		<TargetFrameworks>uap10.0.19041;netstandard2.0;net6.0-ios;net6.0-macos;net6.0-maccatalyst;net6.0-android</TargetFrameworks>
+		<TargetFrameworks>uap10.0.19041;netstandard2.0;net7.0-ios;net7.0-macos;net7.0-maccatalyst;net7.0-android</TargetFrameworks>
 		<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
 		<GenerateLibraryLayout>true</GenerateLibraryLayout>
 	</PropertyGroup>
@@ -63,4 +63,4 @@
 
 		<Error Condition="!exists('$(OutputPath)\$(AssemblyName)\Generated\mergedpages.xaml')" Text="Missing generated file" />
 	</Target>
-</Project>
+</Project>
diff --git a/src/WinUI/XamlMergeWinUITest.Mobile/XamlMergeWinUITest.Mobile.csproj b/src/WinUI/XamlMergeWinUITest.Mobile/XamlMergeWinUITest.Mobile.csproj
@@ -1,29 +1,29 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net6.0-android;net6.0-ios</TargetFrameworks>
+		<TargetFrameworks>net7.0-android;net7.0-ios</TargetFrameworks>
 
 		<!-- Disabled because of https://github.com/xamarin/xamarin-macios/issues/16401-->
 		<!--
-		<TargetFrameworks>$(TargetFrameworks);net6.0-macos</TargetFrameworks>
+		<TargetFrameworks>$(TargetFrameworks);net7.0-macos</TargetFrameworks>
 		-->
 		<SingleProject>true</SingleProject>
 		<OutputType>Exe</OutputType>
 		<!-- Debugger workaround https://github.com/dotnet/maui-samples/blob/8aa6b8780b12e97b157514c3bdc54bb4a13001cd/HelloMacCatalyst/HelloMacCatalyst.csproj#L7 -->
-		<!-- <MtouchExtraArgs Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">$(MtouchExtraArgs) -setenv:MONO_THREADS_SUSPEND=preemptive</MtouchExtraArgs> -->
+		<!-- <MtouchExtraArgs Condition="'$(TargetFramework)' == 'net7.0-maccatalyst'">$(MtouchExtraArgs) -setenv:MONO_THREADS_SUSPEND=preemptive</MtouchExtraArgs> -->
 		<!-- Required for C# Hot Reload, except for macOS which uses CoreCLR (not Mono) -->
 		<!-- Disabled because of https://github.com/dotnet/runtime/issues/68808 -->
-		<!--<UseInterpreter Condition="'$(Configuration)' == 'Debug' and '$(TargetFramework)' != 'net6.0-maccatalyst' and '$(TargetFramework)' != 'net6.0-macos'">True</UseInterpreter>-->
+		<!--<UseInterpreter Condition="'$(Configuration)' == 'Debug' and '$(TargetFramework)' != 'net7.0-maccatalyst' and '$(TargetFramework)' != 'net7.0-macos'">True</UseInterpreter>-->
 		<IsUnoHead>true</IsUnoHead>
-		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-ios'">14.2</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">14.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-android'">21.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="'$(TargetFramework)'=='net6.0-macos'">10.14</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-ios'">14.2</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-maccatalyst'">14.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-android'">21.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="'$(TargetFramework)'=='net7.0-macos'">10.14</SupportedOSPlatformVersion>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(RuntimeIdentifier)'==''">
 		<!-- Default values for command line builds -->
-		<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net6.0-ios'">iossimulator-x64</RuntimeIdentifier>
-		<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">maccatalyst-x64</RuntimeIdentifier>
-		<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net6.0-macos'">osx-x64</RuntimeIdentifier>
+		<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net7.0-ios'">iossimulator-x64</RuntimeIdentifier>
+		<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net7.0-maccatalyst'">maccatalyst-x64</RuntimeIdentifier>
+		<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net7.0-macos'">osx-x64</RuntimeIdentifier>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Uno.WinUI" Version="4.6.19" />
@@ -33,7 +33,7 @@
 		<PackageReference Include="Uno.WinUI.Lottie" Version="4.6.19" />
 	</ItemGroup>
 	<Choose>
-		<When Condition="'$(TargetFramework)'=='net6.0-android'">
+		<When Condition="'$(TargetFramework)'=='net7.0-android'">
 			<ItemGroup>
 				<PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.4" />
 				<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.36" />
@@ -42,8 +42,8 @@
 				<AndroidEnvironment Include="Android/environment.conf" />
 			</ItemGroup>
 		</When>
-		<When Condition="'$(TargetFramework)'=='net6.0-ios'">
-			<PropertyGroup Condition="'$(TargetFramework)'=='net6.0-ios'">
+		<When Condition="'$(TargetFramework)'=='net7.0-ios'">
+			<PropertyGroup Condition="'$(TargetFramework)'=='net7.0-ios'">
 				<MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
 				<!-- See https://github.com/unoplatform/uno/issues/9430 for more details. -->
 				<MtouchExtraArgs>$(MtouchExtraArgs) --registrar:static</MtouchExtraArgs>
@@ -54,7 +54,7 @@
 				<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
 			</ItemGroup>
 		</When>
-		<When Condition="'$(TargetFramework)'=='net6.0-maccatalyst'">
+		<When Condition="'$(TargetFramework)'=='net7.0-maccatalyst'">
 			<PropertyGroup>
 				<!-- Configure the GC -->
 				<MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
@@ -69,7 +69,7 @@
 				<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
 			</ItemGroup>
 		</When>
-		<When Condition="'$(TargetFramework)'=='net6.0-macos'">
+		<When Condition="'$(TargetFramework)'=='net7.0-macos'">
 			<PropertyGroup>
 			</PropertyGroup>
 		</When>
@@ -91,4 +91,4 @@
 
 	<Import Project="..\..\Uno.XamlMerge.Task\build\Uno.XamlMerge.Task.targets" />
 
-</Project>
+</Project>
diff --git a/src/WinUI/XamlMergeWinUITest.Skia.Gtk/XamlMergeWinUITest.Skia.Gtk.csproj b/src/WinUI/XamlMergeWinUITest.Skia.Gtk/XamlMergeWinUITest.Skia.Gtk.csproj
@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType>
 		<OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 	</PropertyGroup>
 	<ItemGroup Condition="exists('..\XamlMergeWinUITest.Windows')">
 		<EmbeddedResource Include="..\XamlMergeWinUITest.Windows\Package.appxmanifest" LogicalName="Package.appxmanifest" />
@@ -34,4 +34,4 @@
 	</ItemGroup>
 
 	<Import Project="..\..\Uno.XamlMerge.Task\build\Uno.XamlMerge.Task.targets" />
-</Project>
+</Project>
diff --git a/src/WinUI/XamlMergeWinUITest.Wasm/XamlMergeWinUITest.Wasm.csproj b/src/WinUI/XamlMergeWinUITest.Wasm/XamlMergeWinUITest.Wasm.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<NoWarn>NU1701</NoWarn>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Configuration)'=='Debug'">
@@ -62,4 +62,4 @@
 	</ItemGroup>
 
 	<Import Project="..\..\Uno.XamlMerge.Task\build\Uno.XamlMerge.Task.targets" />
-</Project>
+</Project>
diff --git a/src/WinUI/XamlMergeWinUITest.Windows/XamlMergeWinUITest.Windows.csproj b/src/WinUI/XamlMergeWinUITest.Windows/XamlMergeWinUITest.Windows.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
+		<TargetFramework>7.0-windows10.0.19041.0</TargetFramework>
 		<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
 		<RootNamespace>XamlMergeWinUITest</RootNamespace>
 		<ApplicationManifest>app.manifest</ApplicationManifest>