for kunal, with love

unoplatform · Nov 22, 2024 · 5f9d7e6 · 5f9d7e6
1 parent 1869609
commit 5f9d7e6
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 22 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -13,7 +13,6 @@
     <NoWarn>$(NoWarn);NU1507;NETSDK1201;PRI257</NoWarn>
 
 	<SkiaSharpVersion>2.88.9-preview.2.2</SkiaSharpVersion>
-	<UnoWasmBootstrapVersion>9.1.0-dev.41</UnoWasmBootstrapVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -35,8 +35,5 @@
 		<PackageVersion Include="nventive.Nimue.Application.Packaging" Version="0.1.0-alpha.58" />
 		<PackageVersion Include="Xamarin.TestCloud.Agent" Version="0.23.2" />
 
-		<PackageVersion Include="Uno.Wasm.Bootstrap" Version="9.1.0-dev.41" />
-		<PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="9.1.0-dev.41" />
-
 	</ItemGroup>
 </Project>
diff --git a/Uno.Gallery.UITests/Uno.Gallery.UITests.csproj b/Uno.Gallery.UITests/Uno.Gallery.UITests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<IsTestProject>true</IsTestProject>
 	</PropertyGroup>
 	<ItemGroup>

diff --git a/Uno.Gallery/Properties/launchSettings.json b/Uno.Gallery/Properties/launchSettings.json
@@ -42,7 +42,7 @@
     },
     "Gallery (Desktop WSL2)": {
       "commandName": "WSL2",
-      "commandLineArgs": "{ProjectDir}/bin/Debug/net9.0-desktop/Uno.Gallery.dll",
+      "commandLineArgs": "{ProjectDir}/bin/Debug/net8.0-desktop/Uno.Gallery.dll",
       "distributionName": "",
       "compatibleTargetFramework": "desktop"
     }

diff --git a/Uno.Gallery/Uno.Gallery.csproj b/Uno.Gallery/Uno.Gallery.csproj
@@ -1,21 +1,21 @@
 <Project Sdk="Uno.Sdk">
 	<PropertyGroup>
-		<!-- Building with dotnet build -f net9.0-platform will still cause restore to happen for all TargetFrameworks -->
+		<!-- Building with dotnet build -f net8.0-platform will still cause restore to happen for all TargetFrameworks -->
 		<!-- which will force us to install all workloads even if not needed -->
-		<!-- To prevent that, we will pass TargetFrameworkOverride as a global property (i.e, dotnet build -p:TargetFrameworkOverride=net9.0-platform) -->
+		<!-- To prevent that, we will pass TargetFrameworkOverride as a global property (i.e, dotnet build -p:TargetFrameworkOverride=net8.0-platform) -->
 		<!-- That way, we set TargetFrameworks property to only the needed TargetFramework -->
-		<!-- NOTE: We cannot build with dotnet build -p:TargetFrameworks=net9.0-platform as that will flow to source generator project, which is incorrect -->
+		<!-- NOTE: We cannot build with dotnet build -p:TargetFrameworks=net8.0-platform as that will flow to source generator project, which is incorrect -->
 		<TargetFramework Condition="'$(TargetFrameworkOverride)'!=''">$(TargetFrameworkOverride)</TargetFramework>
 		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'==''">
-			net9.0-ios;
-			net9.0-maccatalyst;
-			net9.0-windows10.0.19041;
-			net9.0-desktop;
-			net9.0-browserwasm;
+			net8.0-ios;
+			net8.0-maccatalyst;
+			net8.0-windows10.0.19041;
+			net8.0-desktop;
+			net8.0-browserwasm;
 		</TargetFrameworks>
 
 		<!-- android is disable on linux until ci is fixed  -->
-		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' AND !$([MSBuild]::IsOSPlatform('linux'))">$(TargetFrameworks);net9.0-android;</TargetFrameworks>
+		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' AND !$([MSBuild]::IsOSPlatform('linux'))">$(TargetFrameworks);net8.0-android;</TargetFrameworks>
 
 		<OutputType>Exe</OutputType>
 		<UnoSingleProject>true</UnoSingleProject>
@@ -78,7 +78,7 @@
 		<IncludeXamlNamespaces Include="mobile" Visible="False" />
 		<ExcludeXamlNamespaces Include="not_mobile" Visible="False" />
 	</ItemGroup>
-	<ItemGroup Condition="'$(TargetFramework)'=='net9.0-desktop' OR '$(TargetFramework)'=='net9.0-browserwasm'">
+	<ItemGroup Condition="'$(TargetFramework)'=='net8.0-desktop' OR '$(TargetFramework)'=='net8.0-browserwasm'">
 		<IncludeXamlNamespaces Include="not_mobile" Visible="False" />
 		<ExcludeXamlNamespaces Include="mobile" Visible="False" />
 	</ItemGroup>
@@ -128,12 +128,12 @@
 		<RunAOTCompilation>true</RunAOTCompilation>
 	</PropertyGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)'!='net9.0-windows10.0.19041'">
+	<ItemGroup Condition="'$(TargetFramework)'!='net8.0-windows10.0.19041'">
 		<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls" />
 		<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls.DataGrid" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)'=='net9.0-windows10.0.19041'">
+	<ItemGroup Condition="'$(TargetFramework)'=='net8.0-windows10.0.19041'">
 		<PackageReference Include="CommunityToolkit.WinUI.Lottie" />
 		<PackageReference Include="CommunityToolkit.WinUI.UI.Controls" />
 		<PackageReference Include="CommunityToolkit.WinUI.UI.Controls.DataGrid" />
@@ -145,8 +145,6 @@
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$([MSBuild]::GetTargetPlatformIdentifier($(TargetFramework)))' == 'browserwasm' ">
-		<PackageReference Include="Uno.Wasm.Bootstrap" />
-		<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" />
 		<PackageReference Include="Microsoft.TypeScript.Compiler">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

diff --git a/global.json b/global.json
@@ -1,9 +1,10 @@
 {
   "sdk": {
-	"allowPrerelease": true
+	"allowPrerelease": true,
+	"version": "8.0.404"
   },
   // To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information.
   "msbuild-sdks": {
-	"Uno.Sdk": "5.6.0-dev.130"
+	"Uno.Sdk": "5.4.5"
   }
 }