Merge branch 'main' into attribute_super_convert_type_mass_smash_2

dotnet · Mar 12, 2022 · 1c36da1 · 1c36da1
2 parents f32651c + 2586aa1
commit 1c36da1
Show file tree

Hide file tree

Showing 12 changed files with 90 additions and 90 deletions.
diff --git a/src/CFNetwork/CFHTTPAuthentication.cs b/src/CFNetwork/CFHTTPAuthentication.cs
@@ -50,7 +50,7 @@ internal CFHTTPAuthentication (NativeHandle handle, bool owns)
 		public static CFHTTPAuthentication? CreateFromResponse (CFHTTPMessage response)
 		{
 			if (response is null)
-				throw new ArgumentNullException (nameof (response));
+				ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (response));
 
 			if (response.IsRequest)
 				throw new InvalidOperationException ();
@@ -77,7 +77,7 @@ public bool IsValid {
 		public bool AppliesToRequest (CFHTTPMessage request)
 		{
 			if (request is null)
-				throw new ArgumentNullException (nameof (request));
+				ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (request));
 
 			if (!request.IsRequest)
 				throw new InvalidOperationException ();

diff --git a/src/CFNetwork/CFHTTPMessage.cs b/src/CFNetwork/CFHTTPMessage.cs
@@ -89,9 +89,9 @@ public static CFHTTPMessage CreateEmpty (bool request)
 		public static CFHTTPMessage CreateRequest (CFUrl url, NSString method, Version? version)
 		{
 			if (url is null)
-				throw new ArgumentNullException (nameof (url));
+				ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (url));
 			if (method is null)
-				throw new ArgumentNullException (nameof (method));
+				ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (method));
 
 			var handle = CFHTTPMessageCreateRequest (
 				IntPtr.Zero, method.Handle, url.Handle, GetVersion (version));
@@ -106,7 +106,7 @@ public static CFHTTPMessage CreateRequest (Uri uri, string method)
 		public static CFHTTPMessage CreateRequest (Uri uri, string method, Version? version)
 		{
 			if (uri is null)
-				throw new ArgumentNullException (nameof (uri));
+				ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (uri));
 
 			// the method is obsolete, but EscapeDataString does not work the same way. We could get the components
 			// of the Uri and then EscapeDataString, but this might introduce bugs, so for now we will ignore the warning
@@ -200,15 +200,15 @@ public bool IsHeaderComplete {
 		public bool AppendBytes (byte[] bytes)
 		{
 			if (bytes is null)
-				throw new ArgumentNullException (nameof (bytes));
+				ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (bytes));
 
 			return CFHTTPMessageAppendBytes (Handle, bytes, bytes.Length);
 		}
 
 		public bool AppendBytes (byte[] bytes, nint count)
 		{
 			if (bytes is null)
-				throw new ArgumentNullException (nameof (bytes));
+				ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (bytes));
 
 			return CFHTTPMessageAppendBytes (Handle, bytes, count);
 		}
@@ -260,9 +260,9 @@ AuthenticationException GetException (CFStreamErrorHTTPAuthentication code)
 		public void ApplyCredentials (CFHTTPAuthentication auth, NetworkCredential credential)
 		{
 			if (auth is null)
-				throw new ArgumentNullException (nameof (auth));
+				ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (auth));
 			if (credential is null)
-				throw new ArgumentNullException (nameof (credential));
+				ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (credential));
 
 			if (auth.RequiresAccountDomain) {
 				ApplyCredentialDictionary (auth, credential);
@@ -348,9 +348,9 @@ public bool AddAuthentication (CFHTTPMessage failureResponse, NSString username,
 		                               bool forProxy)
 		{
 			if (username is null)
-				throw new ArgumentNullException (nameof (username));
+				ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (username));
 			if (password is null)
-				throw new ArgumentNullException (nameof (password));
+				ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (password));
 
 			return CFHTTPMessageAddAuthentication (
 				Handle, failureResponse.GetHandle (), username.Handle,
@@ -365,9 +365,9 @@ public bool AddAuthentication (CFHTTPMessage failureResponse, NSString username,
 		public void ApplyCredentialDictionary (CFHTTPAuthentication auth, NetworkCredential credential)
 		{
 			if (auth is null)
-				throw new ArgumentNullException (nameof (auth));
+				ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (auth));
 			if (credential is null)
-				throw new ArgumentNullException (nameof (credential));
+				ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (credential));
 
 			var length = credential.Domain is null ? 2 : 3;
 			var keys = new NSString [length];
@@ -407,7 +407,7 @@ extern static void CFHTTPMessageSetHeaderFieldValue (/* CFHTTPMessageRef __nonnu
 		public void SetHeaderFieldValue (string name, string value)
 		{
 			if (name is null)
-				throw new ArgumentNullException (nameof (name));
+				ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (name));
 
 			var nameHandle = CFString.CreateNative (name);
 			var valueHandle = CFString.CreateNative (value);
@@ -426,7 +426,7 @@ extern static void CFHTTPMessageSetBody (/* CFHTTPMessageRef __nonnull */ IntPtr
 		public void SetBody (byte[] buffer)
 		{
 			if (buffer is null)
-				throw new ArgumentNullException (nameof (buffer));
+				ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (buffer));
 
 			using (var data = new CFDataBuffer (buffer))
 				CFHTTPMessageSetBody (Handle, data.Handle);

diff --git a/src/CFNetwork/CFHTTPStream.cs b/src/CFNetwork/CFHTTPStream.cs
@@ -151,7 +151,7 @@ internal CFDictionary Proxy {
 		public void SetProxy (CFProxySettings proxySettings)
 		{
 			if (proxySettings is null)
-				throw new ArgumentNullException (nameof (proxySettings));
+				ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (proxySettings));
 
 			SetProperty (_Proxy, proxySettings.Dictionary);
 		}

diff --git a/tests/xharness/Jenkins/MakeTestTaskEnumerable.cs b/tests/xharness/Jenkins/MakeTestTaskEnumerable.cs
@@ -46,15 +46,17 @@ public IEnumerator<MakeTask> GetEnumerator ()
 			};
 			yield return runMacBindingProject;
 
-			var runDocsTests = new MakeTask (jenkins: jenkins, processManager: processManager) {
-				Platform = TestPlatform.All,
-				TestName = "Documentation",
-				Target = "wrench-docs",
-				WorkingDirectory = HarnessConfiguration.RootDirectory,
-				Ignored = !jenkins.IncludeDocs,
-				Timeout = TimeSpan.FromMinutes (45),
-			};
-			yield return runDocsTests;
+			// Documentation is broken due to https://github.com/xamarin/maccore/commit/e06c4fda779e5ab6d41116d59410d3871841b9a5
+			// Ref: https://github.com/xamarin/xamarin-macios/issues/14372
+			// var runDocsTests = new MakeTask (jenkins: jenkins, processManager: processManager) {
+			// 	Platform = TestPlatform.All,
+			// 	TestName = "Documentation",
+			// 	Target = "wrench-docs",
+			// 	WorkingDirectory = HarnessConfiguration.RootDirectory,
+			// 	Ignored = !jenkins.IncludeDocs,
+			// 	Timeout = TimeSpan.FromMinutes (45),
+			// };
+			// yield return runDocsTests;
 		}
 
 		IEnumerator IEnumerable.GetEnumerator () => GetEnumerator ();

diff --git a/tools/devops/automation/build-pipeline.yml b/tools/devops/automation/build-pipeline.yml
@@ -359,24 +359,23 @@ stages:
           parseLabels: false
 
 - ${{ if eq(parameters.runOldMacOSTests, true) }}:
-  - ${{ if and(ne(variables['Build.Reason'], 'Schedule'), or(eq(variables['Build.Reason'], 'IndividualCI'), eq(variables['Build.Reason'], 'Manual'))) }}:
-    - ${{ each config in parameters.macTestsConfigurations }}:
-      - template: templates/mac/stage.yml
-        parameters:
-          stageName: ${{ config.stageName }}
-          displayName: ${{ config.displayName }}
-          macPool: ${{ config.macPool }}
-          useImage: ${{ config.useImage }}
-          statusContext: ${{ config.statusContext }}
-          keyringPass: $(pass--lab--mac--builder--keychain)
-          demands: ${{ config.demands }}
-
-    - template: templates/windows/stage.yml
+  - ${{ each config in parameters.macTestsConfigurations }}:
+    - template: templates/mac/stage.yml
       parameters:
-        stageName: windows_integration
-        displayName: 'Windows Integration Tests'
-        pool: 'VSEng-Xamarin-Mac-Devices' # currently ignored until the VS team provides a real one
-        statusContext: 'Windows Integration Tests'
+        stageName: ${{ config.stageName }}
+        displayName: ${{ config.displayName }}
+        macPool: ${{ config.macPool }}
+        useImage: ${{ config.useImage }}
+        statusContext: ${{ config.statusContext }}
+        keyringPass: $(pass--lab--mac--builder--keychain)
+        demands: ${{ config.demands }}
+
+  - template: templates/windows/stage.yml
+    parameters:
+      stageName: windows_integration
+      displayName: 'Windows Integration Tests'
+      pool: 'VSEng-Xamarin-Mac-Devices' # currently ignored until the VS team provides a real one
+      statusContext: 'Windows Integration Tests'
 
 # iOS 32b tests are slow and do not have many machines, for that reason we are going just to run them in the Schedule builds.
 # This means we are going to get the translations AND the iOS 32b on those builds.

diff --git a/tools/devops/automation/scripts/GitHub.psm1 b/tools/devops/automation/scripts/GitHub.psm1
@@ -570,7 +570,7 @@ function New-GitHubSummaryComment {
     $sb.AppendLine("* [Azure DevOps]($vstsTargetUrl)")
     if ($Env:VSDROPS_INDEX) {
         # we did generate an index with the files in vsdrops
-        $sb.AppendLine("* [Html Report (VSDrops)]($Env:VSDROPS_INDEX) [Download]($Env:SYSTEM_TEAMFOUNDATIONCOLLECTIONURI$Env:SYSTEM_TEAMPROJECT/_apis/build/builds/$Env:BUILD_BUILDID/artifacts?artifactName=HtmlReport-sim&api-version=6.0&`$format=zip)")
+        $sb.AppendLine("* [Html Report (VSDrops)]($Env:VSDROPS_INDEX) [Download]($Env:SYSTEM_TEAMFOUNDATIONCOLLECTIONURI$Env:SYSTEM_TEAMPROJECT/_apis/build/builds/$Env:BUILD_BUILDID/artifacts?artifactName=HtmlReport-simulator&api-version=6.0&`$format=zip)")
     }
 
     if (-not $DeviceTest) {

diff --git a/tools/devops/automation/templates/build/build.yml b/tools/devops/automation/templates/build/build.yml
@@ -353,6 +353,35 @@ steps:
       GitHubToken: $(GitHub.Token)
       ArtifactDirectory: $(Build.SourcesDirectory)/package-internal
 
+  - bash: |
+      var=$(make -C $(Build.SourcesDirectory)/xamarin-macios/tools/devops print-variable VARIABLE=IOS_NUGET_VERSION_FULL)
+      IOS_NUGET_VERSION_FULL=${var#*=}
+      IOS_NUGET_VERSION_FULL=$(echo $IOS_NUGET_VERSION_FULL | cut -d "+" -f1)
+
+      var=$(make -C $(Build.SourcesDirectory)/xamarin-macios/tools/devops print-variable VARIABLE=TVOS_NUGET_VERSION_FULL)
+      TVOS_NUGET_VERSION_FULL=${var#*=}
+      TVOS_NUGET_VERSION_FULL=$(echo $TVOS_NUGET_VERSION_FULL | cut -d "+" -f1)
+
+      var=$(make -C $(Build.SourcesDirectory)/xamarin-macios/tools/devops print-variable VARIABLE=MACOS_NUGET_VERSION_FULL)
+      MACOS_NUGET_VERSION_FULL=${var#*=}
+      MACOS_NUGET_VERSION_FULL=$(echo $MACOS_NUGET_VERSION_FULL | cut -d "+" -f1)
+
+      var=$(make -C $(Build.SourcesDirectory)/xamarin-macios/tools/devops print-variable VARIABLE=MACCATALYST_NUGET_VERSION_FULL)
+      MACCATALYST_NUGET_VERSION_FULL=${var#*=}
+      MACCATALYST_NUGET_VERSION_FULL=$(echo $MACCATALYST_NUGET_VERSION_FULL | cut -d "+" -f1)
+      WORKLOAD_DST="$(Build.SourcesDirectory)/package-internal/WorkloadRollback.json"
+
+      echo "{" > $WORKLOAD_DST
+      echo "\"microsoft.net.sdk.ios\": \"$IOS_NUGET_VERSION_FULL\"," >>  $WORKLOAD_DST
+      echo "\"microsoft.net.sdk.tvos\": \"$TVOS_NUGET_VERSION_FULL\"," >> $WORKLOAD_DST
+      echo "\"microsoft.net.sdk.macos\": \"$MACOS_NUGET_VERSION_FULL\"," >>  $WORKLOAD_DST
+      echo "\"microsoft.net.sdk.maccatalyst\": \"$MACCATALYST_NUGET_VERSION_FULL\"" >> $WORKLOAD_DST
+      echo "}" >>  $WORKLOAD_DST
+
+      echo "Rollback file contents:" 
+      echo "$(cat $WORKLOAD_DST)"
+    displayName: 'Generate "WorkloadRollback.json'
+
   # upload each of the pkgs into the pipeline artifacts
   - task: PublishPipelineArtifact@1
     displayName: 'Publish Build Artifacts'

diff --git a/tools/devops/automation/templates/build/upload-vsdrops.yml b/tools/devops/automation/templates/build/upload-vsdrops.yml
@@ -16,10 +16,6 @@ steps:
   persistCredentials: true
   path: s/xamarin-macios
 
-- template: download-artifacts.yml 
-  parameters:
-    runTests: ${{ parameters.runTests }}
-
 # Upload the API diff to vsdrops to be able to locate it
 - task: ms-vscs-artifact.build-tasks.artifactDropTask-1.artifactDropTask@0
   displayName: 'Publish API diff to Artifact Services Drop'

diff --git a/tools/devops/automation/templates/common/upload-vsdrops.yml b/tools/devops/automation/templates/common/upload-vsdrops.yml
@@ -17,18 +17,16 @@ steps:
   persistCredentials: true
   path: s/xamarin-macios
 
-- ${{ if eq(parameters.provisioningFailed, 'False') }}:
-  - template: download-artifacts.yml 
-    parameters:
-      testPrefix: ${{ parameters.testPrefix }}
+- template: download-artifacts.yml 
+  parameters:
+    testPrefix: ${{ parameters.testPrefix }}
 
-  # Upload full report to vsdrops using the the build numer and id as uuids.
-  - task: ms-vscs-artifact.build-tasks.artifactDropTask-1.artifactDropTask@0
-    displayName: 'Publish to Artifact Services Drop'
-    inputs:
-      dropServiceURI: 'https://devdiv.artifacts.visualstudio.com/DefaultCollection'
-      dropMetadataContainerName: 'DropMetadata-${{ parameters.testPrefix }}'
-      buildNumber: 'xamarin-macios/device-tests/$(Build.BuildNumber)/$(Build.BuildId)/${{ parameters.testPrefix }}'
-      sourcePath: $(HTML_REPORT_PATH)
-      detailedLog: true
-      usePat: true 
+- task: ms-vscs-artifact.build-tasks.artifactDropTask-1.artifactDropTask@0
+  displayName: 'Publish to Artifact Services Drop'
+  inputs:
+    dropServiceURI: 'https://devdiv.artifacts.visualstudio.com/DefaultCollection'
+    dropMetadataContainerName: 'DropMetadata-${{ parameters.testPrefix }}'
+    buildNumber: 'xamarin-macios/device-tests/$(Build.BuildNumber)/$(Build.BuildId)/${{ parameters.testPrefix }}'
+    sourcePath: $(HTML_REPORT_PATH)
+    detailedLog: true
+    usePat: true 
diff --git a/tools/devops/automation/templates/mac/stage.yml b/tools/devops/automation/templates/mac/stage.yml
@@ -30,7 +30,7 @@ stages:
   dependsOn:
   - build_packages
   # we need to have the pkgs built and the device sets to be ran, that is decided via the labels or type of build during the build_packages stage
-  condition: and(succeeded(), eq(dependencies.build_packages.outputs['build.configuration.RunDeviceTests'], 'True'))
+  condition: succeeded()
 
   variables:
     MAC_TESTS_PRESENT: $[ dependencies.build_packages.outputs['macTestPkg.macTestsPresent'] ]

diff --git a/tools/devops/automation/templates/tests/build.yml b/tools/devops/automation/templates/tests/build.yml
@@ -113,7 +113,7 @@ steps:
 
 # download the artifacts.json, which will use to find the URI of the built pkg to later be installed by provisionator
 - task: DownloadPipelineArtifact@2
-  displayName: Download artifacts.json
+  displayName: Download json artifacts
   inputs:
     patterns: '**/*.json'
     allowFailedBuilds: true

diff --git a/tools/devops/automation/templates/tests/run-tests.yml b/tools/devops/automation/templates/tests/run-tests.yml
@@ -116,34 +116,10 @@ steps:
     DOTNET_NUPKG_DIR=${var#*=}
     echo "Using nuget dir $DOTNET_NUPKG_DIR"
 
-    echo "Build WorkloadRollback.json"
-    VERSIONS=""
-
-    var=$(make -C $(Build.SourcesDirectory)/xamarin-macios/tools/devops print-variable VARIABLE=IOS_NUGET_VERSION_FULL)
-    IOS_NUGET_VERSION_FULL=${var#*=}
-    IOS_NUGET_VERSION_FULL=$(echo $IOS_NUGET_VERSION_FULL | cut -d "+" -f1)
-
-    var=$(make -C $(Build.SourcesDirectory)/xamarin-macios/tools/devops print-variable VARIABLE=TVOS_NUGET_VERSION_FULL)
-    TVOS_NUGET_VERSION_FULL=${var#*=}
-    TVOS_NUGET_VERSION_FULL=$(echo $TVOS_NUGET_VERSION_FULL | cut -d "+" -f1)
-
-    var=$(make -C $(Build.SourcesDirectory)/xamarin-macios/tools/devops print-variable VARIABLE=MACOS_NUGET_VERSION_FULL)
-    MACOS_NUGET_VERSION_FULL=${var#*=}
-    MACOS_NUGET_VERSION_FULL=$(echo $MACOS_NUGET_VERSION_FULL | cut -d "+" -f1)
-
-    var=$(make -C $(Build.SourcesDirectory)/xamarin-macios/tools/devops print-variable VARIABLE=MACCATALYST_NUGET_VERSION_FULL)
-    MACCATALYST_NUGET_VERSION_FULL=${var#*=}
-    MACCATALYST_NUGET_VERSION_FULL=$(echo $MACCATALYST_NUGET_VERSION_FULL | cut -d "+" -f1)
-
-    echo "{" >  "WorkloadRollback.json"
-    echo "\"microsoft.net.sdk.ios\": \"$IOS_NUGET_VERSION_FULL\"," >>  "WorkloadRollback.json"
-    echo "\"microsoft.net.sdk.tvos\": \"$TVOS_NUGET_VERSION_FULL\"," >>  "WorkloadRollback.json"
-    echo "\"microsoft.net.sdk.macos\": \"$MACOS_NUGET_VERSION_FULL\"," >>  "WorkloadRollback.json"
-    echo "\"microsoft.net.sdk.maccatalyst\": \"$MACCATALYST_NUGET_VERSION_FULL\"" >>  "WorkloadRollback.json"
-    echo "}" >>  "WorkloadRollback.json"
+    ROLLBACK_PATH="$(Build.SourcesDirectory)/artifacts/package-internal/WorkloadRollback.json"
 
     echo "Rollback file contents:" 
-    echo "$(cat WorkloadRollback.json)"
+    echo "$(cat $ROLLBACK_PATH)"
 
     mkdir -p $DOTNET_NUPKG_DIR
     ls -R $(Build.SourcesDirectory)/artifacts/package
@@ -165,7 +141,7 @@ steps:
 
     rm global.json
     cp global6.json global.json
-    $DOTNET6 workload install --from-rollback-file WorkloadRollback.json --source $DOTNET_NUPKG_DIR $SOURCES --verbosity diag $PLATFORMS
+    $DOTNET6 workload install --from-rollback-file $ROLLBACK_PATH --source $DOTNET_NUPKG_DIR $SOURCES --verbosity diag $PLATFORMS
 
     var=$(make -C $(Build.SourcesDirectory)/xamarin-macios/tools/devops print-variable VARIABLE=DOTNET6_DIR)
     DOTNET6_DIR=${var#*=}