Skip to content

Merge ci_prod into auto/upgrade-telegraf-1.39.2 (pick up SR21 CFS NuGet fix) - #1757

Merged
bragi92 merged 1 commit into
auto/upgrade-telegraf-1.39.2from
ci_prod
Aug 10, 2026
Merged

Merge ci_prod into auto/upgrade-telegraf-1.39.2 (pick up SR21 CFS NuGet fix)#1757
bragi92 merged 1 commit into
auto/upgrade-telegraf-1.39.2from
ci_prod

Conversation

@bragi92

@bragi92 bragi92 commented Aug 10, 2026

Copy link
Copy Markdown
Contributor

Merges ci_prod into this branch to pick up #1756 (commit 66d115c), which routes NuGet restore through the CFS feed.

Why this matters: pipeline 444 (ContainerInsights-MultiArch-MergedBranches) has an empty CI branch filter, so it builds every branch. Builds from this branch without the fix still restore from api.nuget.org and emit CFSClean network-isolation violations, which reset the 7-day lock-in streak for ICM 839785317 (AzRel Red Flag / MountainPass SR21).

The streak must stay clean through Aug 16 to resolve before the Aug 21 cohort deadline. No functional change to this branch's own work.

Pipeline 444 (ContainerInsights-MultiArch-MergedBranches) is flagged under
MountainPass SR21 / SFI-ES4.2.4 for CFSClean violations. 1ES telemetry shows
the only CFSClean endpoint hit is api.nuget.org, from dotnet.exe during the
'build base' step on build_windows_2019 and build_windows_2022.

Changes:
- Add NuGet.config at repo root with <clear /> and only the CFS-backed
  Azure Artifacts feed (microsoft_PublicPackages), which already has a
  NuGet Gallery upstream. Without this, restore falls back to api.nuget.org.
- Drop 'dotnet add package Newtonsoft.json' and 'dotnet add package
  BouncyCastle' from build/windows/Makefile.ps1. Both are already pinned as
  PackageReference in CertificateGenerator.csproj (13.0.1 / 1.8.9); the
  unversioned 'dotnet add package' calls reach api.nuget.org to resolve the
  latest version and rewrite the csproj, un-pinning the versions at build time.
- Add NuGetAuthenticate@1 to both Windows jobs so the credential provider is
  configured for the feed. The build shells out to dotnet from a script rather
  than DotNetCoreCLI@2, so nothing wires up feed auth today.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: ee239d9a-59a5-409c-bf8f-5a1e5d9a9d58
@bragi92
bragi92 requested a review from a team as a code owner August 10, 2026 19:36
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
There may be pipelines that require an authorized user to comment /azp run to run.

@bragi92
bragi92 merged commit 5ab8fd2 into auto/upgrade-telegraf-1.39.2 Aug 10, 2026
25 of 30 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant