Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Chefs.UITests/Constants.cs
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Uno.UITest.Helpers.Queries;

namespace Chefs.UITests;

public class Constants
{
public readonly static string ApplicationId = "uno.platform.chefs.skia";
private const string DefaultApplicationId = "uno.platform.chefs.skia";
private const string AppIdEnvVar = "UNO_UITEST_APP_ID";

public readonly static string ApplicationId =
Environment.GetEnvironmentVariable(AppIdEnvVar) ?? DefaultApplicationId;

public readonly static string WebAssemblyDefaultUri = "http://localhost:51480/";
public readonly static string iOSAppName = ApplicationId;
Expand Down
7 changes: 5 additions & 2 deletions build/scripts/android-uitest-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ else
export APK_NAME="uno.platform.chefs.skia"
fi

export UNO_UITEST_APP_ID="$APK_NAME"

export BUILDCONFIGURATION=Release
export UNO_UITEST_PLATFORM=Android
export ANDROID_SIMULATOR_APILEVEL=28
export ANDROID_SIMULATOR_APILEVEL=34


export UNO_UITEST_ANDROID_PROJECT_PATH=$BUILD_SOURCESDIRECTORY/Chefs
Expand Down Expand Up @@ -96,7 +98,7 @@ install_android_sdk() {

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 'build-tools;36.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

Expand All @@ -115,6 +117,7 @@ then
install_android_sdk $ANDROID_SIMULATOR_APILEVEL
install_android_sdk 34
install_android_sdk 35
install_android_sdk 36

if [[ -f $ANDROID_HOME/platform-tools/platform-tools/adb ]]
then
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"msbuild-sdks": {
"Uno.Sdk": "6.4.53"
"Uno.Sdk": "6.5.29"
},
"sdk": {
"allowPrerelease": false
Expand Down
Loading