ci: fix

.gitignore

@@ -328,3 +328,4 @@ ASALocalRun/
 
 # MFractors (Xamarin productivity tool) working folder 
 .mfractor/
+/src/nuget_override.props

build/workflow/scripts/ios-uitest-run.sh

@@ -15,34 +15,28 @@ export UNO_ORIGINAL_TEST_RESULTS=$BUILD_SOURCESDIRECTORY/build/TestResult-origin
 export UNO_TESTS_RESPONSE_FILE=$BUILD_SOURCESDIRECTORY/build/nunit.response
 export UNO_UITEST_SIMULATOR_VERSION="com.apple.CoreSimulator.SimRuntime.iOS-15-2"
 export UNO_UITEST_SIMULATOR_NAME="iPad Pro (12.9-inch) (4th generation)"
-export UITEST_IOSDEVICE_ID="721E80A8-8977-4290-B5C1-B5B5D0F5E8BF"
-
-echo "Listing iOS simulators"
-xcrun simctl list devices --json
-
-/Applications/Xcode_13.2.1.app/Contents/Developer/Applications/Simulator.app/Contents/MacOS/Simulator &
 
 cd $BUILD_SOURCESDIRECTORY
 
 mono '/Applications/Visual Studio.app/Contents/MonoBundle/MSBuild/Current/bin/MSBuild.dll' /m /r /p:Configuration=Release $UNO_UITEST_PROJECT
 mono '/Applications/Visual Studio.app/Contents/MonoBundle/MSBuild/Current/bin/MSBuild.dll' /m /r /p:Configuration=Release /p:Platform=iPhoneSimulator /p:UnoUIUseRoslynSourceGenerators=False /p:IsUiAutomationMappingEnabled=True /p:DisableNet6MobileTargets=True $UNO_UITEST_IOS_PROJECT 
 
-# echo "Current system date"
-# date
+echo "Current system date"
+date
 
-# echo "Listing iOS simulators"
-# xcrun simctl list devices --json
+echo "Listing iOS simulators"
+xcrun simctl list devices --json
 
-# ##
-# ## Pre-install the application to avoid https://github.com/microsoft/appcenter/issues/2389
-# ##
-# export SIMULATOR_ID=`xcrun simctl list -j | jq -r --arg sim "$UNO_UITEST_SIMULATOR_VERSION" --arg name "$UNO_UITEST_SIMULATOR_NAME" '.devices[$sim] | .[] | select(.name==$name) | .udid'`
+##
+## Pre-install the application to avoid https://github.com/microsoft/appcenter/issues/2389
+##
+export SIMULATOR_ID=`xcrun simctl list -j | jq -r --arg sim "$UNO_UITEST_SIMULATOR_VERSION" --arg name "$UNO_UITEST_SIMULATOR_NAME" '.devices[$sim] | .[] | select(.name==$name) | .udid'`
 
-# echo "Starting simulator: $SIMULATOR_ID ($UNO_UITEST_SIMULATOR_VERSION / $UNO_UITEST_SIMULATOR_NAME)"
-# xcrun simctl boot "$SIMULATOR_ID" || true
+echo "Starting simulator: $SIMULATOR_ID ($UNO_UITEST_SIMULATOR_VERSION / $UNO_UITEST_SIMULATOR_NAME)"
+xcrun simctl boot "$SIMULATOR_ID" || true
 
-# echo "Install app on simulator: $SIMULATOR_ID"
-# xcrun simctl install "$SIMULATOR_ID" "$UNO_UITEST_IOSBUNDLE_PATH" || true
+echo "Install app on simulator: $SIMULATOR_ID"
+xcrun simctl install "$SIMULATOR_ID" "$UNO_UITEST_IOSBUNDLE_PATH" || true
 
 cd $BUILD_SOURCESDIRECTORY/build
 

samples/Directory.Build.props

@@ -0,0 +1,5 @@
+<Project ToolsVersion="15.0">
+	<PropertyGroup>
+		<LangVersion>latest</LangVersion>
+	</PropertyGroup>
+</Project>

Directory.Build.props → src/Directory.Build.props

@@ -1,5 +1,4 @@
 <Project ToolsVersion="15.0">
-
 	<PropertyGroup>
 		<DebugType>portable</DebugType>
 		<DebugSymbols>True</DebugSymbols>

src/Uno.Toolkit.UITest/Constants.cs

@@ -9,11 +9,11 @@ namespace Uno.Toolkit.UITest
 {
 	public class Constants
 	{
-		public readonly static string WebAssemblyDefaultUri = "http://localhost:5000/";
-		public readonly static string iOSAppName = "com.nventive.Uno.Toolkit.Samples";
-		public readonly static string AndroidAppName = "Uno.Toolkit.Samples";
-		public readonly static string iOSDeviceNameOrId = "iPad Pro (12.9-inch) (5th generation)";
+        public readonly static string WebAssemblyDefaultUri = "http://localhost:59402/";
+        public readonly static string iOSAppName = "com.nventive.Uno.Toolkit.Samples";
+        public readonly static string AndroidAppName = "Uno.Toolkit.Samples";
+        public readonly static string iOSDeviceNameOrId = "iPad Pro (12.9-inch) (5th generation)";
 
-		public readonly static Platform CurrentPlatform = Platform.Browser;
+        public readonly static Platform CurrentPlatform = Platform.Android;
 	}
 }