diff --git a/Directory.Build.props b/Directory.Build.props index aa6639bec1..51289ef199 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -19,7 +19,6 @@ --> - True True diff --git a/global.json b/global.json index 1a213f240a..55272fee3e 100644 --- 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" } -} +} \ No newline at end of file diff --git a/samples/MauiEmbedding/Directory.Build.props b/samples/MauiEmbedding/Directory.Build.props index dc69e64729..738884a461 100644 --- 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);NU1507;NETSDK1201;PRI257;NU1903 + $(NoWarn);NU1507;NETSDK1201;PRI257 <_UseTelerik>false diff --git a/samples/MauiEmbedding/Directory.Packages.props b/samples/MauiEmbedding/Directory.Packages.props index 9dac109352..6d29eb74a6 100644 --- a/samples/MauiEmbedding/Directory.Packages.props +++ b/samples/MauiEmbedding/Directory.Packages.props @@ -1,20 +1,13 @@ - + - - - diff --git a/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj b/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj index 59ac9ff507..38db43b57b 100644 --- a/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj +++ b/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj @@ -2,6 +2,7 @@ + net8.0-windows10.0.19041 Exe true true @@ -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 --> - 10.0.19041.38 Material; Toolkit; @@ -37,40 +37,29 @@ + - - + - + + + + false + Analyzer + - - - - - - - - - - - - - - - - - - - - - - + + + + + + @@ -79,6 +68,12 @@ - + + + + + + + - \ No newline at end of file + diff --git a/samples/Playground/Directory.Packages.props b/samples/Playground/Directory.Packages.props index fe6a7d47a7..d26384fb87 100644 --- a/samples/Playground/Directory.Packages.props +++ b/samples/Playground/Directory.Packages.props @@ -1,11 +1,10 @@ + - - diff --git a/samples/Playground/Playground/Playground.csproj b/samples/Playground/Playground/Playground.csproj index 58ea656fe9..b8adf568bc 100644 --- a/samples/Playground/Playground/Playground.csproj +++ b/samples/Playground/Playground/Playground.csproj @@ -33,7 +33,6 @@ Material; Toolkit; Mvvm; - Skia; diff --git a/src/Uno.Extensions.Maui.UI/build/Package.targets b/src/Uno.Extensions.Maui.UI/build/Package.targets index b666d8dc1f..23a8c58fd7 100644 --- a/src/Uno.Extensions.Maui.UI/build/Package.targets +++ b/src/Uno.Extensions.Maui.UI/build/Package.targets @@ -72,4 +72,5 @@ + diff --git a/testing/TestHarness/Directory.Packages.props b/testing/TestHarness/Directory.Packages.props index ca923734ca..8bf023ce7b 100644 --- a/testing/TestHarness/Directory.Packages.props +++ b/testing/TestHarness/Directory.Packages.props @@ -44,4 +44,4 @@ - + \ No newline at end of file diff --git a/testing/TestHarness/TestHarness.UITest/TestHarness.UITest.csproj b/testing/TestHarness/TestHarness.UITest/TestHarness.UITest.csproj index 73a785c573..c44407258b 100644 --- a/testing/TestHarness/TestHarness.UITest/TestHarness.UITest.csproj +++ b/testing/TestHarness/TestHarness.UITest/TestHarness.UITest.csproj @@ -24,6 +24,11 @@ + + + + + diff --git a/testing/TestHarness/TestHarness/TestHarness.csproj b/testing/TestHarness/TestHarness/TestHarness.csproj index 82db7f375e..607e802b61 100644 --- a/testing/TestHarness/TestHarness/TestHarness.csproj +++ b/testing/TestHarness/TestHarness/TestHarness.csproj @@ -88,9 +88,5 @@ - -