Merge branch 'main' into DeleteFilesAsync

xamarin · Dec 1, 2022 · 1347e87 · 1347e87
2 parents 7922472 + 84dd56c
commit 1347e87
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 2 deletions.
diff --git a/msbuild/Xamarin.MacDev.Tasks/Tasks/CompileAppManifestTaskBase.cs b/msbuild/Xamarin.MacDev.Tasks/Tasks/CompileAppManifestTaskBase.cs
@@ -247,8 +247,10 @@ bool SetMinimumOSVersion (PDictionary plist)
 			if (Platform == ApplePlatform.MacCatalyst && !string.IsNullOrEmpty (SupportedOSPlatformVersion)) {
 				// SupportedOSPlatformVersion is the iOS version for Mac Catalyst.
 				// But we need to store the macOS version in the app manifest, so convert it to the macOS version here.
-				if (!MacCatalystSupport.TryGetMacOSVersion (Sdks.GetAppleSdk (Platform).GetSdkPath (SdkVersion, false), SupportedOSPlatformVersion, out var convertedVersion, out var knowniOSVersions))
+				if (!MacCatalystSupport.TryGetMacOSVersion (Sdks.GetAppleSdk (Platform).GetSdkPath (SdkVersion, false), SupportedOSPlatformVersion, out var convertedVersion, out var knowniOSVersions)) {
 					Log.LogError (MSBStrings.E0188, SupportedOSPlatformVersion, string.Join (", ", knowniOSVersions));
+					return false;
+				}
 				convertedSupportedOSPlatformVersion = convertedVersion;
 			} else {
 				convertedSupportedOSPlatformVersion = SupportedOSPlatformVersion;
@@ -259,8 +261,10 @@ bool SetMinimumOSVersion (PDictionary plist)
 				var minimumiOSVersionInManifest = plist.Get<PString> (ManifestKeys.MinimumOSVersion)?.Value;
 				if (!string.IsNullOrEmpty (minimumiOSVersionInManifest)) {
 					// Convert to the macOS version
-					if (!MacCatalystSupport.TryGetMacOSVersion (Sdks.GetAppleSdk (Platform).GetSdkPath (SdkVersion, false), minimumiOSVersionInManifest!, out var convertedVersion, out var knowniOSVersions))
+					if (!MacCatalystSupport.TryGetMacOSVersion (Sdks.GetAppleSdk (Platform).GetSdkPath (SdkVersion, false), minimumiOSVersionInManifest!, out var convertedVersion, out var knowniOSVersions)) {
 						Log.LogError (MSBStrings.E0188, minimumiOSVersionInManifest, string.Join (", ", knowniOSVersions));
+						return false;
+					}
 					minimumOSVersionInManifest = convertedVersion;
 				}
 			}

diff --git a/tools/devops/automation/templates/build/api-diff-process-results.yml b/tools/devops/automation/templates/build/api-diff-process-results.yml
@@ -37,6 +37,13 @@ steps:
     gci env: | format-table -autosize -wrap
   displayName: 'Show Environment'
 
+- pwsh: |
+    if (Test-Path "$Env:SYSTEM_DEFAULTWORKINGDIRECTORY/Artifacts" -PathType Container) {
+      Remove-Item -Path "$Env:SYSTEM_DEFAULTWORKINGDIRECTORY/Artifacts" -Force -Recurse
+    }
+  displayName: "Remove artifacts"
+  condition: always()
+
 # Download the change detection artifact
 - task: DownloadPipelineArtifact@2
   displayName: 'Download change detection artifacts'

diff --git a/tools/devops/automation/templates/common/download-artifacts.yml b/tools/devops/automation/templates/common/download-artifacts.yml
@@ -11,6 +11,13 @@ parameters:
 
 steps:
 
+- pwsh: |
+    if (Test-Path "$Env:SYSTEM_DEFAULTWORKINGDIRECTORY/Reports" -PathType Container) {
+      Remove-Item -Path "$Env:SYSTEM_DEFAULTWORKINGDIRECTORY/Reports" -Force -Recurse
+    }
+  displayName: "Remove artifacts"
+  condition: always()
+
 - ${{ if eq(parameters.runTests, true) }}:
   # Download the Html Report that was added by the tests job.
   - task: DownloadPipelineArtifact@2

diff --git a/tools/devops/automation/templates/mac/build.yml b/tools/devops/automation/templates/mac/build.yml
@@ -128,6 +128,12 @@ steps:
   timeoutInMinutes: 30
   enabled: false
 
+- bash: |
+    sudo rm -Rf $(Build.SourcesDirectory)/package
+    sudo rm -Rf $(Build.SourcesDirectory)/artifacts
+  displayName: "Remove artifacts"
+  condition: always()
+
 - task: DownloadPipelineArtifact@2
   displayName: Download not notarized build
   inputs:

diff --git a/tools/devops/automation/templates/release/publish-nugets.yml b/tools/devops/automation/templates/release/publish-nugets.yml
@@ -18,6 +18,12 @@ steps:
     ${{ else }}:
       VAR_NAME: 'NUGET_PRIVATE_FEED'
 
+- bash: |
+    sudo rm -Rf $(Build.SourcesDirectory)/package
+    sudo rm -Rf $(Build.SourcesDirectory)/vsi-msi-nugets
+  displayName: "Remove artifacts"
+  condition: always()
+
 - task: DownloadPipelineArtifact@2
   inputs:
     artifactName: nuget-signed

diff --git a/tools/devops/automation/templates/sign-and-notarized/dotnet-signing.yml b/tools/devops/automation/templates/sign-and-notarized/dotnet-signing.yml
@@ -45,6 +45,11 @@ jobs:
       repositoryAlias: ${{ parameters.repositoryAlias }}
       commit: ${{ parameters.commit }}
 
+  - bash: |
+      sudo rm -Rf $(Build.SourcesDirectory)/package
+    displayName: "Remove artifacts"
+    condition: always()
+
   - task: DownloadPipelineArtifact@2
     displayName: Download not notarized build
     inputs:

diff --git a/tools/devops/automation/templates/sign-and-notarized/funnel.yml b/tools/devops/automation/templates/sign-and-notarized/funnel.yml
@@ -79,6 +79,13 @@ jobs:
   - checkout: release-scripts
     clean: true
 
+  - bash: |
+      sudo rm -Rf $(Build.SourcesDirectory)/package
+      sudo rm -Rf $(Build.SourcesDirectory)/classic-*-signed
+      sudo rm -Rf $(Build.SourcesDirectory)/package-internal
+    displayName: "Remove artifacts"
+    condition: always()
+
   - bash: |
       mkdir -p $(Build.SourcesDirectory)/package/notarized
     displayName: 'Create target directories.'

diff --git a/tools/devops/automation/templates/sign-and-notarized/sign-and-notarized.yml b/tools/devops/automation/templates/sign-and-notarized/sign-and-notarized.yml
@@ -42,6 +42,11 @@ steps:
   - ${{ each pair in step }}:
       ${{ pair.key }}: ${{ pair.value }}
 
+- bash: |
+    sudo rm -Rf $(Build.SourcesDirectory)/package
+  displayName: "Remove artifacts"
+  condition: always()
+
 - task: DownloadPipelineArtifact@2
   displayName: Download not notarized build
   inputs:

diff --git a/tools/devops/automation/templates/sign-and-notarized/upload-azure.yml b/tools/devops/automation/templates/sign-and-notarized/upload-azure.yml
@@ -37,6 +37,13 @@ steps:
 - checkout: yaml-templates
   clean: true
 
+- pwsh: |
+    if (Test-Path "$Env:SYSTEM_DEFAULTWORKINGDIRECTORY/artifacts" -PathType Container) {
+      Remove-Item -Path "$Env:BUILD_SOURCESDIRECTORY/artifacts" -Force -Recurse
+    }
+  displayName: "Remove artifacts"
+  condition: always()
+
 # Download the Html Report that was added by the tests job.
 - task: DownloadPipelineArtifact@2
   displayName: Download packages

diff --git a/tools/devops/automation/templates/tests/download-artifacts.yml b/tools/devops/automation/templates/tests/download-artifacts.yml
@@ -22,6 +22,13 @@ parameters:
 
 steps:
 
+- pwsh: |
+    if (Test-Path "$Env:SYSTEM_DEFAULTWORKINGDIRECTORY/Reports" -PathType Container) {
+      Remove-Item -Path "$Env:SYSTEM_DEFAULTWORKINGDIRECTORY/Reports" -Force -Recurse
+    }
+  displayName: "Remove artifacts"
+  condition: always()
+
 - ${{ if eq(parameters.runTests, true) }}:
   - ${{ if eq(parameters.downloadHtmlReport, true) }}:
     # Download the Html Report that was added by the tests job.