From 7963728a5f17eaa7bf41b0f03e36f8100ea21cbf Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 2 Sep 2026 09:00:29 -0500 Subject: [PATCH 1/5] [ci] Enable CFSClean network isolation Explicitly compose CFSClean with Permissive and the existing CFSClean2/CFSClean3 policies for the shared production and PR pipeline definition. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- build-tools/automation/azure-pipelines.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index a88d8b424ab..d6feeb693ee 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -58,6 +58,8 @@ extends: ${{ else }}: template: azure-pipelines/MicroBuild.1ES.Unofficial.yml@1esPipelines parameters: + settings: + networkIsolationPolicy: Permissive,CFSClean,CFSClean2,CFSClean3 sdl: ${{ if eq('${{ parameters.Skip1ESComplianceTasks }}', 'true') }}: enableAllTools: false From 8ff97062d963e3f451d0079951f8a509440c4cca Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 2 Sep 2026 09:01:24 -0500 Subject: [PATCH 2/5] [ci] Compose policy in existing 1ES settings Keep the network isolation policy in the pipeline's existing settings map so Azure template expansion accepts it. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- build-tools/automation/azure-pipelines.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index d6feeb693ee..7fdfeab8a7b 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -58,8 +58,6 @@ extends: ${{ else }}: template: azure-pipelines/MicroBuild.1ES.Unofficial.yml@1esPipelines parameters: - settings: - networkIsolationPolicy: Permissive,CFSClean,CFSClean2,CFSClean3 sdl: ${{ if eq('${{ parameters.Skip1ESComplianceTasks }}', 'true') }}: enableAllTools: false @@ -87,6 +85,7 @@ extends: suppression: suppressionFile: $(Build.SourcesDirectory)\.gdn\.gdnsuppress settings: + networkIsolationPolicy: Permissive,CFSClean,CFSClean2,CFSClean3 skipBuildTagsForGitHubPullRequests: true stages: - template: /build-tools/automation/yaml-templates/build-macos.yaml@self From 54dd44e00d2edfc8dc26e37ca3a2b9f216557c1c Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 2 Sep 2026 09:36:58 -0500 Subject: [PATCH 3/5] [ci] Rely on centrally required CFS policies List only Permissive and CFSClean in repository YAML so CFSClean2 and CFSClean3 continue to come from PerPipelineRequiredConfig. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- build-tools/automation/azure-pipelines.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 7fdfeab8a7b..5719a562dd6 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -85,7 +85,7 @@ extends: suppression: suppressionFile: $(Build.SourcesDirectory)\.gdn\.gdnsuppress settings: - networkIsolationPolicy: Permissive,CFSClean,CFSClean2,CFSClean3 + networkIsolationPolicy: Permissive,CFSClean skipBuildTagsForGitHubPullRequests: true stages: - template: /build-tools/automation/yaml-templates/build-macos.yaml@self From 2cc30f604c5742141d9cccff57311614362e99c2 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 2 Sep 2026 09:54:36 -0500 Subject: [PATCH 4/5] [ci] Enable CFSClean for internal pipeline Apply Permissive and CFSClean at the dnceng/internal 1ES settings boundary while retaining centrally required CFSClean2 and CFSClean3. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- build-tools/automation/azure-pipelines-internal.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-tools/automation/azure-pipelines-internal.yaml b/build-tools/automation/azure-pipelines-internal.yaml index 0ca3d12b7b1..256e9e7f57a 100644 --- a/build-tools/automation/azure-pipelines-internal.yaml +++ b/build-tools/automation/azure-pipelines-internal.yaml @@ -91,6 +91,8 @@ variables: extends: template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates parameters: + settings: + networkIsolationPolicy: Permissive,CFSClean pool: name: $(NetCoreInternalPoolName) image: $(WindowsPoolImageNetCoreInternal) From b63ae9fd6c6b73ebe967a3d788d67e09841191a4 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 2 Sep 2026 14:20:21 -0500 Subject: [PATCH 5/5] [ci] Avoid PoliCheck false positive Use uppercase terminology in the sdkmanager parsing comment while preserving its meaning. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- src/Xamarin.Android.Tools.AndroidSdk/SdkManager.Packages.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Xamarin.Android.Tools.AndroidSdk/SdkManager.Packages.cs b/src/Xamarin.Android.Tools.AndroidSdk/SdkManager.Packages.cs index d0be29f240c..96925b65160 100644 --- a/src/Xamarin.Android.Tools.AndroidSdk/SdkManager.Packages.cs +++ b/src/Xamarin.Android.Tools.AndroidSdk/SdkManager.Packages.cs @@ -91,7 +91,7 @@ internal static (IReadOnlyList Installed, IReadOnlyList var trimmed = line.Trim (); // Match section headers case-insensitively: the classic sdkmanager emits - // "Available Packages:" (capital P) while the newer Android CLI replacement + // "Available Packages:" (uppercase P) while the newer Android CLI replacement // (cmdline-tools 23+) emits "Available packages:" (lowercase p). var foundSection = false; foreach (var section in PackageSections) {