chore: fix

unoplatform · Dec 21, 2024 · a0ce6f1 · a0ce6f1
1 parent 6d09f0d
commit a0ce6f1
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 49 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -19,7 +19,6 @@
 	</ItemGroup>-->
 
 	<PropertyGroup>
-		<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
 		<!-- Forces Uno's XamlFileGenerator to write error when XAML is invalid-->
 		<ShouldWriteErrorOnInvalidXaml>True</ShouldWriteErrorOnInvalidXaml>
 	</PropertyGroup>

diff --git a/global.json b/global.json
@@ -1,7 +1,7 @@
 {
   "msbuild-sdks": {
     "MSBuild.Sdk.Extras": "3.0.44",
-    "Uno.Sdk": "5.3.96",
-    "Uno.Sdk.Private": "5.5.87"
+    "Uno.Sdk": "5.3.112",
+    "Uno.Sdk.Private": "5.5.94"
   }
-}
+}
diff --git a/samples/MauiEmbedding/Directory.Build.props b/samples/MauiEmbedding/Directory.Build.props
@@ -12,7 +12,7 @@
       NETSDK1201: Warning that specifying RID won't create self containing app
       PRI257: Ignore default language (en) not being one of the included resources (eg en-us, en-uk)
     -->
-    <NoWarn>$(NoWarn);NU1507;NETSDK1201;PRI257;NU1903</NoWarn>
+    <NoWarn>$(NoWarn);NU1507;NETSDK1201;PRI257</NoWarn>
 
     <_UseTelerik>false</_UseTelerik>
   </PropertyGroup>

diff --git a/samples/MauiEmbedding/Directory.Packages.props b/samples/MauiEmbedding/Directory.Packages.props
@@ -1,20 +1,13 @@
 <Project ToolsVersion="15.0">
-  <!--
-    To update the version of Uno, you should instead update the Sdk version in the global.json file.
-
-    See https://aka.platform.uno/using-uno-sdk for more information.
-  -->
   <Import Project="$(MSBuildThisFileDirectory)..\..\SamplePackages.props" />
+
   <ItemGroup>
     <PackageVersion Include="Syncfusion.Maui.Core" Version="22.2.9" />
     <PackageVersion Include="Syncfusion.Maui.Charts" Version="22.2.9" />
     <PackageVersion Include="Syncfusion.Maui.DataGrid" Version="22.2.9" />
-    <!-- <PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="$(UnoVersion)" /> -->
     <PackageVersion Include="Telerik.UI.for.Maui" Version="5.1.0" Condition="$(_UseTelerik)" />
     <PackageVersion Include="Esri.ArcGISRuntime.Maui" Version="200.1.0" />
     <PackageVersion Include="Microsoft.Windows.Compatibility" Version="7.0.4" />
-<!-- <PackageVersion Include="Uno.Core" Version="4.1.1" /> -->
-
 
   </ItemGroup>
 </Project>
diff --git a/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj b/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj
@@ -2,6 +2,7 @@
 	<Import Project="..\..\..\src\tfms-ui-maui.props" />
 
 	<PropertyGroup>
+		<TargetFrameworks>net8.0-windows10.0.19041</TargetFrameworks>
 		<OutputType>Exe</OutputType>
 		<UnoSingleProject>true</UnoSingleProject>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -28,7 +29,6 @@
 			UnoFeatures let's you quickly add and manage implicit package references based on the features you want to use.
 			https://aka.platform.uno/singleproject-features
 		-->
-		<WindowsSdkPackageVersion>10.0.19041.38</WindowsSdkPackageVersion>
 		<UnoFeatures>
 			Material;
 			Toolkit;
@@ -37,40 +37,29 @@
 	</PropertyGroup>
 
 	<ItemGroup>
+		<ProjectReference Include="..\..\..\src\Uno.Extensions.Core.UI\Uno.Extensions.Core.WinUI.csproj" />
 		<ProjectReference Include="..\..\..\src\Uno.Extensions.Configuration\Uno.Extensions.Configuration.csproj" />
-		<ProjectReference Include="..\..\..\src\Uno.Extensions.Core\Uno.Extensions.Core.csproj" />
-		<ProjectReference Include="..\..\..\src\Uno.Extensions.Hosting.UI\Uno.Extensions.Hosting.WinUI.csproj" ExcludeAssets="all" />
+		<ProjectReference Include="..\..\..\src\Uno.Extensions.Hosting.UI\Uno.Extensions.Hosting.WinUI.csproj" />
 		<ProjectReference Include="..\..\..\src\Uno.Extensions.Hosting\Uno.Extensions.Hosting.csproj" />
 		<ProjectReference Include="..\..\..\src\Uno.Extensions.Localization.UI\Uno.Extensions.Localization.WinUI.csproj" />
-		<ProjectReference Include="..\..\..\src\Uno.Extensions.Logging\Uno.Extensions.Logging.WinUI.csproj" ExcludeAssets="all" />
+		<ProjectReference Include="..\..\..\src\Uno.Extensions.Logging\Uno.Extensions.Logging.WinUI.csproj" />
+		<ProjectReference Include="..\..\..\src\Uno.Extensions.Maui.UI\Uno.Extensions.Maui.WinUI.csproj" />
 		<ProjectReference Include="..\..\..\src\Uno.Extensions.Navigation.Toolkit\Uno.Extensions.Navigation.Toolkit.WinUI.csproj" />
 		<ProjectReference Include="..\..\..\src\Uno.Extensions.Navigation.UI\Uno.Extensions.Navigation.WinUI.csproj" />
+		<ProjectReference Include="..\..\..\src\Uno.Extensions.Navigation.Generators\Uno.Extensions.Navigation.Generators.csproj">
+			<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+			<OutputItemType>Analyzer</OutputItemType>
+		</ProjectReference>
 		<ProjectReference Include="..\..\..\src\Uno.Extensions.Navigation\Uno.Extensions.Navigation.csproj" />
-		<ProjectReference Include="..\..\..\src\Uno.Extensions.Maui.UI\Uno.Extensions.Maui.WinUI.csproj" />
-		<ProjectReference Include="..\..\..\src\Uno.Extensions.Serialization\Uno.Extensions.Serialization.csproj" />
 		<ProjectReference Include="..\..\..\src\Uno.Extensions.Storage.UI\Uno.Extensions.Storage.WinUI.csproj" />
-		<ProjectReference Include="..\..\..\src\Uno.Extensions.Storage\Uno.Extensions.Storage.csproj" />
 		<ProjectReference Include="..\MauiEmbedding.MauiControls\MauiEmbedding.MauiControls.csproj" />
 	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\..\..\src\Uno.Extensions.Core.Generators\Uno.Extensions.Core.Generators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-		<ProjectReference Include="..\..\..\src\Uno.Extensions.Navigation.Generators\Uno.Extensions.Navigation.Generators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-	</ItemGroup>
-
-	<!-- Reference generators props. This required only when referencing extensions project as source code (instead of packages) -->
-	<Import Project="..\..\..\src\Uno.Extensions.Core.Generators\buildTransitive\Uno.Extensions.Core.props" />
-	<ItemGroup>
-		<PackageReference Include="Microsoft.Maui.Controls" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility"/>
-		<PackageReference Include="Microsoft.Maui.Graphics"  />
-
-	</ItemGroup>
-
-	<ItemGroup Condition="$(TargetFramework.Contains('windows10'))">
-		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
-		<PackageReference Include="Microsoft.WindowsAppSDK" />
-	</ItemGroup>
+	<Import Project="..\..\..\src\Uno.Extensions.Configuration\build\Package.targets" />
+	<Import Project="..\..\..\src\Uno.Extensions.Hosting\build\Package.targets" />
+	<Import Project="..\..\..\src\Uno.Extensions.Localization\build\Package.targets" />
+	<Import Project="..\..\..\src\Uno.Extensions.Maui.UI\build\Package.targets" />
+	<Import Project="..\..\..\src\Uno.Extensions.Navigation\build\Package.targets" />
+	<Import Project="..\..\..\src\Uno.Extensions.Navigation.UI\build\Package.targets" />
 
 	<ItemGroup Condition="'$(IsAndroid)' == 'true'">
 		<PackageReference Include="Xamarin.AndroidX.Navigation.UI" />
@@ -79,6 +68,12 @@
 		<PackageReference Include="Xamarin.AndroidX.Navigation.Common" />
 		<PackageReference Include="Xamarin.AndroidX.Collection" />
 		<PackageReference Include="Xamarin.AndroidX.Collection.Jvm" />
-		<PackageReference Include="Xamarin.AndroidX.Collection.Ktx" />
+		<PackageReference Include="Xamarin.AndroidX.Collection.Ktx"  />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Maui.Controls" />
+		<PackageReference Include="Microsoft.Maui.Controls.Compatibility"/>
+		<PackageReference Include="Microsoft.Maui.Graphics"  />
 	</ItemGroup>
-</Project>
+</Project>
diff --git a/samples/Playground/Directory.Packages.props b/samples/Playground/Directory.Packages.props
@@ -1,11 +1,10 @@
 <Project ToolsVersion="15.0">
 	<Import Project="$(MSBuildThisFileDirectory)..\..\SamplePackages.props" />
+
 	<ItemGroup>
 		<PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="4.2.0" />
-		<PackageVersion Include="Microsoft.Windows.Compatibility" Version="7.0.3" />
 		<PackageVersion Include="Refit" Version="7.2.22" />
 		<PackageVersion Include="Refit.HttpClientFactory" Version="7.2.22" />
 		<PackageVersion Include="System.Text.Json" Version="8.0.5" />
-		<PackageVersion Include="Uno.Core" Version="4.1.1" />
 	</ItemGroup>
 </Project>
diff --git a/samples/Playground/Playground/Playground.csproj b/samples/Playground/Playground/Playground.csproj
@@ -33,7 +33,6 @@
 			Material;
 			Toolkit;
 			Mvvm;
-			Skia;
 		</UnoFeatures>
 	</PropertyGroup>
 

diff --git a/src/Uno.Extensions.Maui.UI/build/Package.targets b/src/Uno.Extensions.Maui.UI/build/Package.targets
@@ -72,4 +72,5 @@
 		</Task>
 	</UsingTask>
 
+
 </Project>
diff --git a/testing/TestHarness/Directory.Packages.props b/testing/TestHarness/Directory.Packages.props
@@ -44,4 +44,4 @@
 		<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
 		<PackageVersion Include="System.Text.Json" Version="8.0.5" />
 	</ItemGroup>
-</Project>
+</Project>
diff --git a/testing/TestHarness/TestHarness.UITest/TestHarness.UITest.csproj b/testing/TestHarness/TestHarness.UITest/TestHarness.UITest.csproj
@@ -24,6 +24,11 @@
 		<PackageReference Include="MSTest.TestFramework"/>
 	</ItemGroup>
 
+	<ItemGroup>
+		<PackageVersion Include="SkiaSharp" Version="2.88.8" />
+		<PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.8" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<ProjectReference Include="..\TestHarness.Core\TestHarness.Core.csproj" />
 	</ItemGroup>

diff --git a/testing/TestHarness/TestHarness/TestHarness.csproj b/testing/TestHarness/TestHarness/TestHarness.csproj
@@ -88,9 +88,5 @@
 		<ProjectReference Include="..\..\..\src\Uno.Extensions.Validation\Uno.Extensions.Validation.csproj" />
 		<ProjectReference Include="..\..\..\src\Uno.Extensions.Validation.Fluent\Uno.Extensions.Validation.Fluent.csproj" />
 		<ProjectReference Include="..\TestHarness.Core\TestHarness.Core.csproj" />
-
-		<!--<PackageReference Include="Uno.Wasm.Bootstrap" />
-		<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" />
-		<PackageReference Include="Uno.Resizetizer" />-->
 	</ItemGroup>
 </Project>