Merging internal commits for release/6.0.2xx #13203

vseanreesermsft · 2022-02-09T00:06:40Z

No description provided.

…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

…/release/6.0.1xx

…plicitversion601 Update GenerateBundledVersions.targets

…ld 20220114.3 (dotnet#13051) [release/6.0.1xx] Update dependencies from dotnet/test-templates

…ence-packages build 20220203.1 (dotnet#13163) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22078.1 -> To Version 6.0.0-servicing.22103.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-rtm.22076.18 -> To Version 6.0.200-rtm.22103.4 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset From Version 6.0.200-1.22069.1 -> To Version 6.0.200-1.22081.5 (parent: Microsoft.NET.Sdk

…202.3 (dotnet#13164) [release/6.0.1xx] Update dependencies from dotnet/arcade

…dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.ILLink.Tasks**: from 6.0.200-1.22069.1 to 6.0.200-1.22081.5 (parent: Microsoft.NET.Sdk) - **Microsoft.Net.Compilers.Toolset**: from 4.1.0-3.22075.3 to 4.1.0-5.22102.1 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b065b754-67d8-417c-0ef9-08d9d602f120) ## From https://github.com/dotnet/sdk - **Subscription**: b065b754-67d8-417c-0ef9-08d9d602f120 - **Build**: 20220203.4 - **Date Produced**: February 3, 2022 4:47:52 PM UTC - **Commit**: db23431 - **Branch**: refs/heads/release/6.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.200-rtm.22076.18 to 6.0.200-rtm.22103.4][11] - **Microsoft.NET.Sdk**: [from 6.0.200-rtm.22076.18 to 6.0.200-rtm.22103.4][11] - **Microsoft.NET.ILLink.Tasks**: [from 6.0.200-1.22069.1 to 6.0.200-1.22081.5][12] - **Microsoft.Net.Compilers.Toolset**: [from 4.1.0-3.22075.3 to 4.1.0-5.22102.1][13] [11]: dotnet/sdk@8a705ab...db23431 [12]: dotnet/linker@70dc7f6...cc3dc76 [13]: dotnet/roslyn@592501c...f6b9551 [DependencyUpdate]: <> (End) [marker]: <> (End:b065b754-67d8-417c-0ef9-08d9d602f120)

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-rtm.22103.4 -> To Version 6.0.200-rtm.22103.21

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-rtm.22103.4 -> To Version 6.0.200-rtm.22103.24 Dependency coherency updates Microsoft.NET.ILLink.Tasks From Version 6.0.200-1.22081.5 -> To Version 6.0.200-1.22103.1 (parent: Microsoft.NET.Sdk

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-rtm.22103.4 -> To Version 6.0.200-rtm.22103.35 Dependency coherency updates Microsoft.NET.ILLink.Tasks From Version 6.0.200-1.22081.5 -> To Version 6.0.200-1.22103.1 (parent: Microsoft.NET.Sdk

…dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:b065b754-67d8-417c-0ef9-08d9d602f120) ## From https://github.com/dotnet/sdk - **Subscription**: b065b754-67d8-417c-0ef9-08d9d602f120 - **Build**: 20220203.35 - **Date Produced**: February 4, 2022 6:54:19 AM UTC - **Commit**: 82104d8 - **Branch**: refs/heads/release/6.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.200-rtm.22103.4 to 6.0.200-rtm.22103.35][4] - **Microsoft.NET.Sdk**: [from 6.0.200-rtm.22103.4 to 6.0.200-rtm.22103.35][4] - **Microsoft.NET.ILLink.Tasks**: [from 6.0.200-1.22081.5 to 6.0.200-1.22103.1][5] [4]: dotnet/sdk@db23431...82104d8 [5]: dotnet/linker@cc3dc76...2b78c5e [DependencyUpdate]: <> (End) [marker]: <> (End:b065b754-67d8-417c-0ef9-08d9d602f120) [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.ILLink.Tasks**: from 6.0.200-1.22081.5 to 6.0.200-1.22103.1 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates)

…otnet-sdk build 20220204.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-rtm.22103.35 -> To Version 6.0.200-rtm.22104.9 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.0 -> To Version 6.0.2 (parent: Microsoft.NET.Sdk

…-internal/release/6.0.2xx-389814c1-2f80-453e-b83c-7ad00843a34c

…dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.0 to 6.0.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.1-servicing.21568.2 to 6.0.2-servicing.22064.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.0-rtm.21523.1 to 6.0.2-servicing.22064.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.1 to 6.0.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.1-servicing.21567.5 to 6.0.2-servicing.22064.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.1 to 6.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.1 to 6.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.1 to 6.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.0 to 6.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.0-rtm.21526.8 to 6.0.2-servicing.22064.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.1 to 6.0.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.1-servicing.21567.14 to 6.0.2-servicing.22064.12 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.1-servicing.21567.14 to 6.0.2-servicing.22064.12 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.1-servicing.21567.14 to 6.0.2-servicing.22064.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.200 to 6.0.200 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.200-rtm.22071.1 to 6.0.200-rtm.22103.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.200 to 6.0.200 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.1 to 6.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.1-servicing.21567.5 to 6.0.2-servicing.22064.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.1 to 6.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.1-servicing.21567.7 to 6.0.2-servicing.22064.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.NET.ILLink.Tasks**: from 6.0.200-1.22103.1...

- Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. Switch to lowercase to match other cases.

…ergepublic

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

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

marcpopMSFT · 2022-02-11T21:50:18Z

@vseanreesermsft I think this won't pass builds until Tuesday when 6.0.200 actually releases. Can we prep 6.0.201 without this?

marcpopMSFT · 2022-02-15T18:47:56Z

/azp run

azure-pipelines · 2022-02-15T18:48:08Z

Azure Pipelines successfully started running 1 pipeline(s).

marcpopMSFT · 2022-02-15T23:02:01Z

@MichaelSimons The first tarball run failed in a test. Any ideas?

  [xUnit.net 00:00:09.75]     Microsoft.DotNet.SourceBuild.SmokeTests.SmokeTests.SmokeTestsScript [FAIL]
    Failed Microsoft.DotNet.SourceBuild.SmokeTests.SmokeTests.SmokeTestsScript [8 s]
EXEC : error Message:  [/tarball/build.proj]
     System.ComponentModel.Win32Exception : An error occurred trying to start process '/tarball/test/Microsoft.DotNet.SourceBuild.SmokeTests/bin/Release/net6.0/./smoke-tests/smoke-test.sh' with working directory '/tarball/test/Microsoft.DotNet.SourceBuild.SmokeTests/bin/Release/net6.0'. Permission denied
    Stack Trace:
       at System.Diagnostics.Process.ForkAndExecProcess(ProcessStartInfo startInfo, String resolvedFilename, String[] argv, String[] envp, String cwd, Boolean setCredentials, UInt32 userId, UInt32 groupId, UInt32[] groups, Int32& stdinFd, Int32& stdoutFd, Int32& stderrFd, Boolean usesTerminal, Boolean throwOnNoExec)
     at System.Diagnostics.Process.StartCore(ProcessStartInfo startInfo)
     at System.Diagnostics.Process.Start()
     at Microsoft.DotNet.SourceBuild.SmokeTests.ExecuteHelper.ExecuteProcess(String fileName, String args, ITestOutputHelper outputHelper) in /tarball/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs:line 44
     at Microsoft.DotNet.SourceBuild.SmokeTests.SmokeTests.SmokeTestsScript() in /tarball/test/Microsoft.DotNet.SourceBuild.SmokeTests/SmokeTests.cs:line 41

MichaelSimons · 2022-02-15T23:11:42Z

@MichaelSimons The first tarball run failed in a test. Any ideas?

Yes, we have a concurrency issue in the tests that was fixed in release/6.0.1xx. I am comfortable with merging this, and then 6.0.1xx should get merged to 6.0.2xx.

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

Merge remote-tracking branch 'upstream/release/6.0.1xx' into internal…

b6928a1

…/release/6.0.1xx

Update GenerateBundledVersions.targets

6f0f80e

Merge pull request dotnet#13035 from dotnet/marcpopMSFT-downgrade31im…

ad30dae

…plicitversion601 Update GenerateBundledVersions.targets

Merge in 'release/6.0.1xx' changes

a924ede

Update dependencies from https://github.com/dotnet/test-templates bui…

d31aa16

…ld 20220114.3 (dotnet#13051) [release/6.0.1xx] Update dependencies from dotnet/test-templates

Merge in 'release/6.0.1xx' changes

94d5ff8

dotnet-maestro bot and others added 23 commits February 3, 2022 08:42

Merge in 'release/6.0.1xx' changes

5118806

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

701b769

…202.3 (dotnet#13164) [release/6.0.1xx] Update dependencies from dotnet/arcade

Merge in 'release/6.0.1xx' changes

b39d254

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

71f3758

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.200-rtm.22103.4 -> To Version 6.0.200-rtm.22103.21

Merge in 'release/6.0.2xx' changes

80261ff

Refactor smoke-test to capture prereqs (dotnet#13145)

2842b74

Merge in 'release/6.0.1xx' changes

477d80b

Merge remote-tracking branch 'ADO/internal/release/6.0.1xx' into darc…

2551ba7

…-internal/release/6.0.2xx-389814c1-2f80-453e-b83c-7ad00843a34c

Merge in 'release/6.0.2xx' changes

0db1cf8

Merge remote-tracking branch 'ADO/internal/release/6.0.2xx' into darc…

738f121

…-internal/release/6.0.2xx-389814c1-2f80-453e-b83c-7ad00843a34c

Switch to lowercase to match other cases.

e0993bd

Merged PR 21050: Switch to lowercase to match other cases.

3c09f27

- Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. Switch to lowercase to match other cases.

Merge remote-tracking branch 'ADO/release/6.0.2xx' into dev/marcpop/m…

3faaf05

…ergepublic

Merged PR 21052: Fix merge from public to internal

4c30de7

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

Merge commit '4c30de7899a11b05875df6d6a672d44d03789b5e' into internal…

230eb5c

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

vseanreesermsft requested a review from a team as a code owner February 9, 2022 00:06

marcpopMSFT merged commit 2d6f118 into dotnet:release/6.0.2xx Feb 16, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merging internal commits for release/6.0.2xx #13203

Merging internal commits for release/6.0.2xx #13203

Uh oh!

vseanreesermsft commented Feb 9, 2022

Uh oh!

marcpopMSFT commented Feb 11, 2022

Uh oh!

marcpopMSFT commented Feb 15, 2022

Uh oh!

azure-pipelines bot commented Feb 15, 2022

Uh oh!

marcpopMSFT commented Feb 15, 2022

Uh oh!

MichaelSimons commented Feb 15, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Merging internal commits for release/6.0.2xx #13203

Merging internal commits for release/6.0.2xx #13203

Uh oh!

Conversation

vseanreesermsft commented Feb 9, 2022

Uh oh!

marcpopMSFT commented Feb 11, 2022

Uh oh!

marcpopMSFT commented Feb 15, 2022

Uh oh!

azure-pipelines bot commented Feb 15, 2022

Uh oh!

marcpopMSFT commented Feb 15, 2022

Uh oh!

MichaelSimons commented Feb 15, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants