Merge pull request #1220 from unoplatform/dev/agzi/MigrateUiTestToNet9

Author: kazo0

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

@@ -15,7 +15,7 @@ jobs:
   build_and_deploy_job:
     env:
       DIST_PATH: Uno.Gallery/bin/Release/net9.0-browserwasm/publish/wwwroot
-      DotnetVersion: '9.0.203'
+      DotnetVersion: '9.0.300'
 
     if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
     runs-on: ubuntu-latest

Uno.Gallery/Platforms/Android/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="34" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="35" />
 	<application android:label="Uno.Gallery"></application>
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

Uno.Gallery/Uno.Gallery.csproj

@@ -7,16 +7,14 @@
 		<!-- NOTE: We cannot build with dotnet build -p:TargetFrameworks=net9.0-platform as that will flow to source generator project, which is incorrect -->
 		<TargetFramework Condition="'$(TargetFrameworkOverride)'!=''">$(TargetFrameworkOverride)</TargetFramework>
 		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'==''">
+			net9.0-android;
 			net9.0-ios;
 			net9.0-maccatalyst;
 			net9.0-windows10.0.19041;
 			net9.0-desktop;
 			net9.0-browserwasm;
 		</TargetFrameworks>
 
-		<!-- android is disable on linux until ci is fixed  -->
-		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' AND !$([MSBuild]::IsOSPlatform('linux'))">$(TargetFrameworks);net9.0-android;</TargetFrameworks>
-
 		<!--
 		Uncomment to use Native rendering for iOS/Android/Wasm
 		<UseNativeRendering>true</UseNativeRendering>
@@ -125,7 +123,6 @@
 	<ItemGroup Condition="
 			   ('$(Configuration)'=='Debug' or '$(IsUiAutomationMappingEnabled)'=='True')
 			   AND '$([MSBuild]::GetTargetPlatformIdentifier($(TargetFramework)))' == 'ios'
-			   AND $([MSBuild]::VersionLessThan($([MSBuild]::GetTargetFrameworkVersion($(TargetFramework))), '9.0'))
 			   ">
 		<PackageReference Include="Xamarin.TestCloud.Agent" />
 	</ItemGroup>

azure-pipelines.yml

@@ -42,8 +42,8 @@ variables:
   IsLightBuild: $[eq(variables['Build.Reason'], 'PullRequest')]
   IsCanaryBranch: $[startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries/')]
 
-  XCODE_ROOT: '/Applications/Xcode_16.3.app'
-  XCODE_ROOT_UITESTS: '/Applications/Xcode_15.3.app'
+  XCODE_ROOT: '/Applications/Xcode_16.4.app'
+  XCODE_ROOT_UITESTS: '/Applications/Xcode_16.4.app'
 
   # Required to about trashing azdo hosted agents
   AotCompileMaxDegreeOfParallelism: 3
@@ -283,12 +283,11 @@ stages:
   jobs:
   - template: build/stage-uitests-ios.yml
 
-# Disabled for ANR issue on the hosted agents with System.UI    
-# - stage: Android_Tests
-#   displayName: 'Android Tests'
-#   dependsOn: []
-#   jobs:
-#   - template: build/stage-uitests-android.yml
+- stage: Android_Tests
+  displayName: 'Android Tests'
+  dependsOn: []
+  jobs:
+  - template: build/stage-uitests-android.yml
 
 - ${{ if startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries/dev') }}:
   - template: build/templates/canary-publish/stage-publish-wasm-canary.yml

build/scripts/android-uitest-build.sh

@@ -14,11 +14,11 @@ export ANDROID_SDK_ROOT=$BUILD_SOURCESDIRECTORY/build/android-sdk
 export CMDLINETOOLS=commandlinetools-mac-8512546_latest.zip
 mkdir -p $ANDROID_HOME
 wget https://dl.google.com/android/repository/$CMDLINETOOLS
-unzip $CMDLINETOOLS -d $ANDROID_HOME/cmdline-tools
+unzip -o $CMDLINETOOLS -d $ANDROID_HOME/cmdline-tools
 rm $CMDLINETOOLS
 mv $ANDROID_SDK_ROOT/cmdline-tools/cmdline-tools $ANDROID_SDK_ROOT/cmdline-tools/latest
 
-if [[ -f $ANDROID_HOME/platform-tools/platform-tools/adb ]]
+if [[ -d $ANDROID_HOME/platform-tools/platform-tools ]]
 then
 	# It appears that the platform-tools 29.0.6 are extracting into an incorrect path
 	mv $ANDROID_HOME/platform-tools/platform-tools/* $ANDROID_HOME/platform-tools
@@ -31,10 +31,10 @@ then
 	echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install 'platform-tools'  | tr '\r' '\n' | uniq
 	echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install 'build-tools;35.0.0' | tr '\r' '\n' | uniq
 	echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install 'platforms;android-28' | tr '\r' '\n' | uniq
-	echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install 'platforms;android-34' | tr '\r' '\n' | uniq
+	echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install 'platforms;android-35' | tr '\r' '\n' | uniq
 	echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install 'extras;android;m2repository' | tr '\r' '\n' | uniq
 fi
 
 # Build the sample, while the emulator is starting
 cd $UNO_UITEST_ANDROID_PROJECT
-dotnet publish -f net8.0-android -p:TargetFrameworkOverride=net8.0-android -c Release -p:RuntimeIdentifier=android-x64 /p:IsUiAutomationMappingEnabled=True /p:AndroidUseSharedRuntime=false /p:AotAssemblies=true /p:EmbedAssembliesIntoApk=true -bl:$BUILD_ARTIFACTSTAGINGDIRECTORY/android-app.binlog
+dotnet publish -f net9.0-android -p:TargetFrameworkOverride=net9.0-android -p:UseNativeRendering=true -c Release /p:AndroidPackageFormat=apk /p:RuntimeIdentifier=android-x64 /p:IsUiAutomationMappingEnabled=true /p:AndroidUseSharedRuntime=false /p:AndroidUseAssemblyStore=false /p:RunAOTCompilation=false /p:PublishTrimmed=false /p:AndroidStripILAfterAOT=false -bl:"$BUILD_ARTIFACTSTAGINGDIRECTORY/android-app.binlog"

build/scripts/android-uitest-run.sh

@@ -12,21 +12,53 @@ export UNO_UITEST_ANDROID_PROJECT=$BUILD_SOURCESDIRECTORY/Uno.Gallery
 export UNO_UITEST_BINARY=$BUILD_SOURCESDIRECTORY/Uno.Gallery.UITests/bin/Release/net47/Uno.Gallery.UITests.dll
 export UNO_EMULATOR_INSTALLED=$BUILD_SOURCESDIRECTORY/build/.emulator_started
 export UITEST_TEST_TIMEOUT=60m
-export UNO_UITEST_ANDROIDAPK_PATH=$UNO_UITEST_ANDROIDAPK_BASEPATH/com.nventive.uno.ui.demo-Signed.apk
-export ANDROID_SIMULATOR_APILEVEL=34
+
+# Prefer the signed APK from build artifacts (Windows job) when available,
+# otherwise fall back to the unsigned APK published locally by the UITest job (macOS agent).
+APK_FROM_ARTIFACT="$(ls "$UNO_UITEST_ANDROIDAPK_BASEPATH"/*.apk 2>/dev/null | head -n 1 || true)"
+APK_FROM_LOCAL="$(ls $BUILD_SOURCESDIRECTORY/Uno.Gallery/bin/Release/net9.0-android/android-x64/publish/*.apk 2>/dev/null | head -n 1 || true)"
+
+if [ -f "$APK_FROM_ARTIFACT" ]; then
+  export UNO_UITEST_ANDROIDAPK_PATH="$APK_FROM_ARTIFACT"
+elif [ -f "$APK_FROM_LOCAL" ]; then
+  export UNO_UITEST_ANDROIDAPK_PATH="$APK_FROM_LOCAL"
+else
+  echo "ERROR: APK not found (neither artifact nor local publish)."
+  exit 1
+fi
+
+echo "Using APK: $UNO_UITEST_ANDROIDAPK_PATH"
+
+# .NET 9 UITest workaround (maui#31072): ensure assemblies.blob exists inside the APK
+# UITest sometimes refuses to run if no assemblies store is present.
+# Related issue: https://github.com/dotnet/maui/issues/31072
+command -v zip >/dev/null || { echo "ERROR: 'zip' not found on PATH"; exit 1; }
+tmpdir="$(mktemp -d)"
+touch "$tmpdir/assemblies.blob"
+( cd "$tmpdir" && zip -q "$UNO_UITEST_ANDROIDAPK_PATH" assemblies.blob )
+rm -rf "$tmpdir"
+
+export ANDROID_SIMULATOR_APILEVEL=28
 
 AVD_NAME=xamarin_android_emulator
 AVD_CONFIG_FILE=~/.android/avd/$AVD_NAME.avd/config.ini
 
 # Override Android SDK tooling
 export ANDROID_HOME=$BUILD_SOURCESDIRECTORY/build/android-sdk
 export ANDROID_SDK_ROOT=$BUILD_SOURCESDIRECTORY/build/android-sdk
+export LATEST_CMDLINE_TOOLS_PATH=$ANDROID_SDK_ROOT/cmdline-tools/latest
 export CMDLINETOOLS=commandlinetools-mac-8512546_latest.zip
 mkdir -p $ANDROID_HOME
+
+if [ -d $LATEST_CMDLINE_TOOLS_PATH ];
+then
+	rm -rf $LATEST_CMDLINE_TOOLS_PATH
+fi
+
 wget https://dl.google.com/android/repository/$CMDLINETOOLS
 unzip $CMDLINETOOLS -d $ANDROID_HOME/cmdline-tools
 rm $CMDLINETOOLS
-mv $ANDROID_SDK_ROOT/cmdline-tools/cmdline-tools $ANDROID_SDK_ROOT/cmdline-tools/latest
+mv $ANDROID_SDK_ROOT/cmdline-tools/cmdline-tools $LATEST_CMDLINE_TOOLS_PATH
 
 if [[ -f $ANDROID_HOME/platform-tools/platform-tools/adb ]]
 then
@@ -36,21 +68,49 @@ fi
 
 AVD_NAME=xamarin_android_emulator
 AVD_CONFIG_FILE=~/.android/avd/$AVD_NAME.avd/config.ini
+EMU_UPDATE_FILE=~/.android/emu-update-last-check.ini
+SDK_MGR_TOOLS_FLAG=.sdk_toolkit_installed
+
+mkdir -p $UNO_UITEST_SCREENSHOT_PATH
+
+install_android_sdk() {
+	SIMULATOR_APILEVEL=$1
+
+	if [[ ! -f $SDK_MGR_TOOLS_FLAG ]];
+	then
+		touch $SDK_MGR_TOOLS_FLAG 
 
-# Install Android SDK emulators and SDKs
-if [ ! -f "$UNO_EMULATOR_INSTALLED" ];
+		echo "y" | $LATEST_CMDLINE_TOOLS_PATH/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install 'tools'| tr '\r' '\n' | uniq
+		echo "y" | $LATEST_CMDLINE_TOOLS_PATH/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install 'platform-tools'  | tr '\r' '\n' | uniq
+		echo "y" | $LATEST_CMDLINE_TOOLS_PATH/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install 'build-tools;35.0.0' | tr '\r' '\n' | uniq
+		echo "y" | $LATEST_CMDLINE_TOOLS_PATH/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install 'extras;android;m2repository' | tr '\r' '\n' | uniq
+	fi
+	
+	echo "y" | $LATEST_CMDLINE_TOOLS_PATH/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install "platforms;android-$SIMULATOR_APILEVEL" | tr '\r' '\n' | uniq
+	echo "y" | $LATEST_CMDLINE_TOOLS_PATH/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install "system-images;android-$SIMULATOR_APILEVEL;google_apis_playstore;x86_64" | tr '\r' '\n' | uniq
+}
+
+
+if [[ ! -f $EMU_UPDATE_FILE ]];
 then
-	echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install "tools"| tr '\r' '\n' | uniq
-	echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install "platform-tools"  | tr '\r' '\n' | uniq
-	echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install "build-tools;35.0.0" | tr '\r' '\n' | uniq
-	echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install "platforms;android-$ANDROID_SIMULATOR_APILEVEL" | tr '\r' '\n' | uniq
-	echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install "extras;android;m2repository" | tr '\r' '\n' | uniq
+	touch $EMU_UPDATE_FILE
+fi
 
+if [[ ! -f $AVD_CONFIG_FILE ]];
+then
 	# Install AVD files
-	echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install "system-images;android-$ANDROID_SIMULATOR_APILEVEL;google_apis;x86_64"
+	install_android_sdk $ANDROID_SIMULATOR_APILEVEL
+	install_android_sdk 34
+	install_android_sdk 35
+
+	if [[ -f $ANDROID_HOME/platform-tools/platform-tools/adb ]]
+	then
+		# It appears that the platform-tools 29.0.6 are extracting into an incorrect path
+		mv $ANDROID_HOME/platform-tools/platform-tools/* $ANDROID_HOME/platform-tools
+	fi
 
 	# Create emulator
-	echo "no" | $ANDROID_HOME/cmdline-tools/latest/bin/avdmanager create avd -n $AVD_NAME --abi "x86_64" -k "system-images;android-$ANDROID_SIMULATOR_APILEVEL;google_apis;x86_64"  --sdcard 128M --force
+	echo "no" | $LATEST_CMDLINE_TOOLS_PATH/bin/avdmanager create avd -n "$AVD_NAME" --abi "x86_64" -k "system-images;android-$ANDROID_SIMULATOR_APILEVEL;google_apis_playstore;x86_64" --sdcard 128M --force
 
 	# based on https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#hardware
 	# >> Agents that run macOS images are provisioned on Mac pros with a 3 core CPU, 14 GB of RAM, and 14 GB of SSD disk space.
@@ -59,27 +119,29 @@ then
 	# Bump the heap size as the tests are stressing the application
 	echo "vm.heapSize=256M" >> $AVD_CONFIG_FILE
 
-	echo $ANDROID_HOME/emulator/emulator -list-avds
+	$ANDROID_HOME/emulator/emulator -list-avds
+
+	echo "Checking for hardware acceleration"
+	$ANDROID_HOME/emulator/emulator -accel-check
 
 	echo "Starting emulator"
 
+	# kickstart ADB
+	$ANDROID_HOME/platform-tools/adb devices
+
 	# Start emulator in background
-	nohup $ANDROID_HOME/emulator/emulator \
-		-avd $AVD_NAME \
-		-skin 1280x800 \
-		-memory 4096 \
-		-no-window \
-		-gpu swiftshader_indirect \
-		-no-snapshot \
-		-noaudio \
-		-no-boot-anim \
-		-prop ro.debuggable=1 \
-		> $BUILD_ARTIFACTSTAGINGDIRECTORY/android-emulator-log.txt 2>&1 &
-
-	touch "$UNO_EMULATOR_INSTALLED"
-fi
+	nohup $ANDROID_HOME/emulator/emulator -avd "$AVD_NAME" -skin 1280x800 -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim > $UNO_UITEST_SCREENSHOT_PATH/android-emulator-log.txt 2>&1 &
 
-mkdir -p $UNO_UITEST_SCREENSHOT_PATH
+	# Wait for the emulator to finish booting
+	source $BUILD_SOURCESDIRECTORY/build/scripts/android-uitest-wait-systemui.sh 500
+
+else
+	# Restart the emulator to avoid running first-time tasks
+	$ANDROID_HOME/platform-tools/adb reboot
+
+	# Wait for the emulator to finish booting
+	source $BUILD_SOURCESDIRECTORY/build/scripts/android-uitest-wait-systemui.sh 500
+fi
 
 cp $UNO_UITEST_ANDROIDAPK_PATH $UNO_UITEST_SCREENSHOT_PATH
 

build/scripts/ios-uitest-build.sh

@@ -1,12 +1,9 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -euo pipefail
 IFS=$'\n\t'
 
 export UNO_UITEST_IOS_PROJECT=$BUILD_SOURCESDIRECTORY/Uno.Gallery
 
 cd $UNO_UITEST_IOS_PROJECT
 
-########
-# Warning using net8.0-ios is required because of xamarin.uitest not supporting net9
-########
-dotnet build -p:TargetFrameworkOverride=net8.0-ios -r iossimulator-x64 -c Release -p:IsUiAutomationMappingEnabled=True -bl:$BUILD_ARTIFACTSTAGINGDIRECTORY/ios-app.binlog
+dotnet build -f net9.0-ios -r iossimulator-x64 -p:TargetFrameworkOverride=net9.0-ios -c Release -p:UseNativeRendering=true -p:IsUiAutomationMappingEnabled=true -p:CodesignDisable=true -bl:$BUILD_ARTIFACTSTAGINGDIRECTORY/ios-app.binlog

build/scripts/ios-uitest-run.sh

@@ -9,10 +9,10 @@ export UNO_UITEST_LOGFILE=$BUILD_ARTIFACTSTAGINGDIRECTORY/screenshots/ios/nunit-
 export UNO_UITEST_IOS_PROJECT=$BUILD_SOURCESDIRECTORY/Uno.Gallery
 export UITEST_TEST_TIMEOUT=60m
 
-export UNO_UITEST_SIMULATOR_VERSION="com.apple.CoreSimulator.SimRuntime.iOS-17-5"
-export UNO_UITEST_SIMULATOR_NAME="iPad Pro (12.9-inch) (6th generation)"
+export UNO_UITEST_SIMULATOR_VERSION="com.apple.CoreSimulator.SimRuntime.iOS-18-4"
+export UNO_UITEST_SIMULATOR_NAME="iPad Pro 13-inch (M4)"
 
-echo "Lising iOS simulators"
+echo "Listing iOS simulators"
 xcrun simctl list devices --json
 
 echo "Starting simulator"
@@ -32,11 +32,11 @@ while true; do
 	export UITEST_IOSDEVICE_DATA_PATH=`xcrun simctl list -j | jq -r --arg sim "$UNO_UITEST_SIMULATOR_VERSION" --arg name "$UNO_UITEST_SIMULATOR_NAME" '.devices[$sim] | .[] | select(.name==$name) | .dataPath'`
 
 	if [ -n "$UITEST_IOSDEVICE_ID" ]; then
-		break
-	fi
+    break
+  fi
 
-	echo "Waiting for the simulator to be available"
-	sleep 5
+  echo "Waiting for the simulator to be available"
+  sleep 5
 done
 
 echo "Simulator Data Path: $UITEST_IOSDEVICE_DATA_PATH"
@@ -56,12 +56,31 @@ then
 	brew install idb-companion
 	pipx install fb-idb
 else
-	echo "Using idb from:" `command -v idb`
+  echo "Using idb from:" `command -v idb`
 fi
 
 echo "Booting the simulator"
+# Clean state, then boot and wait until the device is fully booted.
 xcrun simctl boot "$UITEST_IOSDEVICE_ID" || true
 
+# Try publish/, then non-publish, then the downloaded artifact
+if [ -z "${UNO_UITEST_IOSBUNDLE_PATH:-}" ]; then
+  echo "iOS app bundle path not found, trying publish"
+  UNO_UITEST_IOSBUNDLE_PATH="$(ls "$BUILD_SOURCESDIRECTORY/Uno.Gallery/bin/Release/net9.0-ios/iossimulator-x64/publish/"*.app 2>/dev/null | head -n 1)"
+fi
+if [ -z "${UNO_UITEST_IOSBUNDLE_PATH:-}" ]; then
+  echo "iOS app bundle (publish) not found, trying non-publish"
+  UNO_UITEST_IOSBUNDLE_PATH="$(ls "$BUILD_SOURCESDIRECTORY/Uno.Gallery/bin/Release/net9.0-ios/iossimulator-x64/"*.app 2>/dev/null | head -n 1)"
+fi
+if [ -z "${UNO_UITEST_IOSBUNDLE_PATH:-}" ]; then
+  echo "iOS app bundle (non-publish) not found, trying artifact download"
+  UNO_UITEST_IOSBUNDLE_PATH="$(ls "$PIPELINE_WORKSPACE/iOS_UITest/"*.app 2>/dev/null | head -n 1)"
+fi
+if [ -z "${UNO_UITEST_IOSBUNDLE_PATH:-}" ] || [ ! -d "$UNO_UITEST_IOSBUNDLE_PATH" ]; then
+  echo "ERROR: iOS app bundle not found in publish/, net9.0-ios/, or under \$PIPELINE_WORKSPACE/iOS_UITest"
+  exit 1
+fi
+
 echo "Installing the app"
 idb install --udid "$UITEST_IOSDEVICE_ID" "$UNO_UITEST_IOSBUNDLE_PATH"
 

build/scripts/wasm-uitest-build.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -euo pipefail
 IFS=$'\n\t'
 
@@ -8,3 +8,13 @@ export UNO_UITEST_WASM_PROJECT=$BUILD_SOURCESDIRECTORY/Uno.Gallery/Uno.Gallery.c
 cd $BUILD_SOURCESDIRECTORY
 
 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
+
+WASM_OUT="$BUILD_SOURCESDIRECTORY/Uno.Gallery/bin/Release/net9.0-browserwasm/publish"
+if [ ! -d "$WASM_OUT" ]; then
+  WASM_OUT="$BUILD_SOURCESDIRECTORY/Uno.Gallery/bin/Release/net9.0-browserwasm/publish"
+fi
+
+echo "Contents of WASM output folder:"
+ls -la "$BUILD_SOURCESDIRECTORY/Uno.Gallery/bin/Release/net9.0-browserwasm/publish"
+
+echo "##vso[task.setvariable variable=UNO_UITEST_WASM_OUTPUT_PATH]$WASM_OUT"

build/stage-build-wasm.yml

@@ -2,8 +2,6 @@
 - template: templates/gitversion.yml
 
 - template: templates/dotnet-install-linux.yml
-  parameters:
-    UnoCheckParameters: '--tfm net9.0-browserwasm'
 
 - template: templates/canary-updater.yml
 
@@ -15,7 +13,7 @@
   condition: always()
   retryCountOnTaskFailure: 3
   inputs:
-    PathtoPublish: '$(Agent.TempDirectory)/wasm-publish/wwwroot'
+    PathtoPublish: '$(Agent.TempDirectory)/wasm-publish'
     ArtifactName: $(ArtifactName)
 
 - task: PublishBuildArtifacts@1