Switch Publishing Profiles from maccore to SecureFiles

Make.config

@@ -306,7 +306,6 @@ MONO_PATH=$(TOP)/external/mono
 XAMARIN_MACDEV_PATH=$(TOP)/external/Xamarin.MacDev
 MONOTOUCH_DIALOG_PATH=$(TOP)/external/MonoTouch.Dialog
 API_TOOLS_PATH=$(TOP)/external/api-tools
-MACCORE_PATH=$(TOP)/../maccore
 ADR_PATH:=$(abspath $(TOP)/../macios-adr)
 
 MONO_PREFIX ?= /Library/Frameworks/Mono.framework/Versions/Current
@@ -329,10 +328,6 @@ PRODUCT_KEY_PATH?=$(TOP)/product.snk
 
 include $(TOP)/mk/quiet.mk
 
-ifdef ENABLE_XAMARIN
--include $(MACCORE_PATH)/Make.config
-endif
-
 JENKINS_RESULTS_DIRECTORY ?= $(abspath $(TOP)/jenkins-results)
 
 # Clone files instead of copying them on APFS file systems. Much faster.

create-make-config.sh

@@ -33,10 +33,4 @@ if which ccache > /dev/null 2>&1; then
 	echo "Found ccache on the system, enabling it"
 fi
 
-# Detect maccore / xamarin
-if test -d ../maccore; then
-	printf "ENABLE_XAMARIN=1\n" >> "$OUTPUT_FILE"
-	echo "Detected the maccore repository, automatically enabled the Xamarin build"
-fi
-
 mv "$OUTPUT_FILE" "$OUTPUT"

mk/xamarin.mk

@@ -7,15 +7,6 @@ MONO_BRANCH    := $(shell cd $(MONO_PATH) 2> /dev/null && git symbolic-ref --sho
 endif
 
 ifdef ENABLE_XAMARIN
-NEEDED_MACCORE_VERSION := 5805eb9adacd8f2aeb2852ffbc78b24fb4a43866
-NEEDED_MACCORE_BRANCH := main
-
-MACCORE_DIRECTORY := maccore
-MACCORE_MODULE    := [email protected]:xamarin/maccore.git
-MACCORE_VERSION   := $(shell cd $(MACCORE_PATH) 2> /dev/null && git rev-parse HEAD 2> /dev/null)
-MACCORE_BRANCH    := $(shell cd $(MACCORE_PATH) 2> /dev/null && git symbolic-ref --short HEAD 2> /dev/null)
-
-
 NEEDED_ADR_VERSION := adccd1c48a7c2540b0c37f2bf7add7d2c1398729
 NEEDED_ADR_BRANCH := main
 
@@ -109,13 +100,10 @@ endif
 
 ifdef ENABLE_XAMARIN
 $(MACCORE_PATH):
-	$(Q) git clone --recursive $(MACCORE_MODULE) $(MACCORE_PATH)
-	$(Q) $(MAKE) reset-maccore
 
 $(ADR_PATH):
 	$(Q) git clone --recursive $(ADR_MODULE) $(ADR_PATH)
 	$(Q) $(MAKE) reset-adr
 
-$(eval $(call CheckVersionTemplate,maccore,MACCORE))
 $(eval $(call CheckVersionTemplate,macios-adr,ADR))
 endif

tools/devops/automation/build-cronjob.yml

@@ -32,12 +32,6 @@ resources:
     ref: refs/heads/main
     endpoint: xamarin
 
-  - repository: maccore
-    type: github
-    name: xamarin/maccore
-    ref: refs/heads/main
-    endpoint: xamarin
-
 trigger:
 - main
 

tools/devops/automation/build-lego.yml

@@ -26,12 +26,6 @@ resources:
     ref: refs/heads/main
     endpoint: xamarin
 
-  - repository: maccore
-    type: github
-    name: xamarin/maccore
-    ref: refs/heads/main
-    endpoint: xamarin
-
 trigger:
   branches:
     include:

tools/devops/automation/build-pipeline.yml

@@ -129,12 +129,6 @@ resources:
       ref: refs/heads/main
       endpoint: xamarin
 
-    - repository: maccore
-      type: github
-      name: xamarin/maccore
-      ref: refs/heads/main
-      endpoint: xamarin
-
     - repository: macios-adr
       type: git
       name: macios-adr
@@ -205,10 +199,11 @@ extends:
       sourceRepositoriesToScan:
         runInSingleJob: true  # run both maccore and macios in the same job
         include:
-          - repository: maccore
+          - repository: self
+            path: xamarin-macios
         exclude:
           - repository: yaml-templates
-          - repository: macios-adr # macios-adr has it's own build pipeline and should not be included in the source analysis
+          - repository: macios-adr  # macios-adr has it's own build pipeline and should not be included in the source analysis
     stages:
       - template: templates/main-stage.yml
         parameters:

tools/devops/automation/build-pull-request.yml

@@ -120,12 +120,6 @@ resources:
     ref: refs/heads/main
     endpoint: xamarin
 
-  - repository: maccore
-    type: github
-    name: xamarin/maccore
-    ref: refs/heads/main
-    endpoint: xamarin
-
   - repository: macios-adr
     type: git
     name: macios-adr
@@ -191,12 +185,15 @@ extends:
         enabled: false  # we run our on sbom generation
       credscan:
         suppressionsFile: '$(System.DefaultWorkingDirectory)/$(BUILD_REPOSITORY_TITLE)/tools/devops/governance/CredScanSuppressions.json'
+        debugMode: true
+        verboseOutput: true
       policheck:
         exclusionsFile: '$(System.DefaultWorkingDirectory)/$(BUILD_REPOSITORY_TITLE)/tools/devops/governance/PoliCheckExclusions.xml'
       sourceRepositoriesToScan:
         runInSingleJob: true # run both maccore and macios in the same job
         include:
-        - repository: maccore
+        - repository: self
+          path: xamarin-macios        
         exclude:
         - repository: yaml-templates
         - repository: macios-adr # macios-adr has it's own build pipeline and should not be included in the source analysis

tools/devops/automation/publish-pr-html-results.yml

@@ -17,18 +17,6 @@ resources:
     ref: refs/heads/main
     endpoint: xamarin
 
-  - repository: maccore
-    type: github
-    name: xamarin/maccore
-    ref: refs/heads/main
-    endpoint: xamarin
-
-  - repository: macios.ci
-    type: github
-    name: xamarin/macios.ci
-    ref: refs/heads/main # get main and create the branch from main
-    endpoint: xamarin
-
   # we need all stages to be completed, else we do not have the test results, this trigger is just for CI, because we have
   # but because we have device issues, and it needs to be gree to trigger, we will deal with it later
   pipelines:

tools/devops/automation/run-post-ci-build-vs-insertion.yml

@@ -72,7 +72,8 @@ extends:
       sourceRepositoriesToScan:
         runInSingleJob: true  # run both maccore and macios in the same job
         include:
-          - repository: maccore
+          - repository: self
+            path: xamarin-macios        
         exclude:
           - repository: yaml-templates
           - repository: macios-adr # macios-adr has it's own build pipeline and should not be included in the source analysis

tools/devops/automation/scripts/GitHub.psm1

@@ -292,9 +292,9 @@ class GitHubComments {
         }
 
         if ([string]::IsNullOrEmpty($Env:PR_ID)) {
-            $prefix = "[CI Build]"
+            $prefix = "[CI Build #$($this.Hash.Substring(0,7))]"
         } else {
-            $prefix = "[PR Build]"
+            $prefix = "[PR Build #$($this.Hash.Substring(0,7))]"
         }
 
         $stringBuilder.AppendLine("# $commentEmoji $prefix $commentTitle $commentEmoji")

tools/devops/automation/scripts/bash/install-workloads.sh

@@ -21,9 +21,16 @@ fi
 if test -z "${BUILD_REPOSITORY_TITLE:-}"; then
   BUILD_REPOSITORY_TITLE="$(basename "$(git remote get-url --push origin)")"
 fi
+
 # Don't assume we're in the right directory (makes it easier to run the script
 # locally).
-cd "$BUILD_SOURCESDIRECTORY/$BUILD_REPOSITORY_TITLE"
+if [[ "$BUILD_SOURCESDIRECTORY" == *"$BUILD_REPOSITORY_TITLE" ]]; then
+  REPO_FOLDER=$BUILD_SOURCESDIRECTORY
+else
+  REPO_FOLDER=$BUILD_SOURCESDIRECTORY/$BUILD_REPOSITORY_TITLE
+fi
+cd "${REPO_FOLDER}"
+
 
 # Validate a few things
 ARTIFACTS_PATH=$BUILD_SOURCESDIRECTORY/artifacts
@@ -47,15 +54,15 @@ make global.json
 
 make -C builds dotnet
 
-var=$(make -C "$BUILD_SOURCESDIRECTORY/$BUILD_REPOSITORY_TITLE/tools/devops" print-variable VARIABLE=DOTNET)
+var=$(make -C "${REPO_FOLDER}/tools/devops" print-variable VARIABLE=DOTNET)
 DOTNET=${var#*=}
 echo "Using dotnet found at $DOTNET"
 
-var=$(make -C "$BUILD_SOURCESDIRECTORY/$BUILD_REPOSITORY_TITLE/tools/devops" print-variable VARIABLE=DOTNET_PLATFORMS)
+var=$(make -C "${REPO_FOLDER}/tools/devops" print-variable VARIABLE=DOTNET_PLATFORMS)
 DOTNET_PLATFORMS=${var#*=}
 echo "Dotnet platforms are '$DOTNET_PLATFORMS'"
 
-var=$(make -C "$BUILD_SOURCESDIRECTORY/$BUILD_REPOSITORY_TITLE/tools/devops" print-abspath-variable VARIABLE=DOTNET_NUPKG_DIR)
+var=$(make -C "${REPO_FOLDER}/tools/devops" print-abspath-variable VARIABLE=DOTNET_NUPKG_DIR)
 DOTNET_NUPKG_DIR=${var#*=}
 echo "Using nuget dir $DOTNET_NUPKG_DIR"
 
@@ -85,9 +92,9 @@ done
 for platform in $DOTNET_PLATFORMS; do
   unzip -l "$DOTNET_NUPKG_DIR"/Microsoft."$platform".Bundle.*.zip
   unzip "$DOTNET_NUPKG_DIR"/Microsoft."$platform".Bundle.*.zip -d tmpdir
-  rsync -av tmpdir/dotnet/sdk-manifests/* "$BUILD_SOURCESDIRECTORY/$BUILD_REPOSITORY_TITLE"/builds/downloads/dotnet-*/sdk-manifests/
+  rsync -av tmpdir/dotnet/sdk-manifests/* "${REPO_FOLDER}"/builds/downloads/dotnet-*/sdk-manifests/
 done
-find "$BUILD_SOURCESDIRECTORY/$BUILD_REPOSITORY_TITLE"/builds/downloads/dotnet-*
+find "${REPO_FOLDER}"/builds/downloads/dotnet-*
 
 # PLATFORMS may be empty/no values
 set +u
@@ -96,6 +103,6 @@ if [ ${#PLATFORMS[@]} -gt 0 ]; then
 fi
 set -u
 
-var=$(make -C "$BUILD_SOURCESDIRECTORY/$BUILD_REPOSITORY_TITLE/tools/devops" print-variable VARIABLE=DOTNET_DIR)
+var=$(make -C "${REPO_FOLDER}/tools/devops" print-variable VARIABLE=DOTNET_DIR)
 DOTNET_DIR=${var#*=}
 ls -lR "$DOTNET_DIR"

tools/devops/automation/scripts/fetch-remote-binlogs.ps1

@@ -5,7 +5,7 @@ Invoke-SshCommand `
   -RemoteHost "$Env:MAC_AGENT_IP" `
   -RemoteUserName "$Env:MAC_AGENT_USER" `
   -- `
-  "$Env:MAC_AGENT_BUILD_SOURCESDIRECTORY/$Env:BUILD_REPOSITORY_TITLE/tests/dotnet/Windows/collect-binlogs.sh"
+  "$Env:MAC_AGENT_BUILD_SOURCESDIRECTORY/tests/dotnet/Windows/collect-binlogs.sh"
 
 New-Item -Path "$Env:BUILD_ARTIFACTSTAGINGDIRECTORY" -Name "windows-binlogs" -ItemType "directory"
 New-Item -Path "$Env:BUILD_ARTIFACTSTAGINGDIRECTORY\windows-binlogs" -Name "windows-remote-logs.zip" -ItemType "file" -Value "zip"