From 3f0eb5d7a9b31e016c806c3beeab357eda55725e Mon Sep 17 00:00:00 2001 From: Nick Randolph Date: Fri, 2 Aug 2024 14:14:28 +1000 Subject: [PATCH] chore: Fixing canary with updated nuget updater --- Uno.Extensions-packageonly.slnf | 49 ++++++++++ Uno.Extensions-runtimetests.slnf | 50 ++++++++++ Uno.Extensions.Reactive.slnf | 26 ++++++ src/Uno.Extensions.sln => Uno.Extensions.sln | 92 +++++++++---------- build/ci/stage-build-packages.yml | 2 +- build/ci/stage-build-runtimetests-skia.yml | 2 +- build/ci/templates/canary-update-template.yml | 9 +- build/ci/templates/canary-updater.yml | 2 +- .../MauiEmbedding/Directory.Packages.props | 16 ---- .../MauiEmbedding/MauiEmbedding.csproj | 3 + samples/Playground/Directory.Build.props | 32 ++++--- samples/Playground/Directory.Packages.props | 23 +---- .../Playground/Playground/Playground.csproj | 5 +- src/Directory.Packages.props | 13 +-- src/Uno.Extensions-packageonly.slnf | 49 ---------- src/Uno.Extensions-runtimetests.slnf | 50 ---------- ...xtensions.Authentication.MSAL.WinUI.csproj | 1 + .../ApplicationBuilder.cs | 2 +- .../Uno.Extensions.Maui.WinUI.Markup.csproj | 1 + ....Extensions.Navigation.WinUI.Markup.csproj | 1 + ...no.Extensions.Reactive.WinUI.Markup.csproj | 1 + src/Uno.Extensions.Reactive.slnf | 26 ------ testing/TestHarness/Directory.Packages.props | 16 +--- testing/TestHarness/TestHarness.sln | 2 +- .../TestHarness/TestHarness.csproj | 12 ++- 25 files changed, 221 insertions(+), 264 deletions(-) create mode 100644 Uno.Extensions-packageonly.slnf create mode 100644 Uno.Extensions-runtimetests.slnf create mode 100644 Uno.Extensions.Reactive.slnf rename src/Uno.Extensions.sln => Uno.Extensions.sln (90%) delete mode 100644 src/Uno.Extensions-packageonly.slnf delete mode 100644 src/Uno.Extensions-runtimetests.slnf delete mode 100644 src/Uno.Extensions.Reactive.slnf diff --git a/Uno.Extensions-packageonly.slnf b/Uno.Extensions-packageonly.slnf new file mode 100644 index 000000000..07b26d4c3 --- /dev/null +++ b/Uno.Extensions-packageonly.slnf @@ -0,0 +1,49 @@ +{ + "solution": { + "path": "Uno.Extensions.sln", + "projects": [ + "src\\Uno.Extensions.Authentication.MSAL\\Uno.Extensions.Authentication.MSAL.WinUI.csproj", + "src\\Uno.Extensions.Authentication.Oidc\\Uno.Extensions.Authentication.Oidc.WinUI.csproj", + "src\\Uno.Extensions.Authentication.UI\\Uno.Extensions.Authentication.WinUI.csproj", + "src\\Uno.Extensions.Authentication\\Uno.Extensions.Authentication.csproj", + "src\\Uno.Extensions.Configuration\\Uno.Extensions.Configuration.csproj", + "src\\Uno.Extensions.Core.Generators\\Uno.Extensions.Core.Generators.csproj", + "src\\Uno.Extensions.Core.Tests\\Uno.Extensions.Core.Tests.csproj", + "src\\Uno.Extensions.Core.UI\\Uno.Extensions.Core.WinUI.csproj", + "src\\Uno.Extensions.Core\\Uno.Extensions.Core.csproj", + "src\\Uno.Extensions.Hosting.UI\\Uno.Extensions.Hosting.WinUI.csproj", + "src\\Uno.Extensions.Hosting\\Uno.Extensions.Hosting.csproj", + "src\\Uno.Extensions.Http.Refit\\Uno.Extensions.Http.Refit.csproj", + "src\\Uno.Extensions.Http.UI\\Uno.Extensions.Http.WinUI.csproj", + "src\\Uno.Extensions.Http\\Uno.Extensions.Http.csproj", + "src\\Uno.Extensions.Localization.UI\\Uno.Extensions.Localization.WinUI.csproj", + "src\\Uno.Extensions.Localization\\Uno.Extensions.Localization.csproj", + "src\\Uno.Extensions.Logging.Serilog\\Uno.Extensions.Logging.Serilog.csproj", + "src\\Uno.Extensions.Logging\\Uno.Extensions.Logging.WinUI.csproj", + "src\\Uno.Extensions.Maui.UI\\Uno.Extensions.Maui.WinUI.csproj", + "src\\Uno.Extensions.Maui.WinUI.Markup\\Uno.Extensions.Maui.WinUI.Markup.csproj", + "src\\Uno.Extensions.Navigation.Generators\\Uno.Extensions.Navigation.Generators.csproj", + "src\\Uno.Extensions.Navigation.Toolkit\\Uno.Extensions.Navigation.Toolkit.WinUI.csproj", + "src\\Uno.Extensions.Navigation.UI.Markup\\Uno.Extensions.Navigation.WinUI.Markup.csproj", + "src\\Uno.Extensions.Navigation.UI\\Uno.Extensions.Navigation.WinUI.csproj", + "src\\Uno.Extensions.Navigation\\Uno.Extensions.Navigation.csproj", + "src\\Uno.Extensions.Reactive.Generator\\Uno.Extensions.Reactive.Generator.csproj", + "src\\Uno.Extensions.Reactive.Messaging\\Uno.Extensions.Reactive.Messaging.csproj", + "src\\Uno.Extensions.Reactive.Testing\\Uno.Extensions.Reactive.Testing.csproj", + "src\\Uno.Extensions.Reactive.Tests\\Uno.Extensions.Reactive.Tests.csproj", + "src\\Uno.Extensions.Reactive.UI.Markup\\Uno.Extensions.Reactive.WinUI.Markup.csproj", + "src\\Uno.Extensions.Reactive.UI\\Uno.Extensions.Reactive.WinUI.csproj", + "src\\Uno.Extensions.Reactive\\Uno.Extensions.Reactive.csproj", + "src\\Uno.Extensions.Serialization.Http\\Uno.Extensions.Serialization.Http.csproj", + "src\\Uno.Extensions.Serialization.Refit\\Uno.Extensions.Serialization.Refit.csproj", + "src\\Uno.Extensions.Serialization.Tests\\Uno.Extensions.Serialization.Tests.csproj", + "src\\Uno.Extensions.Serialization\\Uno.Extensions.Serialization.csproj", + "src\\Uno.Extensions.Storage.UI\\Uno.Extensions.Storage.WinUI.csproj", + "src\\Uno.Extensions.Storage\\Uno.Extensions.Storage.csproj", + "src\\Uno.Extensions.Toolkit.UI\\Uno.Extensions.Toolkit.WinUI.csproj", + "src\\Uno.Extensions.Toolkit\\Uno.Extensions.Toolkit.csproj", + "src\\Uno.Extensions.Validation.Fluent\\Uno.Extensions.Validation.Fluent.csproj", + "src\\Uno.Extensions.Validation\\Uno.Extensions.Validation.csproj" + ] + } +} \ No newline at end of file diff --git a/Uno.Extensions-runtimetests.slnf b/Uno.Extensions-runtimetests.slnf new file mode 100644 index 000000000..a939c5735 --- /dev/null +++ b/Uno.Extensions-runtimetests.slnf @@ -0,0 +1,50 @@ +{ + "solution": { + "path": "Uno.Extensions.sln", + "projects": [ + "src\\Uno.Extensions.Authentication.MSAL\\Uno.Extensions.Authentication.MSAL.WinUI.csproj", + "src\\Uno.Extensions.Authentication.Oidc\\Uno.Extensions.Authentication.Oidc.WinUI.csproj", + "src\\Uno.Extensions.Authentication.UI\\Uno.Extensions.Authentication.WinUI.csproj", + "src\\Uno.Extensions.Authentication\\Uno.Extensions.Authentication.csproj", + "src\\Uno.Extensions.Configuration\\Uno.Extensions.Configuration.csproj", + "src\\Uno.Extensions.Core.Generators\\Uno.Extensions.Core.Generators.csproj", + "src\\Uno.Extensions.Core.Tests\\Uno.Extensions.Core.Tests.csproj", + "src\\Uno.Extensions.Core.UI\\Uno.Extensions.Core.WinUI.csproj", + "src\\Uno.Extensions.Core\\Uno.Extensions.Core.csproj", + "src\\Uno.Extensions.Hosting.UI\\Uno.Extensions.Hosting.WinUI.csproj", + "src\\Uno.Extensions.Hosting\\Uno.Extensions.Hosting.csproj", + "src\\Uno.Extensions.Http.Refit\\Uno.Extensions.Http.Refit.csproj", + "src\\Uno.Extensions.Http.UI\\Uno.Extensions.Http.WinUI.csproj", + "src\\Uno.Extensions.Http\\Uno.Extensions.Http.csproj", + "src\\Uno.Extensions.Localization.UI\\Uno.Extensions.Localization.WinUI.csproj", + "src\\Uno.Extensions.Localization\\Uno.Extensions.Localization.csproj", + "src\\Uno.Extensions.Logging.Serilog\\Uno.Extensions.Logging.Serilog.csproj", + "src\\Uno.Extensions.Logging\\Uno.Extensions.Logging.WinUI.csproj", + "src\\Uno.Extensions.Navigation.Generators\\Uno.Extensions.Navigation.Generators.csproj", + "src\\Uno.Extensions.Navigation.Toolkit\\Uno.Extensions.Navigation.Toolkit.WinUI.csproj", + "src\\Uno.Extensions.Navigation.UI.Markup\\Uno.Extensions.Navigation.WinUI.Markup.csproj", + "src\\Uno.Extensions.Navigation.UI\\Uno.Extensions.Navigation.WinUI.csproj", + "src\\Uno.Extensions.Navigation\\Uno.Extensions.Navigation.csproj", + "src\\Uno.Extensions.Reactive.Generator\\Uno.Extensions.Reactive.Generator.csproj", + "src\\Uno.Extensions.Reactive.Messaging\\Uno.Extensions.Reactive.Messaging.csproj", + "src\\Uno.Extensions.Reactive.Testing\\Uno.Extensions.Reactive.Testing.csproj", + "src\\Uno.Extensions.Reactive.Tests\\Uno.Extensions.Reactive.Tests.csproj", + "src\\Uno.Extensions.Reactive.UI.Markup\\Uno.Extensions.Reactive.WinUI.Markup.csproj", + "src\\Uno.Extensions.Reactive.UI.Tests\\Uno.Extensions.Reactive.WinUI.Tests.csproj", + "src\\Uno.Extensions.Reactive.UI\\Uno.Extensions.Reactive.WinUI.csproj", + "src\\Uno.Extensions.Reactive\\Uno.Extensions.Reactive.csproj", + "src\\Uno.Extensions.RuntimeTests\\Uno.Extensions.RuntimeTests.Core\\Uno.Extensions.RuntimeTests.Core.csproj", + "src\\Uno.Extensions.RuntimeTests\\Uno.Extensions.RuntimeTests\\Uno.Extensions.RuntimeTests.csproj", + "src\\Uno.Extensions.Serialization.Http\\Uno.Extensions.Serialization.Http.csproj", + "src\\Uno.Extensions.Serialization.Refit\\Uno.Extensions.Serialization.Refit.csproj", + "src\\Uno.Extensions.Serialization.Tests\\Uno.Extensions.Serialization.Tests.csproj", + "src\\Uno.Extensions.Serialization\\Uno.Extensions.Serialization.csproj", + "src\\Uno.Extensions.Storage.UI\\Uno.Extensions.Storage.WinUI.csproj", + "src\\Uno.Extensions.Storage\\Uno.Extensions.Storage.csproj", + "src\\Uno.Extensions.Toolkit.UI\\Uno.Extensions.Toolkit.WinUI.csproj", + "src\\Uno.Extensions.Toolkit\\Uno.Extensions.Toolkit.csproj", + "src\\Uno.Extensions.Validation.Fluent\\Uno.Extensions.Validation.Fluent.csproj", + "src\\Uno.Extensions.Validation\\Uno.Extensions.Validation.csproj" + ] + } +} \ No newline at end of file diff --git a/Uno.Extensions.Reactive.slnf b/Uno.Extensions.Reactive.slnf new file mode 100644 index 000000000..8c960be7d --- /dev/null +++ b/Uno.Extensions.Reactive.slnf @@ -0,0 +1,26 @@ +{ + "solution": { + "path": "Uno.Extensions.sln", + "projects": [ + "src\\Uno.Extensions.Core.Generators\\Uno.Extensions.Core.Generators.csproj", + "src\\Uno.Extensions.Core.Tests\\Uno.Extensions.Core.Tests.csproj", + "src\\Uno.Extensions.Core\\Uno.Extensions.Core.csproj", + "src\\Uno.Extensions.Reactive.Generator\\Uno.Extensions.Reactive.Generator.csproj", + "src\\Uno.Extensions.Reactive.Messaging\\Uno.Extensions.Reactive.Messaging.csproj", + "src\\Uno.Extensions.Reactive.Testing\\Uno.Extensions.Reactive.Testing.csproj", + "src\\Uno.Extensions.Reactive.Tests\\Uno.Extensions.Reactive.Tests.csproj", + "src\\Uno.Extensions.Reactive.UI.Markup\\Uno.Extensions.Reactive.WinUI.Markup.csproj", + "src\\Uno.Extensions.Reactive.UI.Tests\\Uno.Extensions.Reactive.WinUI.Tests.csproj", + "src\\Uno.Extensions.Reactive.UI\\Uno.Extensions.Reactive.UI.csproj", + "src\\Uno.Extensions.Reactive.UI\\Uno.Extensions.Reactive.WinUI.csproj", + "src\\Uno.Extensions.Reactive\\Uno.Extensions.Reactive.csproj", + "src\\Uno.Extensions.RuntimeTests.Core\\Uno.Extensions.RuntimeTests.Core.csproj", + "src\\Uno.Extensions.RuntimeTests\\Uno.Extensions.RuntimeTests.Mobile\\Uno.Extensions.RuntimeTests.Mobile.csproj", + "src\\Uno.Extensions.RuntimeTests\\Uno.Extensions.RuntimeTests.Shared\\Uno.Extensions.RuntimeTests.Shared.shproj", + "src\\Uno.Extensions.RuntimeTests\\Uno.Extensions.RuntimeTests.Skia.Gtk\\Uno.Extensions.RuntimeTests.Skia.Gtk.csproj", + "src\\Uno.Extensions.RuntimeTests\\Uno.Extensions.RuntimeTests.Skia.Wpf\\Uno.Extensions.RuntimeTests.Skia.Wpf.csproj", + "src\\Uno.Extensions.RuntimeTests\\Uno.Extensions.RuntimeTests.Wasm\\Uno.Extensions.RuntimeTests.Wasm.csproj", + "src\\Uno.Extensions.RuntimeTests\\Uno.Extensions.RuntimeTests.Windows\\Uno.Extensions.RuntimeTests.Windows.csproj" + ] + } +} \ No newline at end of file diff --git a/src/Uno.Extensions.sln b/Uno.Extensions.sln similarity index 90% rename from src/Uno.Extensions.sln rename to Uno.Extensions.sln index 5420ebde8..416e783f9 100644 --- a/src/Uno.Extensions.sln +++ b/Uno.Extensions.sln @@ -3,29 +3,29 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.1.31903.286 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Core", "Uno.Extensions.Core\Uno.Extensions.Core.csproj", "{793208E1-158C-4218-A453-E8256947E2ED}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Core", "src\Uno.Extensions.Core\Uno.Extensions.Core.csproj", "{793208E1-158C-4218-A453-E8256947E2ED}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Hosting", "Uno.Extensions.Hosting\Uno.Extensions.Hosting.csproj", "{D5CAEE0E-E43F-4432-92C5-FE3B2181897D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Hosting", "src\Uno.Extensions.Hosting\Uno.Extensions.Hosting.csproj", "{D5CAEE0E-E43F-4432-92C5-FE3B2181897D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Localization", "Uno.Extensions.Localization\Uno.Extensions.Localization.csproj", "{ECCF3E50-2D4A-43A7-B16D-88EFC06017AD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Localization", "src\Uno.Extensions.Localization\Uno.Extensions.Localization.csproj", "{ECCF3E50-2D4A-43A7-B16D-88EFC06017AD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Configuration", "Uno.Extensions.Configuration\Uno.Extensions.Configuration.csproj", "{D8703D0A-D1C9-4C6B-AE18-507FBC1C5823}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Configuration", "src\Uno.Extensions.Configuration\Uno.Extensions.Configuration.csproj", "{D8703D0A-D1C9-4C6B-AE18-507FBC1C5823}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Serialization", "Uno.Extensions.Serialization\Uno.Extensions.Serialization.csproj", "{247E0202-11F8-428A-B6F2-6AABCD222475}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Serialization", "src\Uno.Extensions.Serialization\Uno.Extensions.Serialization.csproj", "{247E0202-11F8-428A-B6F2-6AABCD222475}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Http", "Uno.Extensions.Http\Uno.Extensions.Http.csproj", "{F6921B06-3F17-442B-B245-786DEFFE60A2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Http", "src\Uno.Extensions.Http\Uno.Extensions.Http.csproj", "{F6921B06-3F17-442B-B245-786DEFFE60A2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Http.Refit", "Uno.Extensions.Http.Refit\Uno.Extensions.Http.Refit.csproj", "{571B4368-E13C-4ECA-B342-5838E2020310}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Http.Refit", "src\Uno.Extensions.Http.Refit\Uno.Extensions.Http.Refit.csproj", "{571B4368-E13C-4ECA-B342-5838E2020310}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Serialization.Http", "Uno.Extensions.Serialization.Http\Uno.Extensions.Serialization.Http.csproj", "{A04C2FDC-34A0-4619-8C80-BFDED66B72CD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Serialization.Http", "src\Uno.Extensions.Serialization.Http\Uno.Extensions.Serialization.Http.csproj", "{A04C2FDC-34A0-4619-8C80-BFDED66B72CD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Serialization.Refit", "Uno.Extensions.Serialization.Refit\Uno.Extensions.Serialization.Refit.csproj", "{F03CE17C-F19D-4057-983E-5A260624B888}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Serialization.Refit", "src\Uno.Extensions.Serialization.Refit\Uno.Extensions.Serialization.Refit.csproj", "{F03CE17C-F19D-4057-983E-5A260624B888}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Serialization.Tests", "Uno.Extensions.Serialization.Tests\Uno.Extensions.Serialization.Tests.csproj", "{811AEBB3-BCE1-4B53-8F93-ACFAA3328C14}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Serialization.Tests", "src\Uno.Extensions.Serialization.Tests\Uno.Extensions.Serialization.Tests.csproj", "{811AEBB3-BCE1-4B53-8F93-ACFAA3328C14}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Logging.Serilog", "Uno.Extensions.Logging.Serilog\Uno.Extensions.Logging.Serilog.csproj", "{CE4D658B-DC36-46CB-85C0-F8DA140E92BA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Logging.Serilog", "src\Uno.Extensions.Logging.Serilog\Uno.Extensions.Logging.Serilog.csproj", "{CE4D658B-DC36-46CB-85C0-F8DA140E92BA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Navigation", "Uno.Extensions.Navigation\Uno.Extensions.Navigation.csproj", "{0271AD7C-E7FD-4BB0-BDE5-3EE834AF2199}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Navigation", "src\Uno.Extensions.Navigation\Uno.Extensions.Navigation.csproj", "{0271AD7C-E7FD-4BB0-BDE5-3EE834AF2199}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Serialization", "Serialization", "{D3FBC1A0-E7E5-431A-BAC6-BCE8DB1AD4FB}" EndProject @@ -43,38 +43,38 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Configuration", "Configurat EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Reactive", "Reactive", "{6B956AB1-06A6-4BEC-9467-E7B593A89E34}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Reactive", "Uno.Extensions.Reactive\Uno.Extensions.Reactive.csproj", "{4CFBA6CE-2C70-4241-8085-B40D6DD36D1F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Reactive", "src\Uno.Extensions.Reactive\Uno.Extensions.Reactive.csproj", "{4CFBA6CE-2C70-4241-8085-B40D6DD36D1F}" ProjectSection(ProjectDependencies) = postProject {4CAB68E2-8ABC-489E-9F6A-3BE6A91A0DC3} = {4CAB68E2-8ABC-489E-9F6A-3BE6A91A0DC3} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Reactive.Testing", "Uno.Extensions.Reactive.Testing\Uno.Extensions.Reactive.Testing.csproj", "{FEA65A36-C4FB-4A4D-9F6B-A6E0778BB363}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Reactive.Testing", "src\Uno.Extensions.Reactive.Testing\Uno.Extensions.Reactive.Testing.csproj", "{FEA65A36-C4FB-4A4D-9F6B-A6E0778BB363}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Reactive.Tests", "Uno.Extensions.Reactive.Tests\Uno.Extensions.Reactive.Tests.csproj", "{2125E823-0EAF-44D0-A9AF-85B2F0E50C14}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Reactive.Tests", "src\Uno.Extensions.Reactive.Tests\Uno.Extensions.Reactive.Tests.csproj", "{2125E823-0EAF-44D0-A9AF-85B2F0E50C14}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Navigation.WinUI", "Uno.Extensions.Navigation.UI\Uno.Extensions.Navigation.WinUI.csproj", "{7AB8EDEC-D027-428D-A59E-2C3AAC4BF904}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Navigation.WinUI", "src\Uno.Extensions.Navigation.UI\Uno.Extensions.Navigation.WinUI.csproj", "{7AB8EDEC-D027-428D-A59E-2C3AAC4BF904}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Localization.WinUI", "Uno.Extensions.Localization.UI\Uno.Extensions.Localization.WinUI.csproj", "{ED24D8A7-F009-46EB-B848-1CFAA34487D5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Localization.WinUI", "src\Uno.Extensions.Localization.UI\Uno.Extensions.Localization.WinUI.csproj", "{ED24D8A7-F009-46EB-B848-1CFAA34487D5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Reactive.Generator", "Uno.Extensions.Reactive.Generator\Uno.Extensions.Reactive.Generator.csproj", "{4CAB68E2-8ABC-489E-9F6A-3BE6A91A0DC3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Reactive.Generator", "src\Uno.Extensions.Reactive.Generator\Uno.Extensions.Reactive.Generator.csproj", "{4CAB68E2-8ABC-489E-9F6A-3BE6A91A0DC3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Hosting.WinUI", "Uno.Extensions.Hosting.UI\Uno.Extensions.Hosting.WinUI.csproj", "{5AF1DA94-11B0-4C30-BEF5-7FF3A5F9D869}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Hosting.WinUI", "src\Uno.Extensions.Hosting.UI\Uno.Extensions.Hosting.WinUI.csproj", "{5AF1DA94-11B0-4C30-BEF5-7FF3A5F9D869}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Logging.WinUI", "Uno.Extensions.Logging\Uno.Extensions.Logging.WinUI.csproj", "{ABC151F8-855F-4D2B-A7AA-F0207AD6E847}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Logging.WinUI", "src\Uno.Extensions.Logging\Uno.Extensions.Logging.WinUI.csproj", "{ABC151F8-855F-4D2B-A7AA-F0207AD6E847}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Navigation.Toolkit.WinUI", "Uno.Extensions.Navigation.Toolkit\Uno.Extensions.Navigation.Toolkit.WinUI.csproj", "{54E67E51-B1D0-4A3F-9EE9-A58329074CC3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Navigation.Toolkit.WinUI", "src\Uno.Extensions.Navigation.Toolkit\Uno.Extensions.Navigation.Toolkit.WinUI.csproj", "{54E67E51-B1D0-4A3F-9EE9-A58329074CC3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Reactive.WinUI", "Uno.Extensions.Reactive.UI\Uno.Extensions.Reactive.WinUI.csproj", "{0F3C7D7A-C57C-41C0-86B9-34C9B5A1643A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Reactive.WinUI", "src\Uno.Extensions.Reactive.UI\Uno.Extensions.Reactive.WinUI.csproj", "{0F3C7D7A-C57C-41C0-86B9-34C9B5A1643A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Reactive.Messaging", "Uno.Extensions.Reactive.Messaging\Uno.Extensions.Reactive.Messaging.csproj", "{B54E4D85-188D-4B19-93B0-2248FFAA6144}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Reactive.Messaging", "src\Uno.Extensions.Reactive.Messaging\Uno.Extensions.Reactive.Messaging.csproj", "{B54E4D85-188D-4B19-93B0-2248FFAA6144}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Authentication", "Authentication", "{FEABD28F-23AE-4CDC-9933-44D6717C681C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Authentication", "Uno.Extensions.Authentication\Uno.Extensions.Authentication.csproj", "{E3EF3679-46F8-4E20-A491-E2D1FD7D881B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Authentication", "src\Uno.Extensions.Authentication\Uno.Extensions.Authentication.csproj", "{E3EF3679-46F8-4E20-A491-E2D1FD7D881B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Authentication.WinUI", "Uno.Extensions.Authentication.UI\Uno.Extensions.Authentication.WinUI.csproj", "{C76A3086-846C-4919-A1A3-7F2E67C5A355}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Authentication.WinUI", "src\Uno.Extensions.Authentication.UI\Uno.Extensions.Authentication.WinUI.csproj", "{C76A3086-846C-4919-A1A3-7F2E67C5A355}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Authentication.MSAL.WinUI", "Uno.Extensions.Authentication.MSAL\Uno.Extensions.Authentication.MSAL.WinUI.csproj", "{978A32D5-B542-4E4D-9F2E-AE78752F9633}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Authentication.MSAL.WinUI", "src\Uno.Extensions.Authentication.MSAL\Uno.Extensions.Authentication.MSAL.WinUI.csproj", "{978A32D5-B542-4E4D-9F2E-AE78752F9633}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BEBE0A7A-DF4F-4250-A50E-6901C936A01B}" ProjectSection(SolutionItems) = preProject @@ -82,7 +82,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Directory.Build.props = Directory.Build.props Directory.Build.targets = Directory.Build.targets Directory.Packages.props = Directory.Packages.props - global.json = global.json + ..\global.json = ..\global.json tfms-non-ui.props = tfms-non-ui.props tfms-ui-maui.props = tfms-ui-maui.props tfms-ui-winui-runtimetests.props = tfms-ui-winui-runtimetests.props @@ -91,53 +91,53 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution winappsdk-workaround.targets = winappsdk-workaround.targets EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Authentication.Oidc.WinUI", "Uno.Extensions.Authentication.Oidc\Uno.Extensions.Authentication.Oidc.WinUI.csproj", "{456DDC7B-4009-4A4E-819D-4E7EA1BEC5FB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Authentication.Oidc.WinUI", "src\Uno.Extensions.Authentication.Oidc\Uno.Extensions.Authentication.Oidc.WinUI.csproj", "{456DDC7B-4009-4A4E-819D-4E7EA1BEC5FB}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Storage", "Storage", "{8C4F4055-0DDD-4BA9-BC90-12B92D9EE774}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Storage", "Uno.Extensions.Storage\Uno.Extensions.Storage.csproj", "{FE27ED72-D0A7-4C6C-B23D-3D178557D889}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Storage", "src\Uno.Extensions.Storage\Uno.Extensions.Storage.csproj", "{FE27ED72-D0A7-4C6C-B23D-3D178557D889}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Storage.WinUI", "Uno.Extensions.Storage.UI\Uno.Extensions.Storage.WinUI.csproj", "{24904601-971A-40B0-BA89-EADB2442513A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Storage.WinUI", "src\Uno.Extensions.Storage.UI\Uno.Extensions.Storage.WinUI.csproj", "{24904601-971A-40B0-BA89-EADB2442513A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Core.Generators", "Uno.Extensions.Core.Generators\Uno.Extensions.Core.Generators.csproj", "{A58BFE43-C9CF-40FD-B39A-B0488967810B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Core.Generators", "src\Uno.Extensions.Core.Generators\Uno.Extensions.Core.Generators.csproj", "{A58BFE43-C9CF-40FD-B39A-B0488967810B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Core.Tests", "Uno.Extensions.Core.Tests\Uno.Extensions.Core.Tests.csproj", "{70345491-481C-4B75-902C-8D7E473EE4BA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Core.Tests", "src\Uno.Extensions.Core.Tests\Uno.Extensions.Core.Tests.csproj", "{70345491-481C-4B75-902C-8D7E473EE4BA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Navigation.WinUI.Markup", "Uno.Extensions.Navigation.UI.Markup\Uno.Extensions.Navigation.WinUI.Markup.csproj", "{93D4147A-94BC-4599-94EB-51E77E673BF9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Navigation.WinUI.Markup", "src\Uno.Extensions.Navigation.UI.Markup\Uno.Extensions.Navigation.WinUI.Markup.csproj", "{93D4147A-94BC-4599-94EB-51E77E673BF9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Reactive.WinUI.Markup", "Uno.Extensions.Reactive.UI.Markup\Uno.Extensions.Reactive.WinUI.Markup.csproj", "{2890C1C1-D58C-4D39-963E-F27D17F96E9F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Reactive.WinUI.Markup", "src\Uno.Extensions.Reactive.UI.Markup\Uno.Extensions.Reactive.WinUI.Markup.csproj", "{2890C1C1-D58C-4D39-963E-F27D17F96E9F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Tests", "Solution Tests", "{FB399485-A0B1-4416-A494-E19AC7F5A665}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Reactive.WinUI.Tests", "Uno.Extensions.Reactive.UI.Tests\Uno.Extensions.Reactive.WinUI.Tests.csproj", "{38982DC2-D562-4702-B215-3819EC434DA1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Reactive.WinUI.Tests", "src\Uno.Extensions.Reactive.UI.Tests\Uno.Extensions.Reactive.WinUI.Tests.csproj", "{38982DC2-D562-4702-B215-3819EC434DA1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Toolkit", "Toolkit", "{069DD21F-46E5-4379-ADF6-81AE5FCD54B5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Toolkit", "Uno.Extensions.Toolkit\Uno.Extensions.Toolkit.csproj", "{219987B9-C746-40B4-AEE2-91D542075BFE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Toolkit", "src\Uno.Extensions.Toolkit\Uno.Extensions.Toolkit.csproj", "{219987B9-C746-40B4-AEE2-91D542075BFE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Toolkit.WinUI", "Uno.Extensions.Toolkit.UI\Uno.Extensions.Toolkit.WinUI.csproj", "{2FADB746-5211-44DB-8F2B-5B4C9617290B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Toolkit.WinUI", "src\Uno.Extensions.Toolkit.UI\Uno.Extensions.Toolkit.WinUI.csproj", "{2FADB746-5211-44DB-8F2B-5B4C9617290B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Validation", "Validation", "{B1477A2C-41F4-4970-8640-5CCF8DA3EDFD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Validation", "Uno.Extensions.Validation\Uno.Extensions.Validation.csproj", "{F0668EB6-9C39-42A9-BE4A-AF57FD7E9A1D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Validation", "src\Uno.Extensions.Validation\Uno.Extensions.Validation.csproj", "{F0668EB6-9C39-42A9-BE4A-AF57FD7E9A1D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Validation.Fluent", "Uno.Extensions.Validation.Fluent\Uno.Extensions.Validation.Fluent.csproj", "{EEF81643-E541-4298-92FF-F0AF8433C44B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Validation.Fluent", "src\Uno.Extensions.Validation.Fluent\Uno.Extensions.Validation.Fluent.csproj", "{EEF81643-E541-4298-92FF-F0AF8433C44B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Core.WinUI", "Uno.Extensions.Core.UI\Uno.Extensions.Core.WinUI.csproj", "{FBD4CA61-6709-40BA-9E64-C34672A27568}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Core.WinUI", "src\Uno.Extensions.Core.UI\Uno.Extensions.Core.WinUI.csproj", "{FBD4CA61-6709-40BA-9E64-C34672A27568}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Navigation.Generators", "Uno.Extensions.Navigation.Generators\Uno.Extensions.Navigation.Generators.csproj", "{2F076ADB-04CE-4C75-A63E-90A160BB4C30}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Navigation.Generators", "src\Uno.Extensions.Navigation.Generators\Uno.Extensions.Navigation.Generators.csproj", "{2F076ADB-04CE-4C75-A63E-90A160BB4C30}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Http.WinUI", "Uno.Extensions.Http.UI\Uno.Extensions.Http.WinUI.csproj", "{E2F71C96-1C18-4C05-AD21-94231A260436}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Http.WinUI", "src\Uno.Extensions.Http.UI\Uno.Extensions.Http.WinUI.csproj", "{E2F71C96-1C18-4C05-AD21-94231A260436}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Maui.WinUI", "Uno.Extensions.Maui.UI\Uno.Extensions.Maui.WinUI.csproj", "{D2F84DF8-C3BF-4FA2-B378-6AEDD6B6C350}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Maui.WinUI", "src\Uno.Extensions.Maui.UI\Uno.Extensions.Maui.WinUI.csproj", "{D2F84DF8-C3BF-4FA2-B378-6AEDD6B6C350}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Maui", "Maui", "{2197ADCE-59C4-465A-B380-0B06BF68BBBC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Maui.WinUI.Markup", "Uno.Extensions.Maui.WinUI.Markup\Uno.Extensions.Maui.WinUI.Markup.csproj", "{B72698C5-6706-4275-8A2B-A1D39FE9B13E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Maui.WinUI.Markup", "src\Uno.Extensions.Maui.WinUI.Markup\Uno.Extensions.Maui.WinUI.Markup.csproj", "{B72698C5-6706-4275-8A2B-A1D39FE9B13E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.RuntimeTests", "Uno.Extensions.RuntimeTests\Uno.Extensions.RuntimeTests\Uno.Extensions.RuntimeTests.csproj", "{A42362AF-8A61-4BBA-AA8A-E43323D5A063}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.RuntimeTests", "src\Uno.Extensions.RuntimeTests\Uno.Extensions.RuntimeTests\Uno.Extensions.RuntimeTests.csproj", "{A42362AF-8A61-4BBA-AA8A-E43323D5A063}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.RuntimeTests.Core", "Uno.Extensions.RuntimeTests\Uno.Extensions.RuntimeTests.Core\Uno.Extensions.RuntimeTests.Core.csproj", "{869C9E5B-0F85-4316-BC4B-CB6CBFCC02A3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.RuntimeTests.Core", "src\Uno.Extensions.RuntimeTests\Uno.Extensions.RuntimeTests.Core\Uno.Extensions.RuntimeTests.Core.csproj", "{869C9E5B-0F85-4316-BC4B-CB6CBFCC02A3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/build/ci/stage-build-packages.yml b/build/ci/stage-build-packages.yml index 146de3147..e5f5725f8 100644 --- a/build/ci/stage-build-packages.yml +++ b/build/ci/stage-build-packages.yml @@ -40,7 +40,7 @@ jobs: - task: MSBuild@1 displayName: Build Extensions Packages inputs: - solution: src/Uno.Extensions-packageonly.slnf + solution: Uno.Extensions-packageonly.slnf msbuildLocationMethod: location msbuildLocation: $(MSBUILDPATH) msbuildArchitecture: x86 diff --git a/build/ci/stage-build-runtimetests-skia.yml b/build/ci/stage-build-runtimetests-skia.yml index 9fe9dfe28..f3f9da8dd 100644 --- a/build/ci/stage-build-runtimetests-skia.yml +++ b/build/ci/stage-build-runtimetests-skia.yml @@ -30,7 +30,7 @@ - script: dotnet build Uno.Extensions-runtimetests.slnf /p:Build_Android=false /p:Build_iOS=false /p:Build_Windows=false /p:Build_MacCatalyst=false /p:Build_Web=false -c Debug -p:GeneratePackageOnBuild=false -bl:$(Build.ArtifactStagingDirectory)/skia-runtime-test-build.binlog displayName: 'Build Runtime Tests app' - workingDirectory: $(Build.SourcesDirectory)/src + workingDirectory: $(Build.SourcesDirectory) - task: PublishBuildArtifacts@1 displayName: Publish Build Logs diff --git a/build/ci/templates/canary-update-template.yml b/build/ci/templates/canary-update-template.yml index fbf276d5d..20405835c 100644 --- a/build/ci/templates/canary-update-template.yml +++ b/build/ci/templates/canary-update-template.yml @@ -3,7 +3,7 @@ parameters: steps: - - task: nventiveCanaryUpdater@5 + - task: unoplatformCanaryUpdater@1 displayName: 'Canary Update' retryCountOnTaskFailure: 3 condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries') @@ -12,9 +12,10 @@ steps: branchToMerge: main summaryFile: '$(Build.ArtifactStagingDirectory)/Canary.md' resultFile: '$(Build.ArtifactStagingDirectory)/result.json' - nugetUpdaterVersion: 2.3.0-alpha.42 - packageAuthor: 'nventive,Uno Platform' + nugetUpdaterVersion: 1.1.1 + packageAuthor: 'Uno Platform,unoplatform' + additionalPublicSources: 'https://pkgs.dev.azure.com/uno-platform/1dd81cbd-cb35-41de-a570-b0df3571a196/_packaging/unoplatformdev/nuget/v3/index.json' - powershell: | - dotnet tool uninstall nventive.nuget.updater.tool --tool-path $(Agent.TempDirectory) + dotnet tool uninstall uno.nuget.updater.tool --tool-path $(Agent.TempDirectory) condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries') diff --git a/build/ci/templates/canary-updater.yml b/build/ci/templates/canary-updater.yml index 2fd1448fe..7c50cb833 100644 --- a/build/ci/templates/canary-updater.yml +++ b/build/ci/templates/canary-updater.yml @@ -1,7 +1,7 @@ steps: - template: canary-update-template.yml parameters: - SolutionToUpdate: 'src/Uno.Extensions.sln' + SolutionToUpdate: 'Uno.Extensions.sln' - template: canary-update-template.yml parameters: diff --git a/samples/MauiEmbedding/Directory.Packages.props b/samples/MauiEmbedding/Directory.Packages.props index 6bddc65c7..1498de279 100644 --- a/samples/MauiEmbedding/Directory.Packages.props +++ b/samples/MauiEmbedding/Directory.Packages.props @@ -7,10 +7,6 @@ - - @@ -20,23 +16,11 @@ - - - - diff --git a/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj b/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj index fa62422ab..79a8636b1 100644 --- a/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj +++ b/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj @@ -40,6 +40,9 @@ + + + diff --git a/samples/Playground/Directory.Build.props b/samples/Playground/Directory.Build.props index 1fa1144fa..ebc32ca4b 100644 --- a/samples/Playground/Directory.Build.props +++ b/samples/Playground/Directory.Build.props @@ -1,25 +1,29 @@ - - enable - enable - true + + enable + enable + true - - $(NoWarn);NU1507;NETSDK1201;PRI257 - + $(NoWarn);NU1507;NETSDK1201;PRI257 + - - + + + + + + + + + + + diff --git a/samples/Playground/Directory.Packages.props b/samples/Playground/Directory.Packages.props index 9de978821..c965b0ded 100644 --- a/samples/Playground/Directory.Packages.props +++ b/samples/Playground/Directory.Packages.props @@ -5,14 +5,7 @@ - - @@ -21,22 +14,8 @@ - + - - - - - - diff --git a/samples/Playground/Playground/Playground.csproj b/samples/Playground/Playground/Playground.csproj index f46d77e28..b39a4aef9 100644 --- a/samples/Playground/Playground/Playground.csproj +++ b/samples/Playground/Playground/Playground.csproj @@ -36,10 +36,6 @@ - - - - @@ -84,4 +80,5 @@ + diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index d265d9dbc..e0027d4f7 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -36,8 +36,6 @@ - - @@ -63,21 +61,16 @@ - - - + - + - - + diff --git a/src/Uno.Extensions-packageonly.slnf b/src/Uno.Extensions-packageonly.slnf deleted file mode 100644 index e4de4a0f9..000000000 --- a/src/Uno.Extensions-packageonly.slnf +++ /dev/null @@ -1,49 +0,0 @@ -{ - "solution": { - "path": "Uno.Extensions.sln", - "projects": [ - "Uno.Extensions.Authentication.MSAL\\Uno.Extensions.Authentication.MSAL.WinUI.csproj", - "Uno.Extensions.Authentication.Oidc\\Uno.Extensions.Authentication.Oidc.WinUI.csproj", - "Uno.Extensions.Authentication.UI\\Uno.Extensions.Authentication.WinUI.csproj", - "Uno.Extensions.Authentication\\Uno.Extensions.Authentication.csproj", - "Uno.Extensions.Configuration\\Uno.Extensions.Configuration.csproj", - "Uno.Extensions.Core.Generators\\Uno.Extensions.Core.Generators.csproj", - "Uno.Extensions.Core.Tests\\Uno.Extensions.Core.Tests.csproj", - "Uno.Extensions.Core.UI\\Uno.Extensions.Core.WinUI.csproj", - "Uno.Extensions.Core\\Uno.Extensions.Core.csproj", - "Uno.Extensions.Hosting.UI\\Uno.Extensions.Hosting.WinUI.csproj", - "Uno.Extensions.Hosting\\Uno.Extensions.Hosting.csproj", - "Uno.Extensions.Http.Refit\\Uno.Extensions.Http.Refit.csproj", - "Uno.Extensions.Http.UI\\Uno.Extensions.Http.WinUI.csproj", - "Uno.Extensions.Http\\Uno.Extensions.Http.csproj", - "Uno.Extensions.Localization.UI\\Uno.Extensions.Localization.WinUI.csproj", - "Uno.Extensions.Localization\\Uno.Extensions.Localization.csproj", - "Uno.Extensions.Logging.Serilog\\Uno.Extensions.Logging.Serilog.csproj", - "Uno.Extensions.Logging\\Uno.Extensions.Logging.WinUI.csproj", - "Uno.Extensions.Maui.UI\\Uno.Extensions.Maui.WinUI.csproj", - "Uno.Extensions.Maui.WinUI.Markup\\Uno.Extensions.Maui.WinUI.Markup.csproj", - "Uno.Extensions.Navigation.Generators\\Uno.Extensions.Navigation.Generators.csproj", - "Uno.Extensions.Navigation.Toolkit\\Uno.Extensions.Navigation.Toolkit.WinUI.csproj", - "Uno.Extensions.Navigation.UI.Markup\\Uno.Extensions.Navigation.WinUI.Markup.csproj", - "Uno.Extensions.Navigation.UI\\Uno.Extensions.Navigation.WinUI.csproj", - "Uno.Extensions.Navigation\\Uno.Extensions.Navigation.csproj", - "Uno.Extensions.Reactive.Generator\\Uno.Extensions.Reactive.Generator.csproj", - "Uno.Extensions.Reactive.Messaging\\Uno.Extensions.Reactive.Messaging.csproj", - "Uno.Extensions.Reactive.Testing\\Uno.Extensions.Reactive.Testing.csproj", - "Uno.Extensions.Reactive.Tests\\Uno.Extensions.Reactive.Tests.csproj", - "Uno.Extensions.Reactive.UI.Markup\\Uno.Extensions.Reactive.WinUI.Markup.csproj", - "Uno.Extensions.Reactive.UI\\Uno.Extensions.Reactive.WinUI.csproj", - "Uno.Extensions.Reactive\\Uno.Extensions.Reactive.csproj", - "Uno.Extensions.Serialization.Http\\Uno.Extensions.Serialization.Http.csproj", - "Uno.Extensions.Serialization.Refit\\Uno.Extensions.Serialization.Refit.csproj", - "Uno.Extensions.Serialization.Tests\\Uno.Extensions.Serialization.Tests.csproj", - "Uno.Extensions.Serialization\\Uno.Extensions.Serialization.csproj", - "Uno.Extensions.Storage.UI\\Uno.Extensions.Storage.WinUI.csproj", - "Uno.Extensions.Storage\\Uno.Extensions.Storage.csproj", - "Uno.Extensions.Toolkit.UI\\Uno.Extensions.Toolkit.WinUI.csproj", - "Uno.Extensions.Toolkit\\Uno.Extensions.Toolkit.csproj", - "Uno.Extensions.Validation.Fluent\\Uno.Extensions.Validation.Fluent.csproj", - "Uno.Extensions.Validation\\Uno.Extensions.Validation.csproj" - ] - } -} \ No newline at end of file diff --git a/src/Uno.Extensions-runtimetests.slnf b/src/Uno.Extensions-runtimetests.slnf deleted file mode 100644 index ebb94308c..000000000 --- a/src/Uno.Extensions-runtimetests.slnf +++ /dev/null @@ -1,50 +0,0 @@ -{ - "solution": { - "path": "Uno.Extensions.sln", - "projects": [ - "Uno.Extensions.Authentication.MSAL\\Uno.Extensions.Authentication.MSAL.WinUI.csproj", - "Uno.Extensions.Authentication.Oidc\\Uno.Extensions.Authentication.Oidc.WinUI.csproj", - "Uno.Extensions.Authentication.UI\\Uno.Extensions.Authentication.WinUI.csproj", - "Uno.Extensions.Authentication\\Uno.Extensions.Authentication.csproj", - "Uno.Extensions.Configuration\\Uno.Extensions.Configuration.csproj", - "Uno.Extensions.Core.Generators\\Uno.Extensions.Core.Generators.csproj", - "Uno.Extensions.Core.Tests\\Uno.Extensions.Core.Tests.csproj", - "Uno.Extensions.Core.UI\\Uno.Extensions.Core.WinUI.csproj", - "Uno.Extensions.Core\\Uno.Extensions.Core.csproj", - "Uno.Extensions.Hosting.UI\\Uno.Extensions.Hosting.WinUI.csproj", - "Uno.Extensions.Hosting\\Uno.Extensions.Hosting.csproj", - "Uno.Extensions.Http.Refit\\Uno.Extensions.Http.Refit.csproj", - "Uno.Extensions.Http.UI\\Uno.Extensions.Http.WinUI.csproj", - "Uno.Extensions.Http\\Uno.Extensions.Http.csproj", - "Uno.Extensions.Localization.UI\\Uno.Extensions.Localization.WinUI.csproj", - "Uno.Extensions.Localization\\Uno.Extensions.Localization.csproj", - "Uno.Extensions.Logging.Serilog\\Uno.Extensions.Logging.Serilog.csproj", - "Uno.Extensions.Logging\\Uno.Extensions.Logging.WinUI.csproj", - "Uno.Extensions.Navigation.Generators\\Uno.Extensions.Navigation.Generators.csproj", - "Uno.Extensions.Navigation.Toolkit\\Uno.Extensions.Navigation.Toolkit.WinUI.csproj", - "Uno.Extensions.Navigation.UI.Markup\\Uno.Extensions.Navigation.WinUI.Markup.csproj", - "Uno.Extensions.Navigation.UI\\Uno.Extensions.Navigation.WinUI.csproj", - "Uno.Extensions.Navigation\\Uno.Extensions.Navigation.csproj", - "Uno.Extensions.Reactive.Generator\\Uno.Extensions.Reactive.Generator.csproj", - "Uno.Extensions.Reactive.Messaging\\Uno.Extensions.Reactive.Messaging.csproj", - "Uno.Extensions.Reactive.Testing\\Uno.Extensions.Reactive.Testing.csproj", - "Uno.Extensions.Reactive.Tests\\Uno.Extensions.Reactive.Tests.csproj", - "Uno.Extensions.Reactive.UI.Markup\\Uno.Extensions.Reactive.WinUI.Markup.csproj", - "Uno.Extensions.Reactive.UI.Tests\\Uno.Extensions.Reactive.WinUI.Tests.csproj", - "Uno.Extensions.Reactive.UI\\Uno.Extensions.Reactive.WinUI.csproj", - "Uno.Extensions.Reactive\\Uno.Extensions.Reactive.csproj", - "Uno.Extensions.RuntimeTests\\Uno.Extensions.RuntimeTests.Core\\Uno.Extensions.RuntimeTests.Core.csproj", - "Uno.Extensions.RuntimeTests\\Uno.Extensions.RuntimeTests\\Uno.Extensions.RuntimeTests.csproj", - "Uno.Extensions.Serialization.Http\\Uno.Extensions.Serialization.Http.csproj", - "Uno.Extensions.Serialization.Refit\\Uno.Extensions.Serialization.Refit.csproj", - "Uno.Extensions.Serialization.Tests\\Uno.Extensions.Serialization.Tests.csproj", - "Uno.Extensions.Serialization\\Uno.Extensions.Serialization.csproj", - "Uno.Extensions.Storage.UI\\Uno.Extensions.Storage.WinUI.csproj", - "Uno.Extensions.Storage\\Uno.Extensions.Storage.csproj", - "Uno.Extensions.Toolkit.UI\\Uno.Extensions.Toolkit.WinUI.csproj", - "Uno.Extensions.Toolkit\\Uno.Extensions.Toolkit.csproj", - "Uno.Extensions.Validation.Fluent\\Uno.Extensions.Validation.Fluent.csproj", - "Uno.Extensions.Validation\\Uno.Extensions.Validation.csproj" - ] - } -} \ No newline at end of file diff --git a/src/Uno.Extensions.Authentication.MSAL/Uno.Extensions.Authentication.MSAL.WinUI.csproj b/src/Uno.Extensions.Authentication.MSAL/Uno.Extensions.Authentication.MSAL.WinUI.csproj index 75b7a8fc3..d7cf3a7d8 100644 --- a/src/Uno.Extensions.Authentication.MSAL/Uno.Extensions.Authentication.MSAL.WinUI.csproj +++ b/src/Uno.Extensions.Authentication.MSAL/Uno.Extensions.Authentication.MSAL.WinUI.csproj @@ -17,6 +17,7 @@ + diff --git a/src/Uno.Extensions.Hosting.UI/ApplicationBuilder.cs b/src/Uno.Extensions.Hosting.UI/ApplicationBuilder.cs index 92d0dbc5b..6fb42a65c 100644 --- a/src/Uno.Extensions.Hosting.UI/ApplicationBuilder.cs +++ b/src/Uno.Extensions.Hosting.UI/ApplicationBuilder.cs @@ -14,7 +14,7 @@ internal record ApplicationBuilder(Application App, LaunchActivatedEventArgs Arg // When updating Hosting to Uno.WinUI 5.2+ we need to remove the compiler directive Window.Current ?? new Window(); #else - Window.Current; + Window.Current!; #endif public IHost Build() diff --git a/src/Uno.Extensions.Maui.WinUI.Markup/Uno.Extensions.Maui.WinUI.Markup.csproj b/src/Uno.Extensions.Maui.WinUI.Markup/Uno.Extensions.Maui.WinUI.Markup.csproj index ef649a84a..0efaf5f1d 100644 --- a/src/Uno.Extensions.Maui.WinUI.Markup/Uno.Extensions.Maui.WinUI.Markup.csproj +++ b/src/Uno.Extensions.Maui.WinUI.Markup/Uno.Extensions.Maui.WinUI.Markup.csproj @@ -19,6 +19,7 @@ + diff --git a/src/Uno.Extensions.Navigation.UI.Markup/Uno.Extensions.Navigation.WinUI.Markup.csproj b/src/Uno.Extensions.Navigation.UI.Markup/Uno.Extensions.Navigation.WinUI.Markup.csproj index a876adfad..9cb517c35 100644 --- a/src/Uno.Extensions.Navigation.UI.Markup/Uno.Extensions.Navigation.WinUI.Markup.csproj +++ b/src/Uno.Extensions.Navigation.UI.Markup/Uno.Extensions.Navigation.WinUI.Markup.csproj @@ -14,6 +14,7 @@ + diff --git a/src/Uno.Extensions.Reactive.UI.Markup/Uno.Extensions.Reactive.WinUI.Markup.csproj b/src/Uno.Extensions.Reactive.UI.Markup/Uno.Extensions.Reactive.WinUI.Markup.csproj index d85c33f5e..758556ec7 100644 --- a/src/Uno.Extensions.Reactive.UI.Markup/Uno.Extensions.Reactive.WinUI.Markup.csproj +++ b/src/Uno.Extensions.Reactive.UI.Markup/Uno.Extensions.Reactive.WinUI.Markup.csproj @@ -13,6 +13,7 @@ + diff --git a/src/Uno.Extensions.Reactive.slnf b/src/Uno.Extensions.Reactive.slnf deleted file mode 100644 index c93e0c199..000000000 --- a/src/Uno.Extensions.Reactive.slnf +++ /dev/null @@ -1,26 +0,0 @@ -{ - "solution": { - "path": "Uno.Extensions.sln", - "projects": [ - "Uno.Extensions.Core.Generators\\Uno.Extensions.Core.Generators.csproj", - "Uno.Extensions.Core.Tests\\Uno.Extensions.Core.Tests.csproj", - "Uno.Extensions.Core\\Uno.Extensions.Core.csproj", - "Uno.Extensions.Reactive.Generator\\Uno.Extensions.Reactive.Generator.csproj", - "Uno.Extensions.Reactive.Messaging\\Uno.Extensions.Reactive.Messaging.csproj", - "Uno.Extensions.Reactive.Testing\\Uno.Extensions.Reactive.Testing.csproj", - "Uno.Extensions.Reactive.Tests\\Uno.Extensions.Reactive.Tests.csproj", - "Uno.Extensions.Reactive.UI.Markup\\Uno.Extensions.Reactive.WinUI.Markup.csproj", - "Uno.Extensions.Reactive.UI.Tests\\Uno.Extensions.Reactive.WinUI.Tests.csproj", - "Uno.Extensions.Reactive.UI\\Uno.Extensions.Reactive.UI.csproj", - "Uno.Extensions.Reactive.UI\\Uno.Extensions.Reactive.WinUI.csproj", - "Uno.Extensions.Reactive\\Uno.Extensions.Reactive.csproj", - "Uno.Extensions.RuntimeTests.Core\\Uno.Extensions.RuntimeTests.Core.csproj", - "Uno.Extensions.RuntimeTests\\Uno.Extensions.RuntimeTests.Mobile\\Uno.Extensions.RuntimeTests.Mobile.csproj", - "Uno.Extensions.RuntimeTests\\Uno.Extensions.RuntimeTests.Shared\\Uno.Extensions.RuntimeTests.Shared.shproj", - "Uno.Extensions.RuntimeTests\\Uno.Extensions.RuntimeTests.Skia.Gtk\\Uno.Extensions.RuntimeTests.Skia.Gtk.csproj", - "Uno.Extensions.RuntimeTests\\Uno.Extensions.RuntimeTests.Skia.Wpf\\Uno.Extensions.RuntimeTests.Skia.Wpf.csproj", - "Uno.Extensions.RuntimeTests\\Uno.Extensions.RuntimeTests.Wasm\\Uno.Extensions.RuntimeTests.Wasm.csproj", - "Uno.Extensions.RuntimeTests\\Uno.Extensions.RuntimeTests.Windows\\Uno.Extensions.RuntimeTests.Windows.csproj" - ] - } -} \ No newline at end of file diff --git a/testing/TestHarness/Directory.Packages.props b/testing/TestHarness/Directory.Packages.props index 8635441b2..5c0d0963d 100644 --- a/testing/TestHarness/Directory.Packages.props +++ b/testing/TestHarness/Directory.Packages.props @@ -35,26 +35,16 @@ - - + - - - + - + diff --git a/testing/TestHarness/TestHarness.sln b/testing/TestHarness/TestHarness.sln index a679e3a63..25faa2755 100644 --- a/testing/TestHarness/TestHarness.sln +++ b/testing/TestHarness/TestHarness.sln @@ -98,7 +98,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extension Items", "Extensio ..\..\src\Directory.Build.props = ..\..\src\Directory.Build.props ..\..\src\Directory.Build.targets = ..\..\src\Directory.Build.targets ..\..\src\Directory.Packages.props = ..\..\src\Directory.Packages.props - ..\..\src\global.json = ..\..\src\global.json + ..\..\global.json = ..\..\global.json ..\..\src\tfms-non-ui.props = ..\..\src\tfms-non-ui.props ..\..\src\tfms-ui-winui.props = ..\..\src\tfms-ui-winui.props ..\..\src\winappsdk-workaround.targets = ..\..\src\winappsdk-workaround.targets diff --git a/testing/TestHarness/TestHarness/TestHarness.csproj b/testing/TestHarness/TestHarness/TestHarness.csproj index 88b58a38e..77446511c 100644 --- a/testing/TestHarness/TestHarness/TestHarness.csproj +++ b/testing/TestHarness/TestHarness/TestHarness.csproj @@ -76,17 +76,19 @@ + + + + + - - - - MSBuild:Compile - + +