Merge branch 'dotnet:main' into enable-xamarinuitest-harish26

Author: HarishKumarSF4517

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -42,6 +42,7 @@ body:
       label: Version with bug
       description: In what version do you see this issue? Run `dotnet workload list` to find your version.
       options:
+        - 9.0.30 SR3
         - 9.0.22 SR2.2
         - 9.0.21 SR2.1
         - 9.0.14 SR1.4
@@ -158,6 +159,7 @@ body:
         - 9.0.14 SR1.4
         - 9.0.21 SR2.1
         - 9.0.22 SR2.2
+        - 9.0.30 SR3
     validations:
       required: true
   - type: dropdown

SECURITY.md renamed to .github/SECURITY.md

@@ -1,20 +1,24 @@
-<!-- BEGIN MICROSOFT SECURITY.MD V0.0.1 BLOCK -->
+<!-- BEGIN MICROSOFT SECURITY.MD V0.0.9 BLOCK -->
 
 ## Security
 
-Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [many more](https://opensource.microsoft.com/).
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet) and [Xamarin](https://github.com/xamarin).
 
-If you believe you have found a security vulnerability in any Microsoft-owned repository that meets Microsoft's [definition](https://docs.microsoft.com/en-us/previous-versions/tn-archive/cc751383(v=technet.10)) of a security vulnerability, please report it to us as described below.
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/security.md/definition), please report it to us as described below.
 
 ## Reporting Security Issues
 
-**Please do not report security vulnerabilities through public GitHub issues.** Instead, please report them to the Microsoft Security Response Center at [[email protected]](mailto:[email protected]).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://technet.microsoft.com/en-us/security/dn606155).
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/security.md/msrc/create-report).
+
+If you prefer to submit without logging in, send email to [[email protected]](mailto:[email protected]).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/security.md/msrc/pgp).
 
 You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc). 
 
 Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
 
-  * Type of issue (e.g., buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
   * Full paths of source file(s) related to the manifestation of the issue
   * The location of the affected source code (tag/branch/commit or direct URL)
   * Any special configuration required to reproduce the issue
@@ -24,14 +28,14 @@ Please include the requested information listed below (as much as you can provid
 
 This information will help us triage your report more quickly.
 
-Reports via MSRC may qualify for the .NET Core Bug Bounty. Details of the .NET Core Bug Bounty including terms and conditions are at https://aka.ms/corebounty.
- 
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/security.md/msrc/bounty) page for more details about our active programs.
+
 ## Preferred Languages
 
 We prefer all communications to be in English.
 
 ## Policy
 
-Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://www.microsoft.com/en-us/msrc/cvd).
+Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/security.md/cvd).
 
-<!-- END MICROSOFT SECURITY.MD BLOCK -->
+<!-- END MICROSOFT SECURITY.MD BLOCK -->

eng/Versions.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <MajorVersion>9</MajorVersion>
     <MinorVersion>0</MinorVersion>
-    <PatchVersion>30</PatchVersion>
+    <PatchVersion>40</PatchVersion>
     <SdkBandVersion>9.0.100</SdkBandVersion>
     <PreReleaseVersionLabel>ci.main</PreReleaseVersionLabel>
     <PreReleaseVersionIteration>

eng/cake/dotnet.cake

@@ -229,25 +229,6 @@ Task("uitests-apphost")
         RunMSBuildWithDotNet("./src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj", properties, binlogPrefix: "uitests-apphost-");
     });
 
-Task("dotnet-legacy-controlgallery")
-    .IsDependentOn("dotnet-legacy-controlgallery-android")
-    .IsDependentOn("dotnet-legacy-controlgallery-ios");
-
-Task("dotnet-legacy-controlgallery-ios")
-    .Does(() =>
-    {
-        var properties = new Dictionary<string, string>();
-        properties.Add("RuntimeIdentifier","iossimulator-x64");
-        RunMSBuildWithDotNet("./src/Compatibility/ControlGallery/src/iOS/Compatibility.ControlGallery.iOS.csproj", properties, binlogPrefix: "controlgallery-ios-");
-    });
-
-Task("dotnet-legacy-controlgallery-android")
-    .Does(() =>
-    {
-        var properties = new Dictionary<string, string>();
-        RunMSBuildWithDotNet("./src/Compatibility/ControlGallery/src/Android/Compatibility.ControlGallery.Android.csproj", properties, binlogPrefix: "controlgallery-android-");
-    });
-
 Task("dotnet-integration-build")
     .Does(() =>
     {

eng/devices/android.cake

@@ -115,13 +115,6 @@ Task("uitest")
 		ExecuteUITests(projectPath, testAppProjectPath, testAppPackageName, testDevice, testResultsPath, binlogDirectory, configuration, targetFramework, "", androidVersion, dotnetToolPath, testAppInstrumentation);
 	});
 
-Task("cg-uitest")
-	.IsDependentOn("dotnet-buildtasks")
-	.Does(() =>
-	{
-		ExecuteCGLegacyUITests(projectPath, testAppProjectPath, testAppPackageName, testDevice, testResultsPath, configuration, targetFramework, dotnetToolPath, testAppInstrumentation);
-	});
-
 Task("logcat")
 	.Does(() =>
 {
@@ -130,43 +123,6 @@ Task("logcat")
 
 RunTarget(TARGET);
 
-void ExecuteCGLegacyUITests(string project, string appProject, string appPackageName, string device, string resultsDir, string config, string tfm, string toolPath, string instrumentation)
-{
-	CleanDirectories(resultsDir);
-
-	Information("Starting Compatibility Gallery UI Tests...");
-
-	var testApp = GetTestApplications(appProject, device, config, tfm, "").FirstOrDefault();
-
-	if (string.IsNullOrEmpty(appPackageName))
-	{
-		var appFile = new FilePath(testApp);
-		appFile = appFile.GetFilenameWithoutExtension();
-		appPackageName = appFile.FullPath.Replace("-Signed", "");
-	}
-
-	Information($"Testing Device: {device}");
-	Information($"Testing App Project: {appProject}");
-	Information($"Testing App: {testApp}");
-	Information($"Testing App Package Name: {appPackageName}");
-	Information($"Results Directory: {resultsDir}");
-
-	InstallApk(testApp, appPackageName, resultsDir, deviceSkin);
-
-	//set env var for the app path for Xamarin.UITest setup
-	SetEnvironmentVariable("ANDROID_APP", $"{testApp}");
-
-	var resultName = $"{System.IO.Path.GetFileNameWithoutExtension(project)}-{config}-{DateTime.UtcNow.ToFileTimeUtc()}";
-	Information("Run UITests project {0}", resultName);
-	RunTestWithLocalDotNet(
-		project,
-		config: config,
-		pathDotnet: toolPath,
-		noBuild: false,
-		resultsFileNameWithoutExtension: resultName,
-		filter: Argument("filter", ""));
-}
-
 void ExecuteBuild(string project, string device, string binDir, string config, string tfm, string toolPath)
 {
 	var projectName = System.IO.Path.GetFileNameWithoutExtension(project);

eng/devices/devices-shared.cake

@@ -12,8 +12,6 @@ var projectMappings = new Dictionary<string, string>
     ["MauiBlazorWebView.DeviceTests"] = "MauiBlazorWebView.DeviceTests",
     ["Essentials.DeviceTests"] = "Essentials.DeviceTests",
     ["Controls.TestCases.HostApp"] = "Controls.TestCases.HostApp",
-    ["Compatibility.ControlGallery.iOS"] = "Compatibility.ControlGallery.iOS",
-    ["Compatibility.ControlGallery.Android"] = "Compatibility.ControlGallery.Android",
 };
 
 string TARGET = Argument("target", "Test");
@@ -29,12 +27,6 @@ if (TARGET.StartsWith("uitest", StringComparison.OrdinalIgnoreCase))
     DEFAULT_APP_PROJECT = "../../src/Controls/tests/TestCases.HostApp/Controls.TestCases.HostApp.csproj";
 }
 
-if (string.Equals(TARGET, "cg-uitest", StringComparison.OrdinalIgnoreCase))
-{
-    DEFAULT_PROJECT = "../../src/Compatibility/ControlGallery/test/iOS.UITests/Compatibility.ControlGallery.iOS.UITests.csproj";
-    DEFAULT_APP_PROJECT = "../../src/Compatibility/ControlGallery/src/iOS/Compatibility.ControlGallery.iOS.csproj";
-}
-
 IEnumerable<string> GetTestApplications(string project, string device, string config, string tfm, string rid)
 {
     const string binDirBase = "bin";

eng/devices/ios.cake

@@ -113,13 +113,6 @@ Task("uitest")
 		ExecuteUITests(projectPath, testAppProjectPath, testDevice, testResultsPath, binlogDirectory, configuration, targetFramework, runtimeIdentifier, iosVersion, dotnetToolPath);
 	});
 
-Task("cg-uitest")
-	.IsDependentOn("dotnet-buildtasks")
-	.Does(() =>
-	{
-		ExecuteCGLegacyUITests(projectPath, testAppProjectPath, testDevice, testResultsPath, configuration, targetFramework, runtimeIdentifier, iosVersion, dotnetToolPath);
-	});
-
 RunTarget(TARGET);
 
 void ExecuteBuild(string project, string device, string binDir, string config, string rid, string tfm, string toolPath)
@@ -295,54 +288,6 @@ void ExecuteBuildUITestApp(string appProject, string device, string binDir, stri
 	Information("UI Test app build completed.");
 }
 
-void ExecuteCGLegacyUITests(string project, string appProject, string device, string resultsDir, string config, string tfm, string rid, string iosVersion, string toolPath)
-{
-	Information("Starting Compatibility Gallery UI Tests...");
-
-	CleanDirectories(resultsDir);
-
-	Information("Starting Compatibility Gallery UI Tests...");
-	
-	var testApp = GetTestApplications(appProject, device, config, tfm, rid).FirstOrDefault();
-
-	Information($"Testing Device: {device}");
-	Information($"Testing App Project: {appProject}");
-	Information($"Testing App: {testApp}");
-	Information($"Results Directory: {resultsDir}");
-
-	InstallIpa(testApp, "com.microsoft.mauicompatibilitygallery", device, $"{resultsDir}/ios", iosVersion, toolPath);
-
-	// For non-CI builds we assume that this is configured correctly on your machine
-	if (IsCIBuild())
-	{
-		// Install IDB (and prerequisites)
-		StartProcess("brew", "tap facebook/fb");
-		StartProcess("brew", "install idb-companion");
-		StartProcess("pip3", "install --user fb-idb");
-
-		// Create a temporary script file to hold the inline Bash script
-		var makeSymLinkScript = "./temp_script.sh";
-		// Below is an attempt to somewhat dynamically determine the path to idb and make a symlink to /usr/local/bin this is needed in order for Xamarin.UITest to find it
-		System.IO.File.AppendAllLines(makeSymLinkScript, new[] { "sudo ln -s $(find /Users/$(whoami)/Library/Python/?.*/bin -name idb | head -1) /usr/local/bin" });
-
-		StartProcess("bash", makeSymLinkScript);
-		System.IO.File.Delete(makeSymLinkScript);
-	}
-
-	//set env var for the app path for Xamarin.UITest setup
-	SetEnvironmentVariable("iOS_APP", $"{testApp}");
-
-	var resultName = $"{System.IO.Path.GetFileNameWithoutExtension(project)}-{config}-{DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss")}";
-	Information("Run UITests project {0}", resultName);
-	RunTestWithLocalDotNet(
-		project,
-		config: config,
-		pathDotnet: toolPath,
-		noBuild: false,
-		resultsFileNameWithoutExtension: resultName,
-		filter: Argument("filter", ""));
-}
-
 // Helper methods
 
 void PerformCleanupIfNeeded(bool cleanupEnabled, bool createDeviceLogs)

eng/pipelines/azure-pipelines-internal.yml

@@ -18,7 +18,6 @@ trigger:
     - LICENSE.TXT
     - PATENTS.TXT
     - README.md
-    - SECURITY.md
     - THIRD-PARTY-NOTICES.TXT
 
 schedules:

eng/pipelines/common/setup-jdk.yml

@@ -1,12 +1,25 @@
 parameters:
-  jdkFolder: $(JAVA_HOME_17_X64)
+  jdkFolder: '$(JAVA_HOME_17_X64)'
   jdkMajorVersion: 17
 
 steps:
 # Setup JDK Paths (gradle needs it)
 - bash: |
-    echo "##vso[task.setvariable variable=JI_JAVA_HOME]${{ parameters.jdkFolder }}"
-    echo "##vso[task.setvariable variable=JAVA_HOME]${{ parameters.jdkFolder }}"
+    if [ -n "${{ parameters.jdkFolder }}" ]; then
+      jdkPath="${{ parameters.jdkFolder }}"
+      echo "Using provided JDK folder: $jdkPath"
+    else
+      jdkPath=$(/usr/libexec/java_home -V 2>&1 | grep -E "${{ parameters.jdkMajorVersion }}.jdk" | head -n 1 | awk '{print $NF}')
+      if [ -n "$jdkPath" ]; then
+        echo "Found JDK path: $jdkPath"
+      else
+        echo "Unable to find JDK ${{ parameters.jdkMajorVersion }}"
+        exit 1
+      fi
+    fi
+    echo "##vso[task.setvariable variable=JI_JAVA_HOME]$jdkPath"
+    echo "##vso[task.setvariable variable=JAVA_HOME]$jdkPath"
+    echo "JAVA_HOME set to '$jdkPath'"
   displayName: Setup JDK ${{ parameters.jdkMajorVersion }} Paths
   condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
 
@@ -24,6 +37,7 @@ steps:
       echo "JAVA_HOME set to '$env:JAVA_HOME'"
     } else {
       echo "Unable to set JAVA_HOME"
+      exit 1
     }
   displayName: Setup JDK ${{ parameters.jdkMajorVersion }} Paths
   condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))