diff --git a/Uno.Gallery/Platforms/WebAssembly/aot.profile b/Uno.Gallery/Platforms/WebAssembly/aot.profile index c2c1df594..368ffa4bc 100644 Binary files a/Uno.Gallery/Platforms/WebAssembly/aot.profile and b/Uno.Gallery/Platforms/WebAssembly/aot.profile differ diff --git a/Uno.Gallery/Views/Shell.xaml.cs b/Uno.Gallery/Views/Shell.xaml.cs index b4b56cdbc..1be3bacf5 100644 --- a/Uno.Gallery/Views/Shell.xaml.cs +++ b/Uno.Gallery/Views/Shell.xaml.cs @@ -17,7 +17,7 @@ namespace Uno.Gallery; public sealed partial class Shell : UserControl { - private const string NoSuggestionsFoundText = "No suggestions found"; + private const string NoSuggestionsFoundText = "TEST"; private static IEnumerable SearchSamples(string query) => App.GetSamples() diff --git a/build/templates/canary-publish/stage-publish-android-canary.yml b/build/templates/canary-publish/stage-publish-android-canary.yml index b17c3af39..d3b1c3611 100644 --- a/build/templates/canary-publish/stage-publish-android-canary.yml +++ b/build/templates/canary-publish/stage-publish-android-canary.yml @@ -1,6 +1,6 @@ stages: - stage: Android_Publish - displayName: 'Android Publish' + displayName: 'Android Publish (Canary)' dependsOn: Android jobs: @@ -26,8 +26,8 @@ displayName: 'Play Store Publish' inputs: serviceConnection: 'Uno Platform Google Play' - applicationId: 'uno.platform.gallery.native_canary' - bundleFile: '$(Pipeline.Workspace)/drop/publish/uno.platform.gallery.skia_canary-Signed.aab' + applicationId: 'uno.platform.gallery_native_canary' + bundleFile: '$(Pipeline.Workspace)/drop/publish/uno.platform.gallery_native_canary-Signed.aab' track: 'alpha' - deployment: 'Android_Publish_Skia' diff --git a/build/templates/canary-publish/stage-publish-catalyst-canary.yml b/build/templates/canary-publish/stage-publish-catalyst-canary.yml index 29f706064..6cf734259 100644 --- a/build/templates/canary-publish/stage-publish-catalyst-canary.yml +++ b/build/templates/canary-publish/stage-publish-catalyst-canary.yml @@ -1,6 +1,6 @@ stages: - stage: Catalyst_Publish - displayName: 'Catalyst Publish' + displayName: 'Catalyst Publish (Canary)' dependsOn: Apple jobs: diff --git a/build/templates/canary-publish/stage-publish-ios-canary.yml b/build/templates/canary-publish/stage-publish-ios-canary.yml index c8e4cce64..2ccb9fed3 100644 --- a/build/templates/canary-publish/stage-publish-ios-canary.yml +++ b/build/templates/canary-publish/stage-publish-ios-canary.yml @@ -1,6 +1,6 @@ stages: - stage: iOS_Publish - displayName: 'iOS Publish' + displayName: 'iOS Publish (Canary)' dependsOn: Apple jobs: diff --git a/build/templates/canary-publish/stage-publish-wasm-canary.yml b/build/templates/canary-publish/stage-publish-wasm-canary.yml index dfd1e3b91..e928f614e 100644 --- a/build/templates/canary-publish/stage-publish-wasm-canary.yml +++ b/build/templates/canary-publish/stage-publish-wasm-canary.yml @@ -1,6 +1,6 @@ stages: - stage: WebAssembly_Publish - displayName: 'WebAssembly' + displayName: 'WebAssembly (Canary)' dependsOn: WebAssembly jobs: @@ -30,7 +30,7 @@ skip_api_build: true is_static_export: false verbose: false - azure_static_web_apps_api_token: '$(PROD_SWA_TOKEN)' + azure_static_web_apps_api_token: '$(DEV_SWA_TOKEN)' deployment_environment: 'canary-dom' - deployment: 'WebAssembly_Publish_SKIA' @@ -59,5 +59,5 @@ skip_api_build: true is_static_export: false verbose: false - azure_static_web_apps_api_token: '$(PROD_SWA_TOKEN)' + azure_static_web_apps_api_token: '$(DEV_SWA_TOKEN)' deployment_environment: 'canary-skia' diff --git a/build/templates/canary-updater.yml b/build/templates/canary-updater.yml index 607a5e12a..342d7e704 100644 --- a/build/templates/canary-updater.yml +++ b/build/templates/canary-updater.yml @@ -13,22 +13,6 @@ steps: packageAuthor: 'nventive,uno platform' summaryFile: '$(Build.ArtifactStagingDirectory)/Canary.md' - - task: unoplatformCanaryUpdater@1 - displayName: 'Canary Update (skia-everywhere)' - condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries/skia-everywhere') - inputs: - solution: '$(build.sourcesdirectory)' - usePrivateFeed: false - useNuGetOrg: true - mergeBranch: true - branchToMerge: master - nugetUpdaterVersion: '1.2.10' - nugetVersion: dev - packageAuthor: 'nventive,unoplatform,uno platform' - summaryFile: '$(Build.ArtifactStagingDirectory)/Summary.md' - resultFile: '$(Build.ArtifactStagingDirectory)/Results.json' - # additionalPublicSources: 'https://pkgs.dev.azure.com/uno-platform/1dd81cbd-cb35-41de-a570-b0df3571a196/_packaging/Features/nuget/v3/index.json' - #- pwsh: | # cd $(build.sourcesdirectory) # dotnet nuget add source https://pkgs.dev.azure.com/uno-platform/1dd81cbd-cb35-41de-a570-b0df3571a196/_packaging/Features/nuget/v3/index.json -n unofeatures @@ -51,25 +35,33 @@ steps: gci -r -include "Uno.Gallery.csproj" | foreach-object { $a = $_.fullname; ( get-content $a ) | - foreach-object { $_ -replace "uno.platform.gallery.skia","uno.platform.gallery.skia-canary" } | + foreach-object { $_ -replace "uno\.platform\.gallery\.native","uno.platform.gallery.native-canary" } | + set-content $a } + displayName: 'Adjust App ID (skia)' + condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries') + - pwsh: | + gci -r -include "Uno.Gallery.csproj" | + foreach-object { + $a = $_.fullname; ( get-content $a ) | + foreach-object { $_ -replace "uno\.platform\.gallery_native","uno.platform.gallery_native-canary" } | set-content $a } - displayName: 'Adjust info.plist bundle name (skia)' + displayName: 'Adjust App ID (Android Native)' condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries') - pwsh: | gci -r -include "Uno.Gallery.csproj" | foreach-object { $a = $_.fullname; ( get-content $a ) | - foreach-object { $_ -replace "com.nventive.uno.ui.demo","com.nventive.uno.ui.demo.canary" } | + foreach-object { $_ -replace "com\.nventive\.uno\.ui\.demo","com.nventive.uno.ui.demo.canary" } | set-content $a } - displayName: 'Adjust info.plist bundle name (Android)' + displayName: 'Adjust App ID (Android Skia)' condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries') - pwsh: | gci -r -include "Uno.Gallery.csproj" | foreach-object { $a = $_.fullname; ( get-content $a ) | - foreach-object { $_ -replace "com.nventive.uno.gallery","com.nventive.uno.gallery-canary" } | + foreach-object { $_ -replace "com\.nventive\.uno\.gallery","com.nventive.uno.gallery-canary" } | set-content $a } - displayName: 'Adjust info.plist bundle name (Catalyst)' + displayName: 'Adjust App ID (Catalyst)' condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries') diff --git a/global.json b/global.json index da07ec3bb..6f86c03b3 100644 --- a/global.json +++ b/global.json @@ -4,6 +4,6 @@ }, // To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information. "msbuild-sdks": { - "Uno.Sdk": "6.1.0-dev.102" + "Uno.Sdk": "6.1.0-dev.230" } }