From 0ddd71786400416c42c3d14efd9b9232f4251b1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Tue, 24 Sep 2024 15:42:25 -0400 Subject: [PATCH 01/18] docs: Update migration doc (cherry picked from commit 5cdd4cd4b75fc17357d3a8072fd63097fe853405) --- doc/articles/migrating-from-previous-releases.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/articles/migrating-from-previous-releases.md b/doc/articles/migrating-from-previous-releases.md index faa348a0bf23..7c65d7aad8ad 100644 --- a/doc/articles/migrating-from-previous-releases.md +++ b/doc/articles/migrating-from-previous-releases.md @@ -6,6 +6,10 @@ uid: Uno.Development.MigratingFromPreviousReleases This article details the migration steps required to migrate from one version to the next when breaking changes are being introduced. +## Uno Platform 5.4 + +Uno Platform 5.4 does not contain breaking changes that require attention when upgrading from previous versions. + ## Uno Platform 5.3 Uno Platform 5.3 contains an improved template and Uno.SDK versioning, new default text font, and Rider support. From 2a50cac7391f6542fe4af242e47985f2bed92856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Tue, 24 Sep 2024 16:45:28 -0400 Subject: [PATCH 02/18] chore: Adjust HR matrix for winappsdk (cherry picked from commit ffcf66db0601ce7283f65ad0cc316ff5b6c0a5b2) --- doc/articles/features/working-with-xaml-hot-reload.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/articles/features/working-with-xaml-hot-reload.md b/doc/articles/features/working-with-xaml-hot-reload.md index e3ae2537399a..f71f092dfc08 100644 --- a/doc/articles/features/working-with-xaml-hot-reload.md +++ b/doc/articles/features/working-with-xaml-hot-reload.md @@ -103,7 +103,7 @@ Hot Reload features vary between platforms and IDE, you can check below the list WinAppSDK - βœ…πŸžβœ…πŸž + βœ…πŸž[5]βœ…πŸž πŸ”³πŸ”³ πŸ”³πŸ”³ @@ -243,6 +243,7 @@ Legend: - [2]: Support is [not available](https://youtrack.jetbrains.com/issue/RIDER-53302/launchSettings.json-WSL2-command-support). - [3]: C# Hot Reload is affected by a [.NET Runtime issue](https://github.com/dotnet/android/issues/9120). - [4]: XAML Hot Reload is using the XAML Reader, [pending C# Hot Reload update](https://github.com/unoplatform/uno/issues/15918) and a [VS/VS Code update](https://developercommunity.visualstudio.com/t/net70-iosnet70-android-MetadataUpd/10279604). +- [5]: C# Markup Hot Reload is supported when running in Unpackaged mode only ## Supported features per Platform From c3790d8968cbc452445da62059fed67e8154b9a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Wed, 25 Sep 2024 08:34:15 -0400 Subject: [PATCH 03/18] docs: Add IRootObjectProvider sample (cherry picked from commit f3a8d122f57608960d01cddec3cc63bfae1c3eff) --- .../features/windows-ui-markup-extensions.md | 40 ++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/doc/articles/features/windows-ui-markup-extensions.md b/doc/articles/features/windows-ui-markup-extensions.md index da4ebdbab6cc..da1e7d762e9c 100644 --- a/doc/articles/features/windows-ui-markup-extensions.md +++ b/doc/articles/features/windows-ui-markup-extensions.md @@ -80,7 +80,45 @@ This class can be used as follows in the XAML: ### IRootObjectProvider -Not supported as of Uno 4.3 +With access to IRootObjectProvider becomes possible for a Markup extension to browse the visual tree, starting from the root of the XAML file. + +This following example [from the WinUI specifications](https://github.com/microsoft/microsoft-ui-xaml-specs/blob/34b14114af141ceb843413bedb85705c9a2e9204/active/XamlServiceProvider/XamlServiceProviderApi.md#irootobjectprovider) give a glimpse of this feature. + +Using the following XAML: + +```csharp +public class DynamicBindExtension : MarkupExtension +{ + public DynamicBindExtension(string propertyName) + { + _propertyName = propertyName; + } + string _propertyName; + + public override object ProvideValue(IXamlServiceProvider serviceProvider) + { + var root = ((IRootObjectProvider)serviceProvider.GetService(typeof(IRootObjectProvider))).RootObject; + var info = root.GetType().GetProperty(_propertyName); + return info.GetValue(root); + } +} +``` + +The following XAML will display β€œPage Tag”: + +```xml + + + + + + +``` ### IUriContext From 59702ec17aadfd06b3b5aaaa15db2d016d9bccd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Wed, 25 Sep 2024 08:51:22 -0400 Subject: [PATCH 04/18] docs: Add GIF support matrix (cherry picked from commit 13a0ca4f1ca49d0a69d4ff3ee9298142f8ee61b4) --- doc/articles/features/image.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/doc/articles/features/image.md b/doc/articles/features/image.md index 17e8b2a4b979..e62c5378dd3d 100644 --- a/doc/articles/features/image.md +++ b/doc/articles/features/image.md @@ -39,3 +39,17 @@ MyImage.UriSource = new BitmapImage { UriSource = new($"ms-appdata:///local/imag > [!IMPORTANT] > When using WinAppSDK Unpackaged mode, `ms-appdata:///` is not supported on `Image`. In this case, you can use [`BitmapImage.SetSourceAsync`](https://learn.microsoft.com/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.media.imaging.bitmapsource.setsourceasync) to set the image programmatically. + +## Gif Support + +Displaying animated GIFs is supported on: + +- netX.0-desktop (5.4 ad later) +- netX.0-windows +- netX.0-browserwasm + +Unsupported targets, where only the first frame is shown, as of Uno Platform 5.4: + +- netX.0-ios +- netX.0-android +- netX.0-maccatalyst From f6ecd6560febfef2701b1d062099af2e70f03f1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Wed, 25 Sep 2024 20:16:55 -0400 Subject: [PATCH 05/18] chore: Fix typo (cherry picked from commit c33c7ba5175d2ec132847262d562ff512c0a08d4) --- doc/articles/features/image.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/articles/features/image.md b/doc/articles/features/image.md index e62c5378dd3d..db6a1aa8ce94 100644 --- a/doc/articles/features/image.md +++ b/doc/articles/features/image.md @@ -44,7 +44,7 @@ MyImage.UriSource = new BitmapImage { UriSource = new($"ms-appdata:///local/imag Displaying animated GIFs is supported on: -- netX.0-desktop (5.4 ad later) +- netX.0-desktop (5.4 and later) - netX.0-windows - netX.0-browserwasm From 115ee86fde81b6c0fc69eac1bbbbfa0bd9b75d24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Wed, 25 Sep 2024 20:22:07 -0400 Subject: [PATCH 06/18] chore: Adjust footnote (cherry picked from commit 478d58fdbcabcf778dc4af331efb118b2e05610f) --- doc/articles/features/working-with-xaml-hot-reload.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/articles/features/working-with-xaml-hot-reload.md b/doc/articles/features/working-with-xaml-hot-reload.md index f71f092dfc08..3e3a70b44c5c 100644 --- a/doc/articles/features/working-with-xaml-hot-reload.md +++ b/doc/articles/features/working-with-xaml-hot-reload.md @@ -103,7 +103,7 @@ Hot Reload features vary between platforms and IDE, you can check below the list WinAppSDK - βœ…πŸž[5]βœ…πŸž + βœ…[5]πŸžβœ…πŸž πŸ”³πŸ”³ πŸ”³πŸ”³ From c46568a0e7e9a59074ed31fed5420282258e2f27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Wed, 25 Sep 2024 20:44:26 -0400 Subject: [PATCH 07/18] chore: Adjust migration steps (cherry picked from commit 6d90886a4635fb0deeac50f2a031979f7686ac47) --- doc/articles/migrating-from-previous-releases.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/articles/migrating-from-previous-releases.md b/doc/articles/migrating-from-previous-releases.md index 7c65d7aad8ad..4ab1dae557ce 100644 --- a/doc/articles/migrating-from-previous-releases.md +++ b/doc/articles/migrating-from-previous-releases.md @@ -8,7 +8,9 @@ This article details the migration steps required to migrate from one version to ## Uno Platform 5.4 -Uno Platform 5.4 does not contain breaking changes that require attention when upgrading from previous versions. +Uno Platform 5.4 contains one breaking change. The [`Uno.Extensions`](https://aka.platform.uno/uno-extensions) compatibility with legacy UWP apps has been removed. If your app is UWP based and uses Uno.Extensions, in order to migrate to Uno Platform 5.4, you can keep using [previous releases of Uno.Extensions](https://github.com/unoplatform/uno.extensions/releases), or [migrate your app to WinUI](https://platform.uno/docs/articles/updating-to-winui3.html). + +All the other features of Uno Platform 5.4 continue to be compatible with both UWP and WinUI apps. ## Uno Platform 5.3 From 1c5c3d44adc9ac0aa96389bb58fc05fc551180c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Thu, 26 Sep 2024 08:01:11 -0400 Subject: [PATCH 08/18] docs: update for review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: AgnΓ¨s ZITTE <16295702+agneszitte@users.noreply.github.com> (cherry picked from commit 68d047e2c76860eb1d227c6da47dd34ffc6fb99b) --- doc/articles/migrating-from-previous-releases.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/articles/migrating-from-previous-releases.md b/doc/articles/migrating-from-previous-releases.md index 4ab1dae557ce..de1718491cd0 100644 --- a/doc/articles/migrating-from-previous-releases.md +++ b/doc/articles/migrating-from-previous-releases.md @@ -8,7 +8,7 @@ This article details the migration steps required to migrate from one version to ## Uno Platform 5.4 -Uno Platform 5.4 contains one breaking change. The [`Uno.Extensions`](https://aka.platform.uno/uno-extensions) compatibility with legacy UWP apps has been removed. If your app is UWP based and uses Uno.Extensions, in order to migrate to Uno Platform 5.4, you can keep using [previous releases of Uno.Extensions](https://github.com/unoplatform/uno.extensions/releases), or [migrate your app to WinUI](https://platform.uno/docs/articles/updating-to-winui3.html). +Uno Platform 5.4 contains one breaking change. The [`Uno.Extensions`](https://aka.platform.uno/uno-extensions) compatibility with legacy UWP apps has been removed. If your app is UWP-based and uses Uno.Extensions, in order to migrate to Uno Platform 5.4, you can keep using [previous releases of Uno.Extensions](https://github.com/unoplatform/uno.extensions/releases), or [migrate your app to WinUI](https://platform.uno/docs/articles/updating-to-winui3.html). All the other features of Uno Platform 5.4 continue to be compatible with both UWP and WinUI apps. From 61bef5c3bbe2b5e943c896736ae6c0a4381abf72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Thu, 26 Sep 2024 09:06:59 -0400 Subject: [PATCH 09/18] chore: Adjust ignored words (cherry picked from commit 09a1c4050ef4e09e9e4e07af21f0584aa9cf9553) --- build/cSpell.json | 1 + 1 file changed, 1 insertion(+) diff --git a/build/cSpell.json b/build/cSpell.json index 7b39a1c0b17d..b93032229ee6 100644 --- a/build/cSpell.json +++ b/build/cSpell.json @@ -124,6 +124,7 @@ "Authenticode", "automagically", "bluetoothdevice", + "browserwasm", "commandbar", "CLSID", "datatransfer", From 26ce676dc953e7ea7155e31d74b2a991773b129b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Thu, 26 Sep 2024 10:12:48 -0400 Subject: [PATCH 10/18] chore: Adjust reactive upgrade (cherry picked from commit 0fafcd0fbe03af149f18cac8ee21190b23b608c8) --- doc/articles/migrating-from-previous-releases.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/doc/articles/migrating-from-previous-releases.md b/doc/articles/migrating-from-previous-releases.md index de1718491cd0..f4ed09a23fc4 100644 --- a/doc/articles/migrating-from-previous-releases.md +++ b/doc/articles/migrating-from-previous-releases.md @@ -8,10 +8,17 @@ This article details the migration steps required to migrate from one version to ## Uno Platform 5.4 -Uno Platform 5.4 contains one breaking change. The [`Uno.Extensions`](https://aka.platform.uno/uno-extensions) compatibility with legacy UWP apps has been removed. If your app is UWP-based and uses Uno.Extensions, in order to migrate to Uno Platform 5.4, you can keep using [previous releases of Uno.Extensions](https://github.com/unoplatform/uno.extensions/releases), or [migrate your app to WinUI](https://platform.uno/docs/articles/updating-to-winui3.html). +Uno Platform 5.4 contains breaking changes for Uno.Extensions. + +### UWP Support for Uno.Extensions +The [`Uno.Extensions`](https://aka.platform.uno/uno-extensions) compatibility with legacy UWP apps has been removed. If your app is UWP-based and uses Uno.Extensions, in order to migrate to Uno Platform 5.4, you can keep using [previous releases of Uno.Extensions](https://github.com/unoplatform/uno.extensions/releases), or [migrate your app to WinUI](https://platform.uno/docs/articles/updating-to-winui3.html). All the other features of Uno Platform 5.4 continue to be compatible with both UWP and WinUI apps. +### Updates in Uno.Extensions.Reactive + +The generated code has changed, make sure to [review our docs to upgrade](xuid:Extensions.Migration.Reactive) to Uno Platform 5.4. + ## Uno Platform 5.3 Uno Platform 5.3 contains an improved template and Uno.SDK versioning, new default text font, and Rider support. From 1658bf7a70fbc8485e7e5e656d30479d08766365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Thu, 26 Sep 2024 10:14:36 -0400 Subject: [PATCH 11/18] chore: Adjust markdown (cherry picked from commit 973c1daef4f8aef2224d3b45953513d5de6bd920) --- doc/articles/migrating-from-previous-releases.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/articles/migrating-from-previous-releases.md b/doc/articles/migrating-from-previous-releases.md index f4ed09a23fc4..f01efb4e8761 100644 --- a/doc/articles/migrating-from-previous-releases.md +++ b/doc/articles/migrating-from-previous-releases.md @@ -11,6 +11,7 @@ This article details the migration steps required to migrate from one version to Uno Platform 5.4 contains breaking changes for Uno.Extensions. ### UWP Support for Uno.Extensions + The [`Uno.Extensions`](https://aka.platform.uno/uno-extensions) compatibility with legacy UWP apps has been removed. If your app is UWP-based and uses Uno.Extensions, in order to migrate to Uno Platform 5.4, you can keep using [previous releases of Uno.Extensions](https://github.com/unoplatform/uno.extensions/releases), or [migrate your app to WinUI](https://platform.uno/docs/articles/updating-to-winui3.html). All the other features of Uno Platform 5.4 continue to be compatible with both UWP and WinUI apps. From 3543e86c42f985f08f8f3d4934913627aa259406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Thu, 26 Sep 2024 11:42:09 -0400 Subject: [PATCH 12/18] chore: Adjust ID Co-authored-by: Andres Pineda <1900897+ajpinedam@users.noreply.github.com> (cherry picked from commit f4bcd66547e5ba6acf5ba1adaa2a8933b75a0976) --- doc/articles/migrating-from-previous-releases.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/articles/migrating-from-previous-releases.md b/doc/articles/migrating-from-previous-releases.md index f01efb4e8761..12d7c957617e 100644 --- a/doc/articles/migrating-from-previous-releases.md +++ b/doc/articles/migrating-from-previous-releases.md @@ -18,7 +18,7 @@ All the other features of Uno Platform 5.4 continue to be compatible with both U ### Updates in Uno.Extensions.Reactive -The generated code has changed, make sure to [review our docs to upgrade](xuid:Extensions.Migration.Reactive) to Uno Platform 5.4. +The generated code has changed. Make sure to [review our docs to upgrade](xuid:Uno.Extensions.Reactive.Upgrading) to Uno Platform 5.4. ## Uno Platform 5.3 From 6f1d46c898a7530840d389bd3afb55492011c1e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Thu, 26 Sep 2024 13:56:18 -0400 Subject: [PATCH 13/18] chore: Adjust winappsdk version dependency (cherry picked from commit 7826c90139aa8168999804f7219c727f3f561eb4) --- doc/articles/migrating-from-previous-releases.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/doc/articles/migrating-from-previous-releases.md b/doc/articles/migrating-from-previous-releases.md index 12d7c957617e..2da689636e6c 100644 --- a/doc/articles/migrating-from-previous-releases.md +++ b/doc/articles/migrating-from-previous-releases.md @@ -10,6 +10,19 @@ This article details the migration steps required to migrate from one version to Uno Platform 5.4 contains breaking changes for Uno.Extensions. +## WinAppSDK 1.6 considerations + +Uno Platform 5.4 updates to WinAppSDK 1.6 if you using the [`Uno.SDK`](xref:Uno.Features.Uno.Sdk), which requires a temporary version adjustment until newer versions of the .NET 8 SDKs are released. + +In your project, you may need to add the following lines (or uncomment them if you kept them from our templates) to get the `net8.0-windowsXX` target to build: + +```xml + + + 10.0.19041.38 + +``` + ### UWP Support for Uno.Extensions The [`Uno.Extensions`](https://aka.platform.uno/uno-extensions) compatibility with legacy UWP apps has been removed. If your app is UWP-based and uses Uno.Extensions, in order to migrate to Uno Platform 5.4, you can keep using [previous releases of Uno.Extensions](https://github.com/unoplatform/uno.extensions/releases), or [migrate your app to WinUI](https://platform.uno/docs/articles/updating-to-winui3.html). From d589b02bdd7940b5d4d9618d67b4b2e2a93c5874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Thu, 26 Sep 2024 13:56:29 -0400 Subject: [PATCH 14/18] chore: Fix typo (cherry picked from commit 952691c02bf3a1ae4585e55545be16a3100aa90d) --- doc/articles/migrating-from-previous-releases.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/articles/migrating-from-previous-releases.md b/doc/articles/migrating-from-previous-releases.md index 2da689636e6c..e91bd7957b30 100644 --- a/doc/articles/migrating-from-previous-releases.md +++ b/doc/articles/migrating-from-previous-releases.md @@ -18,7 +18,7 @@ In your project, you may need to add the following lines (or uncomment them if y ```xml - + 10.0.19041.38 ``` From c08d9765ce0aec8405a0b039251f1cbfd609724f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agn=C3=A8s=20ZITTE?= <16295702+agneszitte@users.noreply.github.com> Date: Thu, 26 Sep 2024 14:12:19 -0400 Subject: [PATCH 15/18] docs: Update documentation with latest updates (cherry picked from commit 283215aab8af56ac9b2021c9f0bff211406a78b6) # Conflicts: # doc/import_external_docs.ps1 --- doc/import_external_docs.ps1 | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/doc/import_external_docs.ps1 b/doc/import_external_docs.ps1 index f0726dd0d753..570e91b94ce0 100644 --- a/doc/import_external_docs.ps1 +++ b/doc/import_external_docs.ps1 @@ -7,17 +7,31 @@ Set-PSDebug -Trace 1 $external_docs = @{ # use either commit, or branch name to use its latest commit +<<<<<<< HEAD "uno.wasm.bootstrap" = "6a034bdd23a8be6882b0d05e8b017e49f655e89d" #latest main commit "uno.themes" = "38d6bf005a2637f77bb052d92be88ac567479811" #latest release branch commit "uno.toolkit.ui" = "27c6e65094a8e9a53e6a4f33b846f4d98c118fc4" #latest release branch commit "uno.check" = "27a06fd34c4744d07d48249daae1bcdf21a8a005" #latest main commit "uno.xamlmerge.task" = "21f02c98702b875a9942047ca042e41810b6fe56" #latest main commit +======= + "uno.wasm.bootstrap" = "69dd0ead0c99cc11f559d44cb67f20fa215de316" #latest main commit + "uno.themes" = "1da7240824a1bc5ddaf5efc1ed6e22ea5a41abd9" #latest release/stable/5.2 branch commit + "uno.toolkit.ui" = "a79e83cb260c17f59be6a843ce90038cb2479a61" #latest release/stable/6.2 branch commit + "uno.check" = "27e686d9205654375fd2c7861c3ebe5f2ad69e93" #latest main commit + "uno.xamlmerge.task" = "74c832124dad9a979f8d6318b6c18be1125467e5" #latest main commit +>>>>>>> 283215aab8 (docs: Update documentation with latest updates) "figma-docs" = "842a2792282b88586a337381b2b3786e779973b4" #latest main commit - "uno.resizetizer" = "dce3eabef076e37b38fe058b427eb84f1d19b881" #latest main commit + "uno.resizetizer" = "b17e1d54f4375f79da24ae5eaaf3f738851786eb" #latest main commit "uno.uitest" = "9669fd2783187d06c36dd6a717c1b9f08d1fa29c" #latest master commit +<<<<<<< HEAD "uno.extensions" = "3cdb9fc1dba989986413b563fdaaf07bd88c31f1" #latest release branch commit "workshops" = "df05737f9e3088a4e60179f6fa2cd2fc6866d2c7" #latest master commit "uno.samples" = "d30313f954c312563a118196b734a534718eceb9" #latest master commit +======= + "uno.extensions" = "f2871cf4aa93bce96d8a19ede2b1417776589093" #latest release/stable/5.0 branch commit + "workshops" = "e3c2a11a588b184d8cd3a6f88813e5615cca891d" #latest master commit + "uno.samples" = "ef30b74b84bd470521ae1383b49ced4afcfeab1d" #latest master commit +>>>>>>> 283215aab8 (docs: Update documentation with latest updates) } $uno_git_url = "https://github.com/unoplatform/" From 3e31eed8ec1e0eb66d0630954ec39540da9ff71e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Agn=C3=A8s=20ZITTE?= <16295702+agneszitte@users.noreply.github.com> Date: Thu, 26 Sep 2024 14:16:20 -0400 Subject: [PATCH 16/18] docs: Update Uno.Samples documentation with latest changes (cherry picked from commit 53b792eb9c622b65f6a5556172d51b394e82c480) # Conflicts: # doc/import_external_docs.ps1 --- doc/import_external_docs.ps1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/import_external_docs.ps1 b/doc/import_external_docs.ps1 index 570e91b94ce0..49d96ba3f10e 100644 --- a/doc/import_external_docs.ps1 +++ b/doc/import_external_docs.ps1 @@ -30,8 +30,12 @@ $external_docs = @{ ======= "uno.extensions" = "f2871cf4aa93bce96d8a19ede2b1417776589093" #latest release/stable/5.0 branch commit "workshops" = "e3c2a11a588b184d8cd3a6f88813e5615cca891d" #latest master commit +<<<<<<< HEAD "uno.samples" = "ef30b74b84bd470521ae1383b49ced4afcfeab1d" #latest master commit >>>>>>> 283215aab8 (docs: Update documentation with latest updates) +======= + "uno.samples" = "cf96230ed902e18335411683cb07321eae125df2" #latest master commit +>>>>>>> 53b792eb9c (docs: Update Uno.Samples documentation with latest changes) } $uno_git_url = "https://github.com/unoplatform/" From f7907853ed9b8c4a554ca792f0aab05b4bcf1c63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Thu, 26 Sep 2024 14:31:30 -0400 Subject: [PATCH 17/18] chore: Restore bootstrapper update (cherry picked from commit 510546bd74b7239074ff834dcff53ec6aae83e18) # Conflicts: # doc/import_external_docs.ps1 --- doc/import_external_docs.ps1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/import_external_docs.ps1 b/doc/import_external_docs.ps1 index 49d96ba3f10e..b2cc2617d6f4 100644 --- a/doc/import_external_docs.ps1 +++ b/doc/import_external_docs.ps1 @@ -7,6 +7,7 @@ Set-PSDebug -Trace 1 $external_docs = @{ # use either commit, or branch name to use its latest commit +<<<<<<< HEAD <<<<<<< HEAD "uno.wasm.bootstrap" = "6a034bdd23a8be6882b0d05e8b017e49f655e89d" #latest main commit "uno.themes" = "38d6bf005a2637f77bb052d92be88ac567479811" #latest release branch commit @@ -15,6 +16,9 @@ $external_docs = @{ "uno.xamlmerge.task" = "21f02c98702b875a9942047ca042e41810b6fe56" #latest main commit ======= "uno.wasm.bootstrap" = "69dd0ead0c99cc11f559d44cb67f20fa215de316" #latest main commit +======= + "uno.wasm.bootstrap" = "abcb066159e3a089019032fbd4befda836336296" #latest release/stable/8.0 branch commit +>>>>>>> 510546bd74 (chore: Restore bootstrapper update) "uno.themes" = "1da7240824a1bc5ddaf5efc1ed6e22ea5a41abd9" #latest release/stable/5.2 branch commit "uno.toolkit.ui" = "a79e83cb260c17f59be6a843ce90038cb2479a61" #latest release/stable/6.2 branch commit "uno.check" = "27e686d9205654375fd2c7861c3ebe5f2ad69e93" #latest main commit From 69cfba8d5dc1770643b78c1873fe2682f97acfe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Thu, 26 Sep 2024 14:58:25 -0400 Subject: [PATCH 18/18] chore: Adjust for backport --- doc/import_external_docs.ps1 | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/doc/import_external_docs.ps1 b/doc/import_external_docs.ps1 index b2cc2617d6f4..2f64dbcc98ba 100644 --- a/doc/import_external_docs.ps1 +++ b/doc/import_external_docs.ps1 @@ -7,39 +7,17 @@ Set-PSDebug -Trace 1 $external_docs = @{ # use either commit, or branch name to use its latest commit -<<<<<<< HEAD -<<<<<<< HEAD - "uno.wasm.bootstrap" = "6a034bdd23a8be6882b0d05e8b017e49f655e89d" #latest main commit - "uno.themes" = "38d6bf005a2637f77bb052d92be88ac567479811" #latest release branch commit - "uno.toolkit.ui" = "27c6e65094a8e9a53e6a4f33b846f4d98c118fc4" #latest release branch commit - "uno.check" = "27a06fd34c4744d07d48249daae1bcdf21a8a005" #latest main commit - "uno.xamlmerge.task" = "21f02c98702b875a9942047ca042e41810b6fe56" #latest main commit -======= - "uno.wasm.bootstrap" = "69dd0ead0c99cc11f559d44cb67f20fa215de316" #latest main commit -======= "uno.wasm.bootstrap" = "abcb066159e3a089019032fbd4befda836336296" #latest release/stable/8.0 branch commit ->>>>>>> 510546bd74 (chore: Restore bootstrapper update) "uno.themes" = "1da7240824a1bc5ddaf5efc1ed6e22ea5a41abd9" #latest release/stable/5.2 branch commit "uno.toolkit.ui" = "a79e83cb260c17f59be6a843ce90038cb2479a61" #latest release/stable/6.2 branch commit "uno.check" = "27e686d9205654375fd2c7861c3ebe5f2ad69e93" #latest main commit "uno.xamlmerge.task" = "74c832124dad9a979f8d6318b6c18be1125467e5" #latest main commit ->>>>>>> 283215aab8 (docs: Update documentation with latest updates) "figma-docs" = "842a2792282b88586a337381b2b3786e779973b4" #latest main commit "uno.resizetizer" = "b17e1d54f4375f79da24ae5eaaf3f738851786eb" #latest main commit "uno.uitest" = "9669fd2783187d06c36dd6a717c1b9f08d1fa29c" #latest master commit -<<<<<<< HEAD - "uno.extensions" = "3cdb9fc1dba989986413b563fdaaf07bd88c31f1" #latest release branch commit - "workshops" = "df05737f9e3088a4e60179f6fa2cd2fc6866d2c7" #latest master commit - "uno.samples" = "d30313f954c312563a118196b734a534718eceb9" #latest master commit -======= "uno.extensions" = "f2871cf4aa93bce96d8a19ede2b1417776589093" #latest release/stable/5.0 branch commit "workshops" = "e3c2a11a588b184d8cd3a6f88813e5615cca891d" #latest master commit -<<<<<<< HEAD - "uno.samples" = "ef30b74b84bd470521ae1383b49ced4afcfeab1d" #latest master commit ->>>>>>> 283215aab8 (docs: Update documentation with latest updates) -======= "uno.samples" = "cf96230ed902e18335411683cb07321eae125df2" #latest master commit ->>>>>>> 53b792eb9c (docs: Update Uno.Samples documentation with latest changes) } $uno_git_url = "https://github.com/unoplatform/"