diff --git a/SamplePackages.props b/SamplePackages.props new file mode 100644 index 0000000000..ccf75f5cc3 --- /dev/null +++ b/SamplePackages.props @@ -0,0 +1,63 @@ + + + + 6.3.7 + 5.3.1 + 5.5.6 + 8.0.21 + 1.7.0 + 4.1.1 + 1.9.37 + 1.4.0 + 1.6.1 + 2.88.9-preview.2.2 + 2.0.0.4 + 1.6.241114003 + 10.0.26100.1742 + 8.0.1 + 8.0.11 + 4.65.0 + 8.3.2 + 9.0.537 + 1.11.0.3 + 1.0.0.23 + 1.7.0.3 + 1.3.2.8 + 1.9.2.1 + 1.8.0.6 + 1.1.0.24 + 2.8.0.1 + 1.4.4 + 8.0.91 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/global.json b/global.json index 8de663287e..55272fee3e 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,7 @@ { "msbuild-sdks": { "MSBuild.Sdk.Extras": "3.0.44", - "Uno.Sdk": "5.3.96" + "Uno.Sdk": "5.3.112", + "Uno.Sdk.Private": "5.5.94" } -} +} \ No newline at end of file diff --git a/samples/MauiEmbedding/Directory.Packages.props b/samples/MauiEmbedding/Directory.Packages.props index 1498de279d..6d29eb74a6 100644 --- a/samples/MauiEmbedding/Directory.Packages.props +++ b/samples/MauiEmbedding/Directory.Packages.props @@ -1,37 +1,13 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj b/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj index 30ac16d7dd..38db43b57b 100644 --- a/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj +++ b/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj @@ -1,8 +1,8 @@ - + - + net8.0-windows10.0.19041 Exe true true @@ -36,14 +36,6 @@ - - - - - - - - diff --git a/samples/Playground/Directory.Build.props b/samples/Playground/Directory.Build.props index ebc32ca4b5..0c951d3643 100644 --- a/samples/Playground/Directory.Build.props +++ b/samples/Playground/Directory.Build.props @@ -14,16 +14,4 @@ --> $(NoWarn);NU1507;NETSDK1201;PRI257 - - - - - - - - - - - - diff --git a/samples/Playground/Directory.Packages.props b/samples/Playground/Directory.Packages.props index 421f8e2171..d26384fb87 100644 --- a/samples/Playground/Directory.Packages.props +++ b/samples/Playground/Directory.Packages.props @@ -1,21 +1,10 @@ + + - - - - - - - - - - - - - diff --git a/samples/Playground/Playground/Playground.csproj b/samples/Playground/Playground/Playground.csproj index 29b408f3f4..b8adf568bc 100644 --- a/samples/Playground/Playground/Playground.csproj +++ b/samples/Playground/Playground/Playground.csproj @@ -1,4 +1,4 @@ - + diff --git a/src/Uno.Extensions.Maui.UI/build/Package.targets b/src/Uno.Extensions.Maui.UI/build/Package.targets index 394c06f8ae..23a8c58fd7 100644 --- a/src/Uno.Extensions.Maui.UI/build/Package.targets +++ b/src/Uno.Extensions.Maui.UI/build/Package.targets @@ -73,24 +73,4 @@ - - - - - <_OtherPriFiles Include="@(PackagingOutputs)" Condition="'%(Extension)' == '.pri' and ('%(PackagingOutputs.ReferenceSourceTarget)' == 'ProjectReference' or '%(PackagingOutputs.NugetSourceType)'=='Package')" /> - - - - - - - <_OtherPriFiles1 Include="@(_ReferenceRelatedPaths)" Condition="'%(Extension)' == '.pri' and ('%(_ReferenceRelatedPaths.ReferenceSourceTarget)' == 'ProjectReference' or '%(_ReferenceRelatedPaths.NugetSourceType)'=='Package')" /> - <_ReferenceRelatedPaths Remove="@(_OtherPriFiles1)" /> - <_OtherPriFiles2 Include="@(ReferenceCopyLocalPaths)" Condition="'%(Extension)' == '.pri' and ('%(ReferenceCopyLocalPaths.ReferenceSourceTarget)' == 'ProjectReference' or '%(ReferenceCopyLocalPaths.NugetSourceType)'=='Package')" /> - - - - diff --git a/src/maui-embedding.props b/src/maui-embedding.props deleted file mode 100644 index 1ffd11f373..0000000000 --- a/src/maui-embedding.props +++ /dev/null @@ -1,6 +0,0 @@ - - - 5.2.22 - 1.5.240404000 - - diff --git a/testing/TestHarness/Directory.Packages.props b/testing/TestHarness/Directory.Packages.props index 51bb4b529e..8bf023ce7b 100644 --- a/testing/TestHarness/Directory.Packages.props +++ b/testing/TestHarness/Directory.Packages.props @@ -1,6 +1,6 @@ + - @@ -20,23 +20,15 @@ - - - - - - - - @@ -52,4 +44,4 @@ - + \ No newline at end of file diff --git a/testing/TestHarness/TestHarness/TestHarness.csproj b/testing/TestHarness/TestHarness/TestHarness.csproj index d4473cb699..607e802b61 100644 --- a/testing/TestHarness/TestHarness/TestHarness.csproj +++ b/testing/TestHarness/TestHarness/TestHarness.csproj @@ -1,4 +1,4 @@ - + @@ -88,21 +88,5 @@ - - - - - - - - - - - - - -