Skip to content

Update 6.0.2xx with the current state of 1xx #13244

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
Merged
MichaelSimons merged 19 commits into from
Mar 5, 2022
Merged

Update 6.0.2xx with the current state of 1xx #13244

MichaelSimons merged 19 commits into from
Mar 5, 2022

Conversation

@marcpopMSFT
Copy link
Member

@marcpopMSFT marcpopMSFT commented Feb 17, 2022

  • Please add description for changes you are making.
  • If there is an issue related to this PR, please add the reference.

marcpopMSFT and others added 17 commits February 6, 2022 09:41
@marcpopMSFT
Update .vsts-ci.yml
11de58d
@dotnet-maestro
Update dependencies from https://github.com/dotnet/source-build-refer…
97c7aa2 
…ence-packages build 20220205.1 (#13179)

[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
@lbussell
Override Microsoft.Net.Sdk.WindowsDesktop references during source-bu…
7d14092 
…ild in Roslyn (#13093)

* override SDK for Microsoft.Net.Sdk.WindowsDesktop references in roslyn

* add new EmptySdk in the source build tarball

* remove roslyn solution filter patch
@dotnet-maestro
Update dependencies from https://github.com/dotnet/arcade build 20220…
b86d04b 
…207.2 (#13186)

Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22102.3 -> To Version 6.0.0-beta.22107.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@vseanreesermsft
Merge commit '02d5242ed7ca7c3747fc89196cf67aeff260c6ac' into internal…
2186b8b 
…-merge-6.0.1xx-2022-02-08-1019
@manodasanW
[release/6.0.1xx] Windows SDK projection update
583dcc4
@wtgodbe
Update asp.net templates (#13193)
ee9b807
@marcpopMSFT
Merge pull request #13198 from manodasanW/patch-3
b7a97cb 
[release/6.0.1xx] Windows SDK projection update
@vseanreesermsft
Merge pull request #13189 from vseanreesermsft/internal-merge-6.0.1xx…
69bd1f8 
…-2022-02-08-1019

Merging internal commits for release/6.0.1xx
@dotnet-maestro
Update dependencies from https://github.com/dotnet/source-build-refer…
2f89821 
…ence-packages build 20220210.1 (#13215)

[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
@MichaelSimons
Add test to compare msft and sb sdk contents (#13153)
d69361c
@crummel
Update to SDK and previously-source-built 6.0.102. (#13221)
606bca4
@omajid
Add CentOS Stream 9 container to CI matrix (#12955)
35abe3c
@dotnet-maestro
Update dependencies from https://github.com/dotnet/source-build-refer…
e63e925 
…ence-packages build 20220215.1 (#13229)

[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
@MichaelSimons
Gather additional smoke test prereqs (#13233)
f6763d6
@crummel
Remove bootstrapping for CI builds now that we use CentOS7 previously…
cab7e65 
…-source-built (#13232)
@marcpopMSFT
Merge remote-tracking branch 'origin/release/6.0.1xx' into marcpopMSF…
93db1eb 
…T-catchup60200-1
@marcpopMSFT marcpopMSFT requested a review from a team as a code owner February 17, 2022 19:47
@marcpopMSFT marcpopMSFT mentioned this pull request Feb 17, 2022
Closed
@marcpopMSFT
Copy link
Member Author

marcpopMSFT commented Feb 17, 2022

@MichaelSimons , should I continue to expect significant changes for source build in the 1xx branch? For 5.0 servicing we didn't auto-merge other than N-1 to main but it seems like with 6.0, there have been a lot of 1xx changes (and potentially .2xx changes) which are requiring manual merging.

@MichaelSimons
Copy link
Member

MichaelSimons commented Feb 17, 2022

@MichaelSimons , should I continue to expect significant changes for source build in the 1xx branch? For 5.0 servicing we didn't auto-merge other than N-1 to main but it seems like with 6.0, there have been a lot of 1xx changes (and potentially .2xx changes) which are requiring manual merging.

Yes, source-build has traditionally only supported the oldest sdk channel per agreement with our SB partners. We would like to get to the point where we support all channels but don't have the resources to support that at the moment. The primary changes being made in 1xx is all related to testing and eng infra to automate the release process. I expect this will slow down drastically in a couple more servicing releases but there will still be occasional changes needed.

@marcpopMSFT
Copy link
Member Author

marcpopMSFT commented Feb 18, 2022

@MichaelSimons if ya'll are going to focus on the oldest but the SDK teams are focused on the newest, do you think you'd be able to pick up owning the manual merge forward or should we enable auto-merge forward?

@MichaelSimons
Copy link
Member

MichaelSimons commented Feb 18, 2022

Please enable auto-merge forward.

@marcpopMSFT
Copy link
Member Author

marcpopMSFT commented Mar 3, 2022

/azp run

@azure-pipelines
Copy link

azure-pipelines bot commented Mar 3, 2022

Azure Pipelines successfully started running 1 pipeline(s).

@marcpopMSFT
Copy link
Member Author

marcpopMSFT commented Mar 3, 2022

@MichaelSimons Any suggestions on this tarbal failure:

/tarball/src/roslyn.592501cbb9c9394072a245c15b3458ff88155d85/artifacts/source-build/self/src/src/Scripting/CSharp/Microsoft.CodeAnalysis.CSharp.Scripting.csproj : error NU1102: Unable to find package Microsoft.CSharp with version (>= 4.7.0) [/tarball/src/roslyn.592501cbb9c9394072a245c15b3458ff88155d85/artifacts/source-build/self/src/Roslyn.sln]

@MichaelSimons MichaelSimons mentioned this pull request Mar 3, 2022
Closed
@MichaelSimons
Copy link
Member

MichaelSimons commented Mar 3, 2022

@marcpopMSFT - I opened dotnet/source-build#2783 to track the underlying issue. Feel free to merge. The fix will flow in from dotnet/source-build-reference-packages

@MichaelSimons
Copy link
Member

MichaelSimons commented Mar 3, 2022

Thinking about this more, I will fix the issue right away and update this PR.

@dotnet-maestro @MichaelSimons
Update dependencies from https://github.com/dotnet/source-build-refer…
c9d7ba5 
…ence-packages build 20220303.2

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22151.1 -> To Version 6.0.0-servicing.22153.2
@MichaelSimons
Copy link
Member

MichaelSimons commented Mar 4, 2022

I cherry-picked the fix for the tarball failure.

@MichaelSimons MichaelSimons merged commit c3da28f into release/6.0.2xx Mar 5, 2022
@MichaelSimons MichaelSimons deleted the marcpopMSFT-catchup60200-1 branch March 5, 2022 02:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MichaelSimons MichaelSimons MichaelSimons approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@marcpopMSFT @MichaelSimons @lbussell @vseanreesermsft @manodasanW @wtgodbe @crummel @omajid