Skip to content

Commit f9cf403

Browse files
authored
Merge pull request #1191 from unoplatform/dev/jela/update-canary
ci: Swap skia/native
2 parents ff410cd + d80f0db commit f9cf403

23 files changed

Lines changed: 438 additions & 75 deletions

.github/workflows/azure-static-webapp.yml

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ jobs:
1515
build_and_deploy_job:
1616
env:
1717
DIST_PATH: Uno.Gallery/bin/Release/net9.0-browserwasm/publish/wwwroot
18+
DotnetVersion: '9.0.203'
1819

1920
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
2021
runs-on: ubuntu-latest
@@ -26,10 +27,43 @@ jobs:
2627
fetch-depth: 0 # Required for gitversion
2728
submodules: true
2829

30+
# When running on macos, set the DOTNET_INSTALL_DIR so a workspace local folder
31+
# is used to install the SDK. This is required for the Uno.Sdk.Updater to work
32+
- name: Set DOTNET_INSTALL_DIR
33+
if: runner.os == 'macos' || runner.os == 'linux'
34+
shell: bash
35+
run: echo "DOTNET_INSTALL_DIR=$GITHUB_WORKSPACE/.dotnet" >> $GITHUB_ENV
36+
37+
- name: 'Set Wasm cache path'
38+
shell: pwsh
39+
run: echo "WasmCachePath=${{ github.workspace }}/.emscripten-cache" >> $env:GITHUB_ENV
40+
41+
- name: Cache EMSDK
42+
id: cache-emsdk
43+
uses: actions/cache@v4
44+
env:
45+
cache-name: cache-emsdk-modules
46+
with:
47+
path: ${{ env.WasmCachePath }}
48+
key: ${{ runner.os }}-build-emsdk-${{ env.ValidationUnoCheckVersion }}
49+
restore-keys: |
50+
${{ runner.os }}-build-emsdk-${{ env.ValidationUnoCheckVersion }}
51+
52+
- name: Cache .NET
53+
id: cache-dotnet
54+
uses: actions/cache@v4
55+
env:
56+
cache-name: cache-dotnet-install
57+
with:
58+
path: ${{ github.workspace }}/.dotnet
59+
key: ${{ runner.os }}-build-dotnet-${{ env.DotnetVersion }}
60+
restore-keys: |
61+
${{ runner.os }}-build-dotnet-${{ env.DotnetVersion }}
62+
2963
- name: Setup .NET
3064
uses: actions/setup-dotnet@v1.7.2
3165
with:
32-
dotnet-version: '9.0.200'
66+
dotnet-version: ${{ env.DotnetVersion }}
3367
include-prerelease: true
3468

3569
- run: |
7.11 KB
Binary file not shown.

Uno.Gallery/Uno.Gallery.csproj

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616

1717
<!-- android is disable on linux until ci is fixed -->
1818
<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' AND !$([MSBuild]::IsOSPlatform('linux'))">$(TargetFrameworks);net9.0-android;</TargetFrameworks>
19+
20+
<!--
21+
Uncomment to use Native rendering for iOS/Android/Wasm
22+
<UseNativeRendering>true</UseNativeRendering>
23+
-->
1924

2025
<OutputType>Exe</OutputType>
2126
<UnoSingleProject>true</UnoSingleProject>
@@ -24,14 +29,14 @@
2429
<!-- App Identifier -->
2530
<ApplicationId>uno.platform.gallery</ApplicationId>
2631

27-
<ApplicationId Condition=" '$(TargetFramework)' == 'net9.0-android' AND '$(UseSkiaRendering)' != 'true' ">com.nventive.uno.ui.demo</ApplicationId>
28-
<ApplicationId Condition=" '$(TargetFramework)' == 'net9.0-android' AND '$(UseSkiaRendering)' == 'true' ">uno.platform.gallery.skia</ApplicationId>
32+
<ApplicationId Condition=" '$(TargetFramework)' == 'net9.0-android' AND '$(UseNativeRendering)' != 'true' ">com.nventive.uno.ui.demo</ApplicationId>
33+
<ApplicationId Condition=" '$(TargetFramework)' == 'net9.0-android' AND '$(UseNativeRendering)' == 'true' ">uno.platform.gallery_native</ApplicationId>
2934

30-
<ApplicationId Condition=" '$(TargetFramework)' == 'net9.0-ios' AND '$(UseSkiaRendering)' != 'true' ">com.nventive.uno.gallery</ApplicationId>
31-
<ApplicationId Condition=" '$(TargetFramework)' == 'net9.0-ios' AND '$(UseSkiaRendering)' == 'true' ">uno.platform.gallery.skia</ApplicationId>
35+
<ApplicationId Condition=" '$(TargetFramework)' == 'net9.0-ios' AND '$(UseNativeRendering)' != 'true' ">com.nventive.uno.gallery</ApplicationId>
36+
<ApplicationId Condition=" '$(TargetFramework)' == 'net9.0-ios' AND '$(UseNativeRendering)' == 'true' ">uno.platform.gallery.native</ApplicationId>
3237

33-
<ApplicationId Condition=" '$(TargetFramework)' == 'net9.0-maccatalyst' AND '$(UseSkiaRendering)' != 'true' ">com.nventive.uno.gallery</ApplicationId>
34-
<ApplicationId Condition=" '$(TargetFramework)' == 'net9.0-maccatalyst' AND '$(UseSkiaRendering)' == 'true' ">uno.platform.gallery.skia</ApplicationId>
38+
<ApplicationId Condition=" '$(TargetFramework)' == 'net9.0-maccatalyst' AND '$(UseNativeRendering)' != 'true' ">com.nventive.uno.gallery</ApplicationId>
39+
<ApplicationId Condition=" '$(TargetFramework)' == 'net9.0-maccatalyst' AND '$(UseNativeRendering)' == 'true' ">uno.platform.gallery.native</ApplicationId>
3540

3641
<!-- Versions -->
3742
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
@@ -51,17 +56,12 @@
5156
UnoFeatures let's you quickly add and manage implicit package references based on the features you want to use.
5257
https://aka.platform.uno/singleproject-features
5358
-->
54-
55-
<!--
56-
Uncomment to use skia rendering
57-
<UseSkiaRendering>true</UseSkiaRendering>
58-
-->
5959

60-
<IsSkiaWasm Condition="'$(UseSkiaRendering)'=='true' AND '$(TargetFramework)'=='net9.0-browserwasm'">true</IsSkiaWasm>
60+
<IsSkiaWasm Condition="'$(UseNativeRendering)'!='true' AND '$(TargetFramework)'=='net9.0-browserwasm'">true</IsSkiaWasm>
6161
<IsSkiaWasm Condition="'$(IsSkiaWasm)'==''">false</IsSkiaWasm>
62-
<IsSkiaAndroid Condition="'$(UseSkiaRendering)'=='true' AND '$(TargetFramework)'=='net9.0-android'">true</IsSkiaAndroid>
62+
<IsSkiaAndroid Condition="'$(UseNativeRendering)'!='true' AND '$(TargetFramework)'=='net9.0-android'">true</IsSkiaAndroid>
6363
<IsSkiaAndroid Condition="'$(IsSkiaAndroid)'==''">false</IsSkiaAndroid>
64-
<IsSkiaUIKit Condition="'$(UseSkiaRendering)'=='true' AND ('$(TargetFramework)'=='net9.0-ios' OR '$(TargetFramework)'=='net9.0-maccatalyst')">true</IsSkiaUIKit>
64+
<IsSkiaUIKit Condition="'$(UseNativeRendering)'!='true' AND ('$(TargetFramework)'=='net9.0-ios' OR '$(TargetFramework)'=='net9.0-maccatalyst')">true</IsSkiaUIKit>
6565
<IsSkiaUIKit Condition="'$(IsSkiaUIKit)'==''">false</IsSkiaUIKit>
6666
<UnoFeatures>
6767
Material;
@@ -80,7 +80,7 @@
8080
<DefineConstants Condition="$(IsSkiaWasm)">$(DefineConstants);IS_WASM_SKIA</DefineConstants>
8181
<DefineConstants Condition="$(IsSkiaAndroid)">$(DefineConstants);IS_ANDROID_SKIA</DefineConstants>
8282
<DefineConstants Condition="$(IsSkiaUIKit)">$(DefineConstants);IS_UIKIT_SKIA</DefineConstants>
83-
<DefineConstants Condition="'$(UseSkiaRendering)'=='true'">$(DefineConstants);HAS_SKIA_RENDERER</DefineConstants>
83+
<DefineConstants Condition="'$(UseNativeRendering)'!='true'">$(DefineConstants);HAS_SKIA_RENDERER</DefineConstants>
8484

8585
<DefineConstants Condition="$(BUILD_SOURCEBRANCH.StartsWith('refs/heads/canaries'))">$(DefineConstants);IS_CANARY_BUILD</DefineConstants>
8686
</PropertyGroup>
@@ -138,7 +138,7 @@
138138
<WasmShellMonoRuntimeExecutionMode>InterpreterAndAOT</WasmShellMonoRuntimeExecutionMode>
139139
<WasmShellEmccLinkOptimization>false</WasmShellEmccLinkOptimization>
140140
<WasmShellEnableEmccProfiling>true</WasmShellEnableEmccProfiling>
141-
<UnoXamlResourcesTrimming>true</UnoXamlResourcesTrimming>
141+
<!-- <UnoXamlResourcesTrimming>true</UnoXamlResourcesTrimming> -->
142142

143143
<!--
144144
Uncomment this block to generate a profile
@@ -160,11 +160,11 @@
160160
<EnableCodeSigning>true</EnableCodeSigning>
161161
<CodeSignEntitlements>MacCatalyst\Entitlements.plist</CodeSignEntitlements>
162162

163-
<CodesignProvision>Uno Gallery (Catalyst)</CodesignProvision>
164-
<CodesignProvision Condition="$(BUILD_SOURCEBRANCH.StartsWith('refs/heads/canaries'))">Uno Gallery Canary (Catalyst)</CodesignProvision>
163+
<CodesignProvision>Uno Gallery Native (Catalyst)</CodesignProvision>
164+
<CodesignProvision Condition="$(BUILD_SOURCEBRANCH.StartsWith('refs/heads/canaries'))">Uno Gallery Native Canary (Catalyst)</CodesignProvision>
165165

166-
<CodesignProvision Condition=" '$(UseSkiaRendering)' == 'true' ">Uno Gallery Skia (Catalyst)</CodesignProvision>
167-
<CodesignProvision Condition=" '$(UseSkiaRendering)' == 'true' AND $(BUILD_SOURCEBRANCH.StartsWith('refs/heads/canaries'))">Uno Gallery Skia Canary (Catalyst)</CodesignProvision>
166+
<CodesignProvision Condition=" '$(UseNativeRendering)' != 'true' ">Uno Gallery (Catalyst)</CodesignProvision>
167+
<CodesignProvision Condition=" '$(UseNativeRendering)' != 'true' AND $(BUILD_SOURCEBRANCH.StartsWith('refs/heads/canaries'))">Uno Gallery Canary (Catalyst)</CodesignProvision>
168168
</PropertyGroup>
169169

170170
<PropertyGroup Condition="'$(Configuration)'=='Release' and '$([MSBuild]::GetTargetPlatformIdentifier($(TargetFramework)))' == 'android'">
@@ -205,8 +205,8 @@
205205
</ItemGroup>
206206

207207
<PropertyGroup Condition="'$(Configuration)'=='Release' and '$(WasmShellMonoRuntimeExecutionMode)'=='InterpreterAndAOT'">
208-
<WasmAotFileName Condition="'$(IsUiAutomationMappingEnabled)'=='' AND '$(UseSkiaRendering)' != 'true' ">aot.profile</WasmAotFileName>
209-
<WasmAotFileName Condition="'$(IsUiAutomationMappingEnabled)'=='' AND '$(UseSkiaRendering)' == 'true' ">aot-skiawasm.profile</WasmAotFileName>
208+
<WasmAotFileName Condition="'$(IsUiAutomationMappingEnabled)'=='' AND '$(UseNativeRendering)' == 'true' ">aot.profile</WasmAotFileName>
209+
<WasmAotFileName Condition="'$(IsUiAutomationMappingEnabled)'=='' AND '$(UseNativeRendering)' != 'true' ">aot-skiawasm.profile</WasmAotFileName>
210210

211211
<!--
212212
Use smaller profile for UI tests to avoid the browser's memory

azure-pipelines.yml

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ stages:
6161
ArtifactName: Android
6262
BuildForPlayStore: True
6363
VersionCodeOffset: 1
64-
UseSkiaRendering: false
64+
UseNativeRendering: true
6565
VariantName: Native
6666
Android_Skia_Store:
6767
ApplicationPlatform: AnyCPU
6868
ArtifactName: Android
6969
BuildForPlayStore: True
7070
VersionCodeOffset: 1
71-
UseSkiaRendering: true
71+
UseNativeRendering: false
7272
VariantName: Skia
7373

7474
pool:
@@ -133,28 +133,28 @@ stages:
133133
ArtifactName: iOS-mobile
134134
ApplicationBuildNumberOffset: 50
135135
BuildCommand: publish
136-
UseSkiaRendering: false
136+
UseNativeRendering: true
137137
VariantName: Native
138138
Catalyst:
139139
BuildTargetFramework: net9.0-maccatalyst
140140
ArtifactName: Catalyst
141141
ApplicationBuildNumberOffset: 50
142142
BuildCommand: build
143-
UseSkiaRendering: false
143+
UseNativeRendering: true
144144
VariantName: Native
145145
iOS_Skia:
146146
BuildTargetFramework: net9.0-ios
147147
ArtifactName: iOS-mobile
148148
ApplicationBuildNumberOffset: 50
149149
BuildCommand: publish
150-
UseSkiaRendering: true
150+
UseNativeRendering: false
151151
VariantName: Skia
152152
Catalyst_Skia:
153153
BuildTargetFramework: net9.0-maccatalyst
154154
ArtifactName: Catalyst
155155
ApplicationBuildNumberOffset: 50
156156
BuildCommand: build
157-
UseSkiaRendering: true
157+
UseNativeRendering: false
158158
VariantName: Skia
159159
pool:
160160
vmImage: macos-15
@@ -184,7 +184,7 @@ stages:
184184
# deleteCert: true
185185

186186
#
187-
# Gallery native
187+
# Gallery Skia
188188
#
189189
- task: InstallAppleProvisioningProfile@1
190190
displayName: 'Install Apple Provisioning Profile'
@@ -211,32 +211,32 @@ stages:
211211
provProfileSecureFile: Uno_Gallery_Canary_iOS.mobileprovision
212212

213213
#
214-
# Gallery Skia
214+
# Gallery Native
215215
#
216216

217217
- task: InstallAppleProvisioningProfile@1
218218
displayName: 'Install Apple Provisioning Profile'
219219
inputs:
220220
provisioningProfileLocation: 'secureFiles'
221-
provProfileSecureFile: Uno_Gallery_Skia_Catalyst.provisionprofile
221+
provProfileSecureFile: Uno_Gallery_Native_Catalyst.provisionprofile
222222

223223
- task: InstallAppleProvisioningProfile@1
224224
displayName: 'Install Apple Provisioning Profile'
225225
inputs:
226226
provisioningProfileLocation: 'secureFiles'
227-
provProfileSecureFile: Uno_Gallery_Skia_Canary_Catalyst.provisionprofile
227+
provProfileSecureFile: Uno_Gallery_Native_Canary_Catalyst.provisionprofile
228228

229229
- task: InstallAppleProvisioningProfile@1
230230
displayName: 'Install Apple Provisioning Profile'
231231
inputs:
232232
provisioningProfileLocation: 'secureFiles'
233-
provProfileSecureFile: Uno_Gallery_Skia_iOS.mobileprovision
233+
provProfileSecureFile: Uno_Gallery_Native_iOS.mobileprovision
234234

235235
- task: InstallAppleProvisioningProfile@1
236236
displayName: 'Install Apple Provisioning Profile'
237237
inputs:
238238
provisioningProfileLocation: 'secureFiles'
239-
provProfileSecureFile: Uno_Gallery_Skia_Canary_iOS.mobileprovision
239+
provProfileSecureFile: Uno_Gallery_Native_Canary_iOS.mobileprovision
240240

241241

242242
- template: build/templates/xcode-select.yml
@@ -259,10 +259,10 @@ stages:
259259
matrix:
260260
DOM:
261261
ArtifactName: WASM-DOM
262-
UseSkiaRendering: false
262+
UseNativeRendering: true
263263
Skia:
264264
ArtifactName: WASM-Skia
265-
UseSkiaRendering: true
265+
UseNativeRendering: false
266266

267267
variables:
268268
SkipUnknownFrameworks: true
@@ -290,7 +290,13 @@ stages:
290290
# - template: build/stage-uitests-android.yml
291291

292292
- ${{ if startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries/dev') }}:
293-
- template: build/stage-publish-wasm-canary.yml
294-
- template: build/stage-publish-ios-canary.yml
295-
- template: build/stage-publish-catalyst-canary.yml
296-
- template: build/stage-publish-android-canary.yml
293+
- template: build/templates/canary-publish/stage-publish-wasm-canary.yml
294+
- template: build/templates/canary-publish/stage-publish-ios-canary.yml
295+
- template: build/templates/canary-publish/stage-publish-catalyst-canary.yml
296+
- template: build/templates/canary-publish/stage-publish-android-canary.yml
297+
298+
- ${{ if startsWith(variables['Build.SourceBranch'], 'refs/heads/master') }}:
299+
- template: build/templates/master-publish/stage-publish-wasm.yml
300+
- template: build/templates/master-publish/stage-publish-ios.yml
301+
- template: build/templates/master-publish/stage-publish-catalyst.yml
302+
- template: build/templates/master-publish/stage-publish-android.yml

build/scripts/wasm-uitest-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ export UNO_UITEST_WASM_PROJECT=$BUILD_SOURCESDIRECTORY/Uno.Gallery/Uno.Gallery.c
77

88
cd $BUILD_SOURCESDIRECTORY
99

10-
dotnet publish -f net9.0-browserwasm -p:Configuration=Release $UNO_UITEST_WASM_PROJECT -p:IsUiAutomationMappingEnabled=True -bl:$UNO_UITEST_SCREENSHOT_PATH/msbuild.binlog
10+
dotnet publish -f net9.0-browserwasm -p:Configuration=Release $UNO_UITEST_WASM_PROJECT -p:UseNativeRendering=true -p:IsUiAutomationMappingEnabled=True -bl:$UNO_UITEST_SCREENSHOT_PATH/msbuild.binlog

build/stage-build-android-mobile.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ steps:
2020

2121
- script: |
2222
cd $(build.sourcesdirectory)/Uno.Gallery
23-
dotnet publish -f:net9.0-android -p:TargetFrameworkOverride=net9.0-android -c:Release -p:UseSkiaRendering=$(UseSkiaRendering) "/p:InformationalVersion=$(NBGV_InformationalVersion)" /p:AndroidSigningKeyStore=$(keyStore.secureFilePath) /p:AndroidSigningStorePass=$(AndroidSigningStorePass) /p:AndroidSigningKeyPass=$(AndroidSigningKeyPass) /p:AndroidSigningKeyAlias=$(AndroidSigningKeyAlias) /p:AndroidKeyStore=true /bl:$(build.artifactstagingdirectory)/build-$(BuildForPlayStore).binlog
23+
dotnet publish -f:net9.0-android -p:TargetFrameworkOverride=net9.0-android -c:Release -p:UseNativeRendering=$(UseNativeRendering) "/p:InformationalVersion=$(NBGV_InformationalVersion)" /p:AndroidSigningKeyStore=$(keyStore.secureFilePath) /p:AndroidSigningStorePass=$(AndroidSigningStorePass) /p:AndroidSigningKeyPass=$(AndroidSigningKeyPass) /p:AndroidSigningKeyAlias=$(AndroidSigningKeyAlias) /p:AndroidKeyStore=true /bl:$(build.artifactstagingdirectory)/build-$(BuildForPlayStore).binlog
2424
displayName: 'Build Android Package'
2525
condition: and(succeeded(), eq(variables['System.PullRequest.IsFork'],'False'))
2626

2727
- script: |
2828
cd $(build.sourcesdirectory)/Uno.Gallery
29-
dotnet publish -f:net9.0-android -p:TargetFrameworkOverride=net9.0-android -c:Release -p:UseSkiaRendering=$(UseSkiaRendering) "/p:InformationalVersion=$(NBGV_InformationalVersion)" /p:AndroidKeyStore=False /bl:$(build.artifactstagingdirectory)/build-$(BuildForPlayStore).binlog
29+
dotnet publish -f:net9.0-android -p:TargetFrameworkOverride=net9.0-android -c:Release -p:UseNativeRendering=$(UseNativeRendering) "/p:InformationalVersion=$(NBGV_InformationalVersion)" /p:AndroidKeyStore=False /bl:$(build.artifactstagingdirectory)/build-$(BuildForPlayStore).binlog
3030
displayName: 'Build Android Package (Fork)'
3131
condition: and(succeeded(), eq(variables['System.PullRequest.IsFork'],'True'))
3232

build/stage-build-mobile.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ steps:
2121
- bash: |
2222
cd $(build.sourcesdirectory)/Uno.Gallery
2323
echo "BUILD_SOURCEBRANCH: $BUILD_SOURCEBRANCH"
24-
dotnet $(BuildCommand) -v:n -f $(BuildTargetFramework) -p:TargetFrameworkOverride=$(BuildTargetFramework) -c Release -p:UseSkiaRendering=$(UseSkiaRendering) /p:ArchiveOnBuild=true /bl:$(build.artifactstagingdirectory)/build-$(BuildTargetFramework).binlog "/p:InformationalVersion=$(NBGV_InformationalVersion)"
24+
dotnet $(BuildCommand) -v:n -f $(BuildTargetFramework) -p:TargetFrameworkOverride=$(BuildTargetFramework) -c Release -p:UseNativeRendering=$(UseNativeRendering) /p:ArchiveOnBuild=true /bl:$(build.artifactstagingdirectory)/build-$(BuildTargetFramework).binlog "/p:InformationalVersion=$(NBGV_InformationalVersion)"
2525
displayName: Build project for Release - $(BuildTargetFramework)
2626
condition: and(succeeded(), eq(variables['System.PullRequest.IsFork'],'False'))
2727

2828
- bash: |
2929
cd $(build.sourcesdirectory)/Uno.Gallery
3030
echo "BUILD_SOURCEBRANCH: $BUILD_SOURCEBRANCH"
31-
dotnet build -f $(BuildTargetFramework) -p:TargetFrameworkOverride=$(BuildTargetFramework) -c Release -p:UseSkiaRendering=$(UseSkiaRendering) /bl:$(build.artifactstagingdirectory)/build-$(BuildTargetFramework).binlog "/p:InformationalVersion=$(NBGV_InformationalVersion)"
31+
dotnet build -f $(BuildTargetFramework) -p:TargetFrameworkOverride=$(BuildTargetFramework) -c Release -p:UseNativeRendering=$(UseNativeRendering) /bl:$(build.artifactstagingdirectory)/build-$(BuildTargetFramework).binlog "/p:InformationalVersion=$(NBGV_InformationalVersion)"
3232
displayName: Build project for Release - $(BuildTargetFramework)
3333
condition: and(succeeded(), eq(variables['System.PullRequest.IsFork'],'True'))
3434

build/stage-build-wasm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
- template: templates/canary-updater.yml
99

1010
- bash: |
11-
dotnet publish Uno.Gallery/Uno.Gallery.csproj -c Release -f net9.0-browserwasm -p:UseSkiaRendering=$(UseSkiaRendering) -p:InformationalVersion=$(NBGV_InformationalVersion) -o "$(Agent.TempDirectory)/wasm-publish" -bl:$(Build.ArtifactStagingDirectory)/wasm-publish.binlog
11+
dotnet publish Uno.Gallery/Uno.Gallery.csproj -c Release -f net9.0-browserwasm -p:UseNativeRendering=$(UseNativeRendering) -p:InformationalVersion=$(NBGV_InformationalVersion) -o "$(Agent.TempDirectory)/wasm-publish" -bl:$(Build.ArtifactStagingDirectory)/wasm-publish.binlog
1212
displayName: 'Builds Wasm $(ArtifactName)'
1313

1414
- task: PublishBuildArtifacts@1

build/stage-publish-android-canary.yml renamed to build/templates/canary-publish/stage-publish-android-canary.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
displayName: 'Play Store Publish'
2727
inputs:
2828
serviceConnection: 'Uno Platform Google Play'
29-
applicationId: 'com.nventive.uno.ui.demo.canary'
30-
bundleFile: '$(Pipeline.Workspace)/drop/publish/com.nventive.uno.ui.demo.canary-Signed.aab'
29+
applicationId: 'uno.platform.gallery.native_canary'
30+
bundleFile: '$(Pipeline.Workspace)/drop/publish/uno.platform.gallery.skia_canary-Signed.aab'
3131
track: 'alpha'
3232

3333
- deployment: 'Android_Publish_Skia'
@@ -52,7 +52,7 @@
5252
displayName: 'Play Store Publish'
5353
inputs:
5454
serviceConnection: 'Uno Platform Google Play'
55-
applicationId: 'uno.platform.gallery.skia_canary'
56-
bundleFile: '$(Pipeline.Workspace)/drop/publish/uno.platform.gallery.skia_canary-Signed.aab'
55+
applicationId: 'com.nventive.uno.ui.demo.canary'
56+
bundleFile: '$(Pipeline.Workspace)/drop/publish/com.nventive.uno.ui.demo.canary-Signed.aab'
5757
track: 'alpha'
5858

0 commit comments

Comments
 (0)