chore: Adjust macos net9

unoplatform · Oct 8, 2024 · d1f0200 · d1f0200
1 parent a093392
commit d1f0200
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 42 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -21,7 +21,7 @@
 		<NetCurrent>net9.0</NetCurrent>
 		<NetPrevious>net8.0</NetPrevious>
 
-		<NetCurrentNetCoreMobile>$(NetCurrent)-android;$(NetCurrent)-ios18.0;$(NetCurrent)-maccatalyst18.0;$(NetCurrent)-macos14.5</NetCurrentNetCoreMobile>
+		<NetCurrentNetCoreMobile>$(NetCurrent)-android;$(NetCurrent)-ios18.0;$(NetCurrent)-maccatalyst18.0;$(NetCurrent)-macos15.0</NetCurrentNetCoreMobile>
 		<NetPreviousNetCoreMobile>$(NetPrevious)-android;$(NetPrevious)-ios17.0;$(NetPrevious)-maccatalyst17.0;$(NetPrevious)-macos14.0</NetPreviousNetCoreMobile>
 
 		<NetPreviousWpf>$(NetPrevious)-windows</NetPreviousWpf>

diff --git a/build/nuget/Uno.WinUI.DevServer.nuspec b/build/nuget/Uno.WinUI.DevServer.nuspec
@@ -70,8 +70,8 @@
 				<dependency id="Microsoft.IO.RecyclableMemoryStream" version="2.3.2" />
 			</group>
 
-			<!-- net9.0-macos14.5 -->
-			<group targetFramework="net9.0-macos14.5">
+			<!-- net9.0-macos15.0 -->
+			<group targetFramework="net9.0-macos15.0">
 				<dependency id="Uno.WinUI" version="1.29.0-dev.93" />
 				<dependency id="Uno.WinUI.DevServer.Messaging" version="1.29.0-dev.93" />
 
@@ -151,8 +151,8 @@
 		<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net9.0-maccatalyst18.0\Uno.UI.RemoteControl.dll" target="lib\net9.0-maccatalyst18.0" />
 		<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net9.0-maccatalyst18.0\Uno.UI.RemoteControl.pdb" target="lib\net9.0-maccatalyst18.0" />
 
-		<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net9.0-macos14.5\Uno.UI.RemoteControl.dll" target="lib\net9.0-macos14.5" />
-		<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net9.0-macos14.5\Uno.UI.RemoteControl.pdb" target="lib\net9.0-macos14.5" />
+		<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net9.0-macos15.0\Uno.UI.RemoteControl.dll" target="lib\net9.0-macos15.0" />
+		<file src="..\..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net9.0-macos15.0\Uno.UI.RemoteControl.pdb" target="lib\net9.0-macos15.0" />
 
 		<!-- Processors -->
 		<file src="..\..\src\Uno.UI.RemoteControl.Server.Processors\bin\Release\net8.0\*.dll" target="tools\rc\processors\net8.0" />

diff --git a/build/nuget/Uno.WinUI.Lottie.nuspec b/build/nuget/Uno.WinUI.Lottie.nuspec
@@ -88,7 +88,7 @@
 				<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
 				<dependency id="System.Json" version="4.7.1" />
 			</group>
-			<group targetFramework="net9.0-macos14.5">
+			<group targetFramework="net9.0-macos15.0">
 				<dependency id="SkiaSharp.Skottie" version="2.88.7" />
 				<dependency id="SkiaSharp.Views.Uno" version="2.88.7" />
 				<dependency id="SkiaSharp.NativeAssets.macos" version="2.88.7" />
@@ -117,7 +117,7 @@
 			<group targetFramework="net9.0-maccatalyst18.0">
 				<reference file="Uno.UI.Lottie.dll" />
 			</group>
-			<group targetFramework="net9.0-macos14.5">
+			<group targetFramework="net9.0-macos15.0">
 				<reference file="Uno.UI.Lottie.dll" />
 			</group>
 			<group targetFramework="net9.0-android">

diff --git a/build/nuget/Uno.WinUI.MSAL.nuspec b/build/nuget/Uno.WinUI.MSAL.nuspec
@@ -62,7 +62,7 @@
 				<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
 				<dependency id="Microsoft.Identity.Client" version="4.61.3" />
 			</group>
-			<group targetFramework="net9.0-macos14.5">
+			<group targetFramework="net9.0-macos15.0">
 				<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
 				<dependency id="Microsoft.Identity.Client" version="4.61.3" />
 			</group>
@@ -91,7 +91,7 @@
 		<file src="..\..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.netcoremobile\Release\net9.0-android\Uno.UI.MSAL.*" target="lib\net9.0-android" />
 		<file src="..\..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.netcoremobile\Release\net9.0-ios18.0\Uno.UI.MSAL.*" target="lib\net9.0-ios18.0" />
 		<file src="..\..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.netcoremobile\Release\net9.0-maccatalyst18.0\Uno.UI.MSAL.*" target="lib\net9.0-maccatalyst18.0" />
-		<file src="..\..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.netcoremobile\Release\net9.0-macos14.5\Uno.UI.MSAL.*" target="lib\net9.0-macos14.5" />
+		<file src="..\..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.netcoremobile\Release\net9.0-macos15.0\Uno.UI.MSAL.*" target="lib\net9.0-macos15.0" />
 
 		<!-- Build targets -->
 		<file src="..\..\src\AddIns\Uno.UI.MSAL\buildTransitive\*" target="buildTransitive" />

diff --git a/build/nuget/Uno.WinUI.RemoteControl.nuspec b/build/nuget/Uno.WinUI.RemoteControl.nuspec
@@ -37,6 +37,6 @@
 		<file src="_._" target="lib\net9.0-android" />
 		<file src="_._" target="lib\net9.0-ios18.0" />
 		<file src="_._" target="lib\net9.0-maccatalyst18.0" />
-		<file src="_._" target="lib\net9.0-macos14.5" />
+		<file src="_._" target="lib\net9.0-macos15.0" />
 	</files>
 </package>
diff --git a/build/nuget/Uno.WinUI.XamlHost.nuspec b/build/nuget/Uno.WinUI.XamlHost.nuspec
@@ -34,7 +34,7 @@
 			<group targetFramework="net9.0-maccatalyst18.0">
 				<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
 			</group>
-			<group targetFramework="net9.0-macos14.5">
+			<group targetFramework="net9.0-macos15.0">
 				<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
 			</group>
 		</dependencies>
@@ -61,8 +61,8 @@
 		<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net9.0-maccatalyst18.0\Uno.UI.XamlHost.dll" target="lib\net9.0-maccatalyst18.0" />
 		<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net9.0-maccatalyst18.0\Uno.UI.XamlHost.pdb" target="lib\net9.0-maccatalyst18.0" />
 
-		<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net9.0-macos14.5\Uno.UI.XamlHost.dll" target="lib\net9.0-macos14.5" />
-		<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net9.0-macos14.5\Uno.UI.XamlHost.pdb" target="lib\net9.0-macos14.5" />
+		<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net9.0-macos15.0\Uno.UI.XamlHost.dll" target="lib\net9.0-macos15.0" />
+		<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net9.0-macos15.0\Uno.UI.XamlHost.pdb" target="lib\net9.0-macos15.0" />
 
 		<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net9.0-android\Uno.UI.XamlHost.dll" target="lib\net9.0-android30.0" />
 		<file src="..\..\src\Uno.UI.XamlHost\Bin\Uno.UI.XamlHost.netcoremobile\Release\net9.0-android\Uno.UI.XamlHost.pdb" target="lib\net9.0-android30.0" />

diff --git a/build/nuget/Uno.WinUI.nuspec b/build/nuget/Uno.WinUI.nuspec
@@ -50,8 +50,8 @@
 				<dependency id="Uno.Fonts.Fluent" version="2.4.5" />
 			</group>
 
-			<!-- net9.0-macos14.5 -->
-			<group targetFramework="net9.0-macos14.5">
+			<!-- net9.0-macos15.0 -->
+			<group targetFramework="net9.0-macos15.0">
 				<dependency id="Uno.Foundation.Logging" version="0.0.0" />
 				<dependency id="Uno.Diagnostics.Eventing" version="2.0.1" />
 				<dependency id="Uno.Fonts.Fluent" version="2.4.5" />
@@ -223,8 +223,8 @@
 				<reference file="Uno.UI.FluentTheme.v2.dll" />
 			</group>
 
-			<!-- net9.0-macos14.5 -->
-			<group targetFramework="net9.0-macos14.5">
+			<!-- net9.0-macos15.0 -->
+			<group targetFramework="net9.0-macos15.0">
 				<reference file="Uno.Xaml.dll" />
 				<reference file="Uno.UI.dll" />
 				<reference file="Uno.UI.Composition.dll" />
@@ -423,28 +423,28 @@
 		<file src="..\..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.netcoremobile\Release\net9.0-maccatalyst18.0\Uno.UI.Toolkit.dll" target="lib\net9.0-maccatalyst18.0" />
 		<file src="..\..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.netcoremobile\Release\net9.0-maccatalyst18.0\Uno.UI.Toolkit.pdb" target="lib\net9.0-maccatalyst18.0" />
 
-		<!-- net9.0-macos14.5 -->
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-macos14.5\Uno.dll" target="lib\net9.0-macos14.5" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-macos14.5\Uno.pdb" target="lib\net9.0-macos14.5" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-macos14.5\Uno.Foundation.dll" target="lib\net9.0-macos14.5" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-macos14.5\Uno.Foundation.pdb" target="lib\net9.0-macos14.5" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-macos14.5\Uno.UI.dll" target="lib\net9.0-macos14.5" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-macos14.5\Uno.UI.pdb" target="lib\net9.0-macos14.5" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-macos14.5\Uno.UI.Composition.dll" target="lib\net9.0-macos14.5" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-macos14.5\Uno.UI.Composition.pdb" target="lib\net9.0-macos14.5" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-macos14.5\Uno.UI.Dispatching.dll" target="lib\net9.0-macos14.5" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-macos14.5\Uno.UI.Dispatching.pdb" target="lib\net9.0-macos14.5" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-macos14.5\Uno.Xaml.dll" target="lib\net9.0-macos14.5" />
-		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-macos14.5\Uno.Xaml.pdb" target="lib\net9.0-macos14.5" />
-		<file src="..\..\src\Uno.UI\bin\Uno.UI.netcoremobile\Release\net9.0-macos14.5\*.xml" target="lib\net9.0-macos14.5" />
-		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net9.0-macos14.5\Uno.UI.FluentTheme.dll" target="lib\net9.0-macos14.5" />
-		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net9.0-macos14.5\Uno.UI.FluentTheme.pdb" target="lib\net9.0-macos14.5" />
-		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net9.0-macos14.5\Uno.UI.FluentTheme.v1.dll" target="lib\net9.0-macos14.5" />
-		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net9.0-macos14.5\Uno.UI.FluentTheme.v1.pdb" target="lib\net9.0-macos14.5" />
-		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net9.0-macos14.5\Uno.UI.FluentTheme.v2.dll" target="lib\net9.0-macos14.5" />
-		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net9.0-macos14.5\Uno.UI.FluentTheme.v2.pdb" target="lib\net9.0-macos14.5" />
-		<file src="..\..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.netcoremobile\Release\net9.0-macos14.5\Uno.UI.Toolkit.dll" target="lib\net9.0-macos14.5" />
-		<file src="..\..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.netcoremobile\Release\net9.0-macos14.5\Uno.UI.Toolkit.pdb" target="lib\net9.0-macos14.5" />
+		<!-- net9.0-macos15.0 -->
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-macos15.0\Uno.dll" target="lib\net9.0-macos15.0" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-macos15.0\Uno.pdb" target="lib\net9.0-macos15.0" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-macos15.0\Uno.Foundation.dll" target="lib\net9.0-macos15.0" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-macos15.0\Uno.Foundation.pdb" target="lib\net9.0-macos15.0" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-macos15.0\Uno.UI.dll" target="lib\net9.0-macos15.0" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-macos15.0\Uno.UI.pdb" target="lib\net9.0-macos15.0" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-macos15.0\Uno.UI.Composition.dll" target="lib\net9.0-macos15.0" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-macos15.0\Uno.UI.Composition.pdb" target="lib\net9.0-macos15.0" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-macos15.0\Uno.UI.Dispatching.dll" target="lib\net9.0-macos15.0" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-macos15.0\Uno.UI.Dispatching.pdb" target="lib\net9.0-macos15.0" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-macos15.0\Uno.Xaml.dll" target="lib\net9.0-macos15.0" />
+		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-macos15.0\Uno.Xaml.pdb" target="lib\net9.0-macos15.0" />
+		<file src="..\..\src\Uno.UI\bin\Uno.UI.netcoremobile\Release\net9.0-macos15.0\*.xml" target="lib\net9.0-macos15.0" />
+		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net9.0-macos15.0\Uno.UI.FluentTheme.dll" target="lib\net9.0-macos15.0" />
+		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net9.0-macos15.0\Uno.UI.FluentTheme.pdb" target="lib\net9.0-macos15.0" />
+		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net9.0-macos15.0\Uno.UI.FluentTheme.v1.dll" target="lib\net9.0-macos15.0" />
+		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net9.0-macos15.0\Uno.UI.FluentTheme.v1.pdb" target="lib\net9.0-macos15.0" />
+		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net9.0-macos15.0\Uno.UI.FluentTheme.v2.dll" target="lib\net9.0-macos15.0" />
+		<file src="..\..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.netcoremobile\Release\net9.0-macos15.0\Uno.UI.FluentTheme.v2.pdb" target="lib\net9.0-macos15.0" />
+		<file src="..\..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.netcoremobile\Release\net9.0-macos15.0\Uno.UI.Toolkit.dll" target="lib\net9.0-macos15.0" />
+		<file src="..\..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.netcoremobile\Release\net9.0-macos15.0\Uno.UI.Toolkit.pdb" target="lib\net9.0-macos15.0" />
 
 		<!-- net9.0-android30.0 -->
 		<file src="..\..\src\Uno.UI\Bin\Uno.UI.netcoremobile\Release\net9.0-android\Uno.dll" target="lib\net9.0-android30.0" />
@@ -626,7 +626,7 @@
 		<file src="Uno.WinUI.targets" target="buildTransitive\net9.0-android30.0" />
 		<file src="Uno.WinUI.targets" target="buildTransitive\net9.0-ios18.0" />
 		<file src="Uno.WinUI.targets" target="buildTransitive\net9.0-maccatalyst18.0" />
-		<file src="Uno.WinUI.targets" target="buildTransitive\net9.0-macos14.5" />
+		<file src="Uno.WinUI.targets" target="buildTransitive\net9.0-macos15.0" />
 		<file src="Uno.WinUI.targets" target="buildTransitive\net9.0-windows" />
 
 		<file src="Uno.WinUI.props" target="buildTransitive\net8.0" />
@@ -637,7 +637,7 @@
 		<file src="Uno.WinUI.props" target="buildTransitive\net9.0-android30.0" />
 		<file src="Uno.WinUI.props" target="buildTransitive\net9.0-ios18.0" />
 		<file src="Uno.WinUI.props" target="buildTransitive\net9.0-maccatalyst18.0" />
-		<file src="Uno.WinUI.props" target="buildTransitive\net9.0-macos14.5" />
+		<file src="Uno.WinUI.props" target="buildTransitive\net9.0-macos15.0" />
 		<file src="Uno.WinUI.props" target="buildTransitive\net9.0-windows" />
 
 		<file src="uno.winui.cross-runtime.targets" target="buildTransitive" />

diff --git a/src/targetframework-override.props b/src/targetframework-override.props
@@ -7,7 +7,7 @@
 	<TargetFrameworks Condition="'$(TargetFrameworks)'=='net8.0-maccatalyst' and '$(OutputType)'!='Exe'">net8.0-maccatalyst17.0</TargetFrameworks>
 	<TargetFrameworks Condition="'$(TargetFrameworks)'=='net9.0-maccatalyst' and '$(OutputType)'!='Exe'">net9.0-maccatalyst18.0</TargetFrameworks>
 	<TargetFrameworks Condition="'$(TargetFrameworks)'=='net8.0-macos'">net8.0-macos14.0</TargetFrameworks>
-	<TargetFrameworks Condition="'$(TargetFrameworks)'=='net9.0-macos'">net9.0-macos14.5</TargetFrameworks>
+	<TargetFrameworks Condition="'$(TargetFrameworks)'=='net9.0-macos'">net9.0-macos15.0</TargetFrameworks>
   </PropertyGroup>
 
 </Project>