diff --git a/Directory.Build.props b/Directory.Build.props index 342cb55fb..a6a592e98 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -11,9 +11,6 @@ PRI257: Ignore default language (en) not being one of the included resources (eg en-us, en-uk) --> $(NoWarn);NU1507;NETSDK1201;PRI257 - - 2.88.9-preview.2.2 - 9.1.0-dev.41 diff --git a/Directory.Packages.props b/Directory.Packages.props index 4f8ea937b..7c0e678d6 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -13,7 +13,7 @@ - + diff --git a/Uno.Gallery/Platforms/WebAssembly/aot.profile b/Uno.Gallery/Platforms/WebAssembly/aot.profile index 2b9c6cbde..ad04e6f0f 100644 Binary files a/Uno.Gallery/Platforms/WebAssembly/aot.profile and b/Uno.Gallery/Platforms/WebAssembly/aot.profile differ diff --git a/Uno.Gallery/Uno.Gallery.csproj b/Uno.Gallery/Uno.Gallery.csproj index 04e156fb3..2d6b126ac 100644 --- a/Uno.Gallery/Uno.Gallery.csproj +++ b/Uno.Gallery/Uno.Gallery.csproj @@ -190,4 +190,13 @@ <_WasmLinkStepArgs Include="@(_EmccLinkStepArgs)" /> + + + + + false + true + + + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 51f7b6a49..ffb537111 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -218,8 +218,9 @@ stages: jobs: - template: build/stage-uitests-ios.yml -- stage: Android_Tests - displayName: 'Android Tests' - dependsOn: [] - jobs: - - template: build/stage-uitests-android.yml +# Disable for System.UI kept in front +# - stage: Android_Tests +# displayName: 'Android Tests' +# dependsOn: [] +# jobs: +# - template: build/stage-uitests-android.yml diff --git a/build/scripts/android-uitest-build.sh b/build/scripts/android-uitest-build.sh index 3491aea79..ff9547f89 100644 --- a/build/scripts/android-uitest-build.sh +++ b/build/scripts/android-uitest-build.sh @@ -37,4 +37,4 @@ 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=false -bl:$BUILD_ARTIFACTSTAGINGDIRECTORY/android-app.binlog +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 diff --git a/build/scripts/android-uitest-run.sh b/build/scripts/android-uitest-run.sh index 42089abd0..2ccb5e879 100644 --- a/build/scripts/android-uitest-run.sh +++ b/build/scripts/android-uitest-run.sh @@ -13,7 +13,7 @@ export UNO_UITEST_BINARY=$BUILD_SOURCESDIRECTORY/Uno.Gallery.UITests/bin/Release 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=28 +export ANDROID_SIMULATOR_APILEVEL=34 AVD_NAME=xamarin_android_emulator AVD_CONFIG_FILE=~/.android/avd/$AVD_NAME.avd/config.ini @@ -47,10 +47,10 @@ then echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install "extras;android;m2repository" | tr '\r' '\n' | uniq # 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_playstore;x86_64" + echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install "system-images;android-$ANDROID_SIMULATOR_APILEVEL;google_apis;x86_64" # 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_playstore;x86_64" --sdcard 128M --force + 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 # 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. diff --git a/build/scripts/ios-uitest-build.sh b/build/scripts/ios-uitest-build.sh index 6090d149d..60bc2f2f7 100644 --- a/build/scripts/ios-uitest-build.sh +++ b/build/scripts/ios-uitest-build.sh @@ -5,4 +5,4 @@ IFS=$'\n\t' export UNO_UITEST_IOS_PROJECT=$BUILD_SOURCESDIRECTORY/Uno.Gallery cd $UNO_UITEST_IOS_PROJECT -dotnet build -p:TargetFrameworkOverride=net9.0-ios -r iossimulator-x64 -c Release -p:IsUiAutomationMappingEnabled=True -bl:$BUILD_ARTIFACTSTAGINGDIRECTORY/ios-app.binlog +dotnet build -p:TargetFrameworkOverride=net8.0-ios -r iossimulator-x64 -c Release -p:IsUiAutomationMappingEnabled=True -bl:$BUILD_ARTIFACTSTAGINGDIRECTORY/ios-app.binlog diff --git a/build/stage-uitests-ios.yml b/build/stage-uitests-ios.yml index 82089da45..34c52635c 100644 --- a/build/stage-uitests-ios.yml +++ b/build/stage-uitests-ios.yml @@ -14,7 +14,7 @@ - template: templates/dotnet-install-mac.yml parameters: - UnoCheckParameters: '--tfm net9.0-ios' + UnoCheckParameters: '--tfm net8.0-ios' - template: templates/xcode-select.yml parameters: @@ -33,7 +33,7 @@ - task: CopyFiles@2 displayName: Copy Build Output inputs: - SourceFolder: $(build.sourcesdirectory)/Uno.Gallery/bin/Release/net9.0-ios/iossimulator-x64/Uno.Gallery.app + SourceFolder: $(build.sourcesdirectory)/Uno.Gallery/bin/Release/net8.0-ios/iossimulator-x64/Uno.Gallery.app Contents: '**' TargetFolder: $(Build.ArtifactStagingDirectory)/Uno.Gallery.app diff --git a/global.json b/global.json index 1eee6682e..1ccc241e8 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": "5.6.0-dev.130" + "Uno.Sdk": "5.6.20" } }