Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable private feeds for release branch #10355

Merged
merged 4 commits into from
Sep 11, 2024
Merged

Enable private feeds for release branch #10355

merged 4 commits into from
Sep 11, 2024
+67 −2

Conversation

AR-May
Copy link
Member

@AR-May AR-May commented Jul 11, 2024 •
edited
Loading

This PR enables MSBuild to take security fixes from MSBuild dependencies.

rainersigwald and others added 2 commits July 11, 2024 14:52
@rainersigwald @AR-May
Enable private feed references
36d0102 
* Add AzureDevOps-Artifact-Feeds-Pats and use it in PR build legs
* Disable 1ES checks on upstream feeds because .NET servicing requires
  a private cross-account feed.
* File diff check only runs within src
@AR-May
Bump version
9356596
@AR-May AR-May requested a review from rainersigwald July 11, 2024 13:07
@AR-May AR-May requested a review from a team as a code owner July 11, 2024 13:07
@dotnet-policy-service Dotnet Policy Service
Copy link
Contributor

Hello! I noticed that you're targeting one of our servicing branches. Please consider updating the version.

rainersigwald
rainersigwald approved these changes Jul 11, 2024
View reviewed changes
Copy link
Member

@rainersigwald rainersigwald left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would ideally go to our oldest in-support branch, but I think it's fine to wait.

cc @f-alizada

@f-alizada
Copy link
Contributor

Hello. Thank you for tagging @rainersigwald.
Can we retarget then this PR to vs17.0 and add the workflow file from here: https://github.com/dotnet/msbuild/pull/10310/files?
Any objections on that? this will enable the inter-branch merge.

@AR-May AR-May force-pushed the enable-private-feeds branch from 704646c to f3a9452 Compare July 12, 2024 15:23
@AR-May AR-May requested a review from rainersigwald July 12, 2024 15:28
@AR-May AR-May self-assigned this Jul 16, 2024
@AR-May AR-May added the Priority:3 Work that is nice to have label Aug 5, 2024
@rainersigwald
Copy link
Member

Are we waiting on anything here? Feels like we could merge . . .

@maridematte maridematte merged commit 33027ff into dotnet:vs17.10 Sep 11, 2024
10 checks passed
JanKrivanek added a commit that referenced this pull request Dec 19, 2024
@github-actions @GangWang01
@JanKrivanek @surayya-MS @dotnet-maestro-bot @Forgind @sujitnayak @YuliiaKovalova @maridematte @AR-May @rainersigwald @dotnet-maestro @JanProvaznik @JaynieBai
[automated] Merge branch 'vs17.10' => 'vs17.11' (#11137)
eb37b2e 
* Check version bump on release branches' update

* Skip check version bump on release branch update for initial commit to release branch or the change from dotnet bot

* Remove the exception for dependencies update by dotnet-maestro[bot]

* Bump version

* [automated] Merge branch 'vs17.9' => 'vs17.10' (#10081)

* Dont ngen taskhost Fixes our lack of optprof data (#8737)

Don't ngen TaskHosts

* Bump version

* Bump version

* Update System.Security.Cryptography.Pkcs

* Bump version

* Workaround for incorrect encoding of PUA range in GB18030 Uri string (#9751)

* [release/vs17.7] Onboard 1es templates (#9924)

* bump arcade version

* bump MicrosoftNetCompilersToolsetVersion

* bump MicrosoftNetCompilersToolsetVersion

* update sha for Microsoft.Net.Compilers.Toolset

* update darc

* update arcade channel .net 8

* update arcade

* Changed pool image

---------

Co-authored-by: Forgind <12969783+Forgind@users.noreply.github.com>
Co-authored-by: Jan Krivanek <jankrivanek@microsoft.com>
Co-authored-by: sujitnayak <sujitn@microsoft.com>
Co-authored-by: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com>
Co-authored-by: YuliiaKovalova <ykovalova@microsoft.com>
Co-authored-by: Surayya Huseyn Zada <shuseynzada@microsoft.com>
Co-authored-by: Surayya Huseyn Zada <114938397+surayya-MS@users.noreply.github.com>
Co-authored-by: Mariana Dematte <magarces@microsoft.com>

* Disable localization for vs17.10 (#10269)

Co-authored-by: Rainer Sigwald <raines@microsoft.com>

* Enable private feeds for release branch (#10355)

This PR enables MSBuild to take security fixes from MSBuild dependencies.

* [vs17.10] Update dependencies from dotnet/arcade (#10809)

* Update dependencies from https://github.com/dotnet/arcade build 20241008.1

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24225.1 -> To Version 8.0.0-beta.24508.1

* Update Versions.props

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com>

* CG alert cleaning on VS17.10 (#10724)

* Bump Microsoft.IO.Redist to 6.0.1
* Bump System.Formats.Asn1 to 8.0.1

* [vs17.10] Update dependencies from dotnet/arcade (#10833)

* [vs17.10] Update dependencies from dotnet/arcade (#10896)

* [vs17.10] Update dependencies from dotnet/arcade (#10992)

* Update dependencies from https://github.com/dotnet/arcade build 20241112.12

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24525.2 -> To Version 8.0.0-beta.24562.12

* Update VersionPrefix to 17.10.13

* Try to resolve CI issue that could not find System.Text.Json, Version=8.0.0.4

* Revert "Try to resolve CI issue that could not find System.Text.Json, Version=8.0.0.4"

This reverts commit 66381f3.

* Update dependencies from https://github.com/dotnet/arcade build 20241120.5

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24525.2 -> To Version 8.0.0-beta.24570.5

* Reapply "Try to resolve CI issue that could not find System.Text.Json, Version=8.0.0.4"

This reverts commit 2cffa88.

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Gang Wang <v-gaw@microsoft.com>
Co-authored-by: Surayya Huseyn Zada <shuseynzada@microsoft.com>

* [automated] Merge branch 'vs17.8' => 'vs17.10' (#11124)

* Dont ngen taskhost Fixes our lack of optprof data (#8737)

Don't ngen TaskHosts

* Bump version

* Bump version

* Update System.Security.Cryptography.Pkcs

* Bump version

* Workaround for incorrect encoding of PUA range in GB18030 Uri string (#9751)

* [release/vs17.7] Onboard 1es templates (#9924)

* bump arcade version

* bump MicrosoftNetCompilersToolsetVersion

* bump MicrosoftNetCompilersToolsetVersion

* update sha for Microsoft.Net.Compilers.Toolset

* CG alert cleaning on VS17.8 (#10725)

* Bump Microsoft.IO.Redist to 6.0.1

* Bump System.Formats.Asn1 to 8.0.1

* Bump System.Text.Json to 8.0.0.4

* Bump the dependencies of System.Text.Json

* Add System.Formats.Asn1 8.0.1 to the pre-built exception list

* Bump version prefix to 17.8.8

* Updated System.Collection.Immutable package to v8

* Adding System.Collections.Immutable 8.0.0 to the pre-built exception list

* Updated Version.Details.xml

* [vs17.8] update arcade and fix build  (#10838)

* Update dependencies from https://github.com/dotnet/arcade build 20241008.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.23425.2 -> To Version 8.0.0-beta.24508.1

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23423.1 -> To Version 1.0.0-beta.23475.1 (parent: Microsoft.DotNet.Arcade.Sdk

* remove BuildXL from nuget config

* compatibility suppressions

* Update dependencies from https://github.com/dotnet/arcade build 20241…

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions

 From Version 8.0.0-beta.24508.1 -> To Version 8.0.0-beta.24516.1

* include PortableRuntimeIdentifierGraph.json

* Suppress a warning IDE0305

* bump version

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jenny Bai <v-jennybai@microsoft.com>

* [vs17.8] Sync internal and public branches (#10858)

* Update dependencies from https://github.com/dotnet/arcade build 20241025.2 (#10894)

* [vs17.8] Update dependencies from dotnet/arcade (#10986)

* Update dependencies from https://github.com/dotnet/arcade build 20241112.12

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24525.2 -> To Version 8.0.0-beta.24562.12

* Update VersionPrefix to 17.8.11

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Surayya Huseyn Zada <114938397+surayya-MS@users.noreply.github.com>

* Update dependencies from https://github.com/dotnet/arcade build 20241120.5

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24562.12 -> To Version 8.0.0-beta.24570.5

* Update VersionPrefix to 17.8.12

* [vs17.8] Backport VS insertion pipeline YMLs (#11066)

Co-authored-by: Jan Provaznik <janprovaznik@microsoft.com>

* Update .opt-prof.yml (#11112)

* [vs17.8] Fix setting package versions in VS insertion (#11103)

* fix setting package versions

* use VS branch names in servicing package decision

---------

Co-authored-by: Jan Provaznik <janprovaznik@microsoft.com>

* Update vs/msbuild version (#11115)

* Update vs/msbuild version

* Bump version

* Update xcopy-msbuild version to 17.8.5 (#11118)

* Add inter-branch merge flow file (#11123)

* Update .opt-prof.yml (#11121)

* Bump up System.Text.Json to 8.0.5 (#11134)

* Remove the change to CompatibilitySuppressions.xml

* Remove unnecessary workaround for sdk 8.0.1xx bootstrap in the branch vs17.8

* Bump up version prefix to 17.10.14

---------

Co-authored-by: Forgind <12969783+Forgind@users.noreply.github.com>
Co-authored-by: Jan Krivanek <jankrivanek@microsoft.com>
Co-authored-by: sujitnayak <sujitn@microsoft.com>
Co-authored-by: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com>
Co-authored-by: YuliiaKovalova <ykovalova@microsoft.com>
Co-authored-by: Surayya Huseyn Zada <shuseynzada@microsoft.com>
Co-authored-by: Surayya Huseyn Zada <114938397+surayya-MS@users.noreply.github.com>
Co-authored-by: Gang Wang <v-gaw@microsoft.com>
Co-authored-by: Jan Provazník <janprovaznik@microsoft.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jenny Bai <v-jennybai@microsoft.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* [vs17.10] Run tests even if version is not bumped (#11059)

Co-authored-by: Jan Provaznik <janprovaznik@microsoft.com>

* Bump up version prefix to 17.11.20

---------

Co-authored-by: Gang Wang <v-gaw@microsoft.com>
Co-authored-by: Jan Krivanek <jankrivanek@microsoft.com>
Co-authored-by: Surayya Huseyn Zada <114938397+surayya-MS@users.noreply.github.com>
Co-authored-by: dotnet-maestro-bot <dotnet-maestro-bot@microsoft.com>
Co-authored-by: Forgind <12969783+Forgind@users.noreply.github.com>
Co-authored-by: sujitnayak <sujitn@microsoft.com>
Co-authored-by: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com>
Co-authored-by: YuliiaKovalova <ykovalova@microsoft.com>
Co-authored-by: Surayya Huseyn Zada <shuseynzada@microsoft.com>
Co-authored-by: Mariana Dematte <magarces@microsoft.com>
Co-authored-by: AR-May <67507805+AR-May@users.noreply.github.com>
Co-authored-by: Rainer Sigwald <raines@microsoft.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Jan Provazník <janprovaznik@microsoft.com>
Co-authored-by: Jenny Bai <v-jennybai@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JanKrivanek JanKrivanek JanKrivanek approved these changes

@rainersigwald rainersigwald rainersigwald approved these changes

Assignees

@AR-May AR-May

Labels
Priority:3 Work that is nice to have
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@AR-May @f-alizada @rainersigwald @JanKrivanek @maridematte