Merge 6.0.200 into 6.0.3xx #13236

marcpopMSFT · 2022-02-16T18:32:48Z

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

…otnet-sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.1-1.21569.2 to 4.0.1-1.21573.5 (parent: Microsoft.NET.Sdk)

…otnet-sdk

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22055.25

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22055.27 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.1.0-3.22054.26 -> To Version 4.1.0-3.22055.10 (parent: Microsoft.NET.Sdk

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22055.28 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.1.0-3.22054.26 -> To Version 4.1.0-3.22055.16 (parent: Microsoft.NET.Sdk

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22056.5 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset From Version 12.0.1-beta.21631.3 -> To Version 12.0.1-beta.22056.2 (parent: Microsoft.NET.Sdk

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22056.6 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset From Version 12.0.1-beta.21631.3 -> To Version 12.0.1-beta.22056.2 (parent: Microsoft.NET.Sdk

…nce-packages (#13177) * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220205.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22103.1 -> To Version 6.0.0-servicing.22105.1 * Update NuGet.config Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jason Zhai <[email protected]>

…-merge-6.0.2xx-2022-02-08-1606

[release/6.0.2xx] Update dependencies from dotnet/arcade - Update NuGet.config

6.0.201 servicing branding

…nce-packages (#13213) [release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages - Update NuGet.config

[release/6.0.2xx] Windows SDK projection update

…-2022-02-08-1606 Merging internal commits for release/6.0.2xx

…T-catchup60300

marcpopMSFT · 2022-02-17T21:40:43Z

@mmitche I tried to fix this by matching the emscripten update that went into runtime but the build is still failing to find the 6.0.200 emscripten. What am I missing?

mmitche · 2022-02-22T22:18:16Z

@mmitche I tried to fix this by matching the emscripten update that went into runtime but the build is still failing to find the 6.0.200 emscripten. What am I missing?

Will take a look

mmitche · 2022-02-23T17:54:01Z

Coherency updates failed for the following dependencies:
  Unable to update Microsoft.NET.Workload.Emscripten.Manifest-6.0.200 to have coherency with VS.Redist.Common.NetCore.SharedFramework.x64.6.0: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @ 3a25a7f1cc446b60678ed25c9d829420d6321eba does not contain dependency Microsoft.NET.Workload.Emscripten.Manifest-6.0.200
    - Add the dependency to https://dev.azure.com/dnceng/internal/_git/dotnet-runtime.
    - Pin the dependenency.
    - Remove the CoherentParentDependency attribute.
Attempting fallback to Legacy coherency
warn: Microsoft.DotNet.Darc.Operations.Operation[0]
      https://github.com/Microsoft/ApplicationInsights-dotnet@53b80940842204f78708a538628288ff5d741a1d does not have an eng/Version.Details.xml.
warn: Microsoft.DotNet.Darc.Operations.Operation[0]
      https://github.com/dotnet/corefx@7ee84596d92e178bce54c986df31ccc52479e772 does not have an eng/Version.Details.xml.
warn: Microsoft.DotNet.Darc.Operations.Operation[0]
      https://github.com/dotnet/msquic@d7db669b70f4dd67ec001c192f9809c218cab88b does not have an eng/Version.Details.xml.
warn: Microsoft.DotNet.Darc.Operations.Operation[0]
      https://github.com/dotnet/hotreload-utils@db44d47059b070a687776ff53edbd618593bbe54 does not have an eng/Version.Details.xml.
Coherency updates failed for the following dependencies:
  Unable to update Microsoft.NET.Workload.Emscripten.Manifest-6.0.200 to have coherency with VS.Redist.Common.NetCore.SharedFramework.x64.6.0: No matching build asset found in dependency graph under https://github.com/dotnet/sdk @ f6997d5bc9239c83357d0fef91043c2b4ab60c70
    - Remove the coherency attribute
    - Pin the dependenency.
Error: Failed to update coherent parent tied dependencies.

mmitche · 2022-02-23T17:55:40Z

We need dotnet/runtime#65478 before that will work.

mmitche · 2022-03-03T15:31:45Z

/azp run

azure-pipelines · 2022-03-03T15:32:00Z

Azure Pipelines successfully started running 1 pipeline(s).

marcpopMSFT · 2022-03-03T17:13:26Z

@MichaelSimons can you take a look at the tarball job failure?

MichaelSimons · 2022-03-03T17:32:46Z

@MichaelSimons can you take a look at the tarball job failure?

The tarball creation is failing because we are flowing versions.detail.xml changes which are downgrading the NuGet.Client version. Can this change get backed out?

- <Dependency Name="NuGet.Build.Tasks" Version="6.2.0-preview.2.75" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="NuGet.Build.Tasks" Version="6.1.0-rc.103" CoherentParentDependency="Microsoft.NET.Sdk">

marcpopMSFT · 2022-03-03T19:05:49Z

@MichaelSimons can you take a look at the tarball job failure?

The tarball creation is failing because we are flowing versions.detail.xml changes which are downgrading the NuGet.Client version. Can this change get backed out?
- <Dependency Name="NuGet.Build.Tasks" Version="6.2.0-preview.2.75" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="NuGet.Build.Tasks" Version="6.1.0-rc.103" CoherentParentDependency="Microsoft.NET.Sdk">

Good catch. I noticed a couple of others and fixed them up. The auto-merge does a better job of handling the eng folder changes than humans do so hopefully we can get that enabled.

marcpopMSFT · 2022-03-03T21:42:16Z

@MichaelSimons Another tarbal leg failure: https://dev.azure.com/dnceng/public/_build/results?buildId=1643389&view=logs&j=c17db48a-1457-5682-c644-47f2df37cf6a&t=1ec9c259-30cf-5f76-0741-ab3c9c431c19

MichaelSimons · 2022-03-03T21:44:47Z

@MichaelSimons Another tarbal leg failure: https://dev.azure.com/dnceng/public/_build/results?buildId=1643389&view=logs&j=c17db48a-1457-5682-c644-47f2df37cf6a&t=1ec9c259-30cf-5f76-0741-ab3c9c431c19

This is the ILVerify runtime issue that we are waiting for the fix to flow in. Feel free to merge with this tarball failure.

dotnet-bot and others added 30 commits November 24, 2021 04:55

[internal/release/6.0.1xx] Update dependencies from dnceng/internal/d…

f0c33c3

…otnet-sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.1-1.21569.2 to 4.0.1-1.21573.5 (parent: Microsoft.NET.Sdk)

Merge in 'release/6.0.1xx' changes

0de0aab

[internal/release/6.0.1xx] Update dependencies from dnceng/internal/d…

14bc4c5

…otnet-sdk

Merge in 'release/6.0.1xx' changes

15c9cde

[internal/release/6.0.1xx] Update dependencies from dnceng/internal/d…

769ba58

…otnet-sdk

Merge in 'release/6.0.1xx' changes

049b07e

Merge in 'release/6.0.1xx' changes

2b3f0a7

Merge in 'release/6.0.1xx' changes

fb077b9

Merge in 'release/6.0.1xx' changes

3c6e939

Merge in 'release/6.0.1xx' changes

f7c54ab

Merge in 'release/6.0.1xx' changes

ab1002a

[internal/release/6.0.1xx] Update dependencies from dnceng/internal/d…

c8a4f55

…otnet-sdk

Merge in 'release/6.0.1xx' changes

ef5a467

[internal/release/6.0.1xx] Update dependencies from dnceng/internal/d…

e88edad

…otnet-sdk

Merge in 'release/6.0.1xx' changes

fd122a4

Merge in 'release/6.0.1xx' changes

bd2c4ef

Merge in 'release/6.0.1xx' changes

8df3349

Merge in 'release/6.0.1xx' changes

16b964c

Merge in 'release/6.0.1xx' changes

daa5587

Merge in 'release/6.0.1xx' changes

a36f8d0

[internal/release/6.0.1xx] Update dependencies from dnceng/internal/d…

a643249

…otnet-sdk

Merge in 'release/6.0.1xx' changes

bcb56e4

Merge in 'release/6.0.1xx' changes

66b270f

Merge in 'release/6.0.1xx' changes

4e8f0d5

Update dependencies from https://github.com/dotnet/sdk build 20220105.25

5a7eef4

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver From Version 6.0.200-preview.22055.23 -> To Version 6.0.200-preview.22055.25

Remove source-build format repo patches that were backported

557fa0d

dotnet-maestro bot and others added 11 commits February 7, 2022 08:32

[release/6.0.2xx] Windows SDK projection update

ea4be9c

Update Versions.props

b2eed32

Merge commit '4c30de7899a11b05875df6d6a672d44d03789b5e' into internal…

230eb5c

…-merge-6.0.2xx-2022-02-08-1606

Update asp.net templates (#13194)

f13c273

[release/6.0.2xx] Update dependencies from dotnet/arcade (#13188)

080205a

[release/6.0.2xx] Update dependencies from dotnet/arcade - Update NuGet.config

Merge pull request #13202 from dotnet/marcpopMSFT-servicingBranding

83352f6

6.0.201 servicing branding

[release/6.0.2xx] Update dependencies from dotnet/source-build-refere…

1a8edd6

…nce-packages (#13213) [release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages - Update NuGet.config

Merge pull request #13199 from manodasanW/patch-4

eb48296

[release/6.0.2xx] Windows SDK projection update

Merge pull request #13203 from vseanreesermsft/internal-merge-6.0.2xx…

2d6f118

…-2022-02-08-1606 Merging internal commits for release/6.0.2xx

Merge remote-tracking branch 'origin/release/6.0.2xx' into marcpopMSF…

66a4e36

…T-catchup60300

marcpopMSFT requested a review from a team as a code owner February 16, 2022 18:32

Update the emscripten version details

25d380b

Merge branch 'release/6.0.3xx' into marcpopMSFT-catchup60300

a16c6b7

Merge branch 'release/6.0.3xx' into marcpopMSFT-catchup60300

20fb83d

marcpopMSFT added 2 commits March 3, 2022 11:03

Fix some downgrades in the version details

f37dbb8

Fix the version stabilization merge

65c3392

marcpopMSFT merged commit b5faf4f into release/6.0.3xx Mar 3, 2022

MichaelSimons deleted the marcpopMSFT-catchup60300 branch March 4, 2022 00:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge 6.0.200 into 6.0.3xx #13236

Merge 6.0.200 into 6.0.3xx #13236

Uh oh!

marcpopMSFT commented Feb 16, 2022

Uh oh!

marcpopMSFT commented Feb 17, 2022

Uh oh!

mmitche commented Feb 22, 2022

Uh oh!

mmitche commented Feb 23, 2022 •

edited

Loading

Uh oh!

mmitche commented Feb 23, 2022

Uh oh!

mmitche commented Mar 3, 2022

Uh oh!

azure-pipelines bot commented Mar 3, 2022

Uh oh!

marcpopMSFT commented Mar 3, 2022

Uh oh!

MichaelSimons commented Mar 3, 2022

Uh oh!

marcpopMSFT commented Mar 3, 2022

Uh oh!

marcpopMSFT commented Mar 3, 2022

Uh oh!

MichaelSimons commented Mar 3, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

Merge 6.0.200 into 6.0.3xx #13236

Merge 6.0.200 into 6.0.3xx #13236

Uh oh!

Conversation

marcpopMSFT commented Feb 16, 2022

Uh oh!

marcpopMSFT commented Feb 17, 2022

Uh oh!

mmitche commented Feb 22, 2022

Uh oh!

mmitche commented Feb 23, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mmitche commented Feb 23, 2022

Uh oh!

mmitche commented Mar 3, 2022

Uh oh!

azure-pipelines bot commented Mar 3, 2022

Uh oh!

marcpopMSFT commented Mar 3, 2022

Uh oh!

MichaelSimons commented Mar 3, 2022

Uh oh!

marcpopMSFT commented Mar 3, 2022

Uh oh!

marcpopMSFT commented Mar 3, 2022

Uh oh!

MichaelSimons commented Mar 3, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

mmitche commented Feb 23, 2022 •

edited

Loading