Commit graph

22807 commits

Author SHA1 Message Date
dotnet-bot
54d7bf5f29 Merge in 'release/6.0.2xx' changes 2022-03-24 13:32:51 +00:00
Michael Simons
9a5c6656c6
Merge pull request #13457 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.2xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.2xx'
2022-03-24 08:21:42 -05:00
Michael Simons
211912bd41
Refactor SdkContentTests to warn on diffs when run in CI (#13432) 2022-03-23 12:25:05 -05:00
Michael Simons
a9d43d1d3d
Update NuGet path issue in Run Tests CI step (#13453) 2022-03-23 12:24:28 -05:00
DotNet Bot
f8a55617d2 Merged PR 21938: [internal/release/6.0.2xx] Update dependencies from 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.AspNetCore.App.Ref**: from 6.0.4 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:b065b754-67d8-417c-0ef9-08d9d602f120)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b065b754-67d8-417c-0ef9-08d9d602f120
- **Build**: 20220322.7
- **Date Produced**: March 22, 2022 7:37:17 PM UTC
- **Commit**: 48cdb7a16e8277e63c5bb52f97bb02198d1a9759
- **Branch**: refs/heads/internal/release/6.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.202-servicing.22171.27 to 6.0.202-servicing.22172.7][1]
  - **Microsoft.NET.Sdk**: [from 6.0.202-servicing.22171.27 to 6.0.202-servicing.22172.7][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.4 to 6.0.4][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.4 to 6.0.4][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4][2]
  - **dotnet-dev-certs**: [from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4][2]
  - **dotnet-user-secrets**: [from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCbee413d&targetVersion=GC48cdb7a&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCcdabbaa&targetVersion=GCf9ae0f5&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:b065b754-67d8-417c-0ef9-08d9d602f120)
2022-03-22 20:11:28 +00:00
DotNet Bot
915d644e45 Merged PR 21937: [internal/release/6.0.1xx] Update dependencies from 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.AspNetCore.App.Ref**: from 6.0.4 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20220322.6
- **Date Produced**: March 22, 2022 6:16:01 PM UTC
- **Commit**: 50e695e438ba9f826633d4127d891d53fd972314
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.104-servicing.22171.26 to 6.0.104-servicing.22172.6][1]
  - **Microsoft.NET.Sdk**: [from 6.0.104-servicing.22171.26 to 6.0.104-servicing.22172.6][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.4 to 6.0.4][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.4 to 6.0.4][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4][2]
  - **dotnet-dev-certs**: [from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4][2]
  - **dotnet-user-secrets**: [from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC53f7e9b&targetVersion=GC50e695e&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCcdabbaa&targetVersion=GCf9ae0f5&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
2022-03-22 19:04:48 +00:00
DotNet Bot
322355cbc9 Merged PR 21900: [internal/release/6.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:b065b754-67d8-417c-0ef9-08d9d602f120)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b065b754-67d8-417c-0ef9-08d9d602f120
- **Build**: 20220321.27
- **Date Produced**: March 22, 2022 12:41:39 AM UTC
- **Commit**: bee413db0346cd7d46697e5ef00267cf4234c355
- **Branch**: refs/heads/internal/release/6.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.202-servicing.22168.4 to 6.0.202-servicing.22171.27][2]
  - **Microsoft.NET.Sdk**: [from 6.0.202-servicing.22168.4 to 6.0.202-servicing.22171.27][2]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.4 to 6.0.4][3]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7][3]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.4 to 6.0.4][3]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7][3]
  - **dotnet-dev-certs**: [from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7][3]
  - **dotnet-user-secrets**: [from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7][3]

[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCa980151&targetVersion=GCbee413d&_a=files
[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC578ba6d&targetVersion=GCcdabbaa&_a=files

[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.AspNetCore.App.Ref**: from 6.0.4 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)
2022-03-22 01:09:30 +00:00
DotNet Bot
22cdfa11a3 Merged PR 21924: [internal/release/6.0.1xx] Update dependencies from 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.AspNetCore.App.Ref**: from 6.0.4 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20220321.26
- **Date Produced**: March 21, 2022 11:47:29 PM UTC
- **Commit**: 53f7e9bf207e1a7bbe8253692a2087d42f549e18
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.104-servicing.22168.3 to 6.0.104-servicing.22171.26][1]
  - **Microsoft.NET.Sdk**: [from 6.0.104-servicing.22168.3 to 6.0.104-servicing.22171.26][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.4 to 6.0.4][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.4 to 6.0.4][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7][2]
  - **dotnet-dev-certs**: [from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7][2]
  - **dotnet-user-secrets**: [from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC50891b8&targetVersion=GC53f7e9b&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC578ba6d&targetVersion=GCcdabbaa&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
2022-03-22 00:19:13 +00:00
dotnet-bot
c7c896d0bb Merge in 'release/6.0.1xx' changes 2022-03-21 13:25:22 +00:00
Michael Simons
46c2e6ddf7
Refactor build.sh to optimize PackageVersions.props retrieval (#13443) 2022-03-21 08:13:23 -05:00
DotNet Bot
4ff8f79c3d Merged PR 21732: [internal/release/6.0.2xx] Update dependencies from 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.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.3-servicing.22124.3 to 6.0.4-servicing.22165.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.3-servicing.22124.3 to 6.0.4-servicing.22165.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.201 to 6.0.202 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.201-servicing.22123.7 to 6.0.202-servicing.22165.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.201 to 6.0.202 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.3-servicing.22123.7 to 6.0.4-servicing.22164.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0...
2022-03-21 01:08:23 +00:00
DotNet Bot
10e0e1e567 Merged PR 21560: [internal/release/6.0.1xx] Update dependencies from 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.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.3-servicing.22124.3 to 6.0.4-servicing.22165.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.3-servicing.22124.3 to 6.0.4-servicing.22165.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.103 to 6.0.104 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.103-servicing.22123.6 to 6.0.104-servicing.22164.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.103 to 6.0.104 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.3-servicing.22123.7 to 6.0.4-servicing.22164.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.3-servicing.22124.2 to 6.0.4-servicing.22165.3 (parent:...
2022-03-21 01:07:52 +00:00
dotnet-bot
343b232864 Merge in 'release/6.0.2xx' changes 2022-03-17 19:34:25 +00:00
Marc Paine
dfe7f2a2e5
Merge pull request #13442 from MichaelSimons/6.0.2xx-bundled-templates-fix
[release/6.0.2xx] Fix issue with BundledTemplates condition
2022-03-17 12:24:16 -07:00
dotnet-bot
1190bde43a Merge in 'release/6.0.1xx' changes 2022-03-17 18:48:02 +00:00
Marc Paine
3ee3845f3e
Merge pull request #13440 from MichaelSimons/bundled-templates-fix
[release/6.0.1xx] Fix issue with BundledTemplates condition
2022-03-17 11:36:19 -07:00
Michael Simons
57292e300c Make a source-build targetted fix to unblock release 2022-03-17 13:29:45 -05:00
Michael Simons
64addbe5bf Fix issue with BundledTemplates condition 2022-03-17 13:29:36 -05:00
Michael Simons
aff4e2553e Make a source-build targetted fix to unblock release 2022-03-17 12:38:23 -05:00
Michael Simons
fe2e9b9fb8 Fix issue with BundledTemplates condition 2022-03-17 10:57:41 -05:00
dotnet-bot
63878e8eb2 Merge in 'release/6.0.2xx' changes 2022-03-16 01:31:08 +00:00
v-wuzhai
971d5c6e12
Merge pull request #13399 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.2xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.2xx'
2022-03-15 18:17:28 -07:00
dotnet-bot
dec307b02f Merge in 'release/6.0.2xx' changes 2022-03-15 18:11:39 +00:00
dotnet-bot
bd4fdd307c Merge in 'release/6.0.1xx' changes 2022-03-15 18:10:38 +00:00
Logan Bussell
bc714f97e9
[release/6.0.1xx] dotnet watch smoke test (#13392)
* add dotnet watch smoke test
2022-03-15 11:00:38 -07:00
Marc Paine
4938a371ec
Merge pull request #13425 from manodasanW/patch-4
[release/6.0.2xx] Windows SDK projection update
2022-03-15 10:59:26 -07:00
Marc Paine
b0516d4281
Merge pull request #13424 from manodasanW/patch-3
[release/6.0.1xx] Windows SDK projection update
2022-03-15 10:59:23 -07:00
Manodasan Wignarajah
7dbbf21923
[release/6.0.2xx] Windows SDK projection update 2022-03-15 09:25:17 -07:00
Manodasan Wignarajah
3ae2197673
[release/6.0.1xx] Windows SDK projection update 2022-03-15 09:22:56 -07:00
Jason Zhai
b6ca26dd0b Merge branch 'release/6.0.1xx' into release/6.0.2xx 2022-03-15 01:56:45 -07:00
dotnet-bot
634dc053b3 Merge in 'release/6.0.2xx' changes 2022-03-14 21:35:45 +00:00
dotnet-bot
3496d1dcb2 Merge in 'release/6.0.1xx' changes 2022-03-14 21:33:51 +00:00
dotnet-maestro[bot]
a882615ccd
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220311.1 (#13409)
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22158.2 -> To Version 6.0.0-servicing.22161.1

Dependency coherency updates

Microsoft.SourceBuild.Intermediate.source-build
 From Version 0.1.0-alpha.1.21616.4 -> To Version 0.1.0-alpha.1.21519.2 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-03-14 14:26:07 -07:00
dotnet-maestro[bot]
a2621d473d
Update dependencies from https://github.com/dotnet/arcade build 20220311.1 (#13405)
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22122.7 -> To Version 6.0.0-beta.22161.1

Dependency coherency updates

Microsoft.SourceBuild.Intermediate.source-build
 From Version 0.1.0-alpha.1.21616.4 -> To Version 0.1.0-alpha.1.21519.2 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-03-14 14:24:26 -07:00
Marc Paine
c365b60bad
Merge pull request #13390 from dotnet/marcpopMSFT-removemaui601
Remove maui workloads from 6.0.100
2022-03-14 14:22:49 -07:00
dotnet-bot
8e99611236 Merge in 'release/6.0.1xx' changes 2022-03-14 05:50:45 +00:00
v-wuzhai
fbddf9d272
Merge pull request #13402 from dotnet/darc-release/6.0.1xx-d47734a0-c243-46cb-bfbc-f421dd29a3d5
[release/6.0.1xx] Update dependencies from dotnet/arcade
2022-03-13 22:40:48 -07:00
v-wuzhai
79975b9016
Merge pull request #13407 from dotnet/darc-release/6.0.1xx-449458a7-ce3a-4fbe-b142-21f6f78cf1b0
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-03-13 22:38:35 -07:00
dotnet-maestro[bot]
cc5d04d869 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220311.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22160.1 -> To Version 6.0.0-servicing.22161.1
2022-03-12 02:56:09 +00:00
dotnet-bot
ade7ff19a3 Merge in 'release/6.0.1xx' changes 2022-03-12 01:29:57 +00:00
Michael Simons
a6c57692ab
Update source-build MsftToSbSdk.diff baseline (#13400) 2022-03-12 01:18:34 +00:00
dotnet-maestro[bot]
6b3f3a8f02 Update dependencies from https://github.com/dotnet/arcade build 20220311.1
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22159.8 -> To Version 6.0.0-beta.22161.1
2022-03-12 00:40:30 +00:00
dotnet-bot
7eba14c96c Merge in 'release/6.0.1xx' changes 2022-03-11 22:02:04 +00:00
Michael Simons
1b84fc233f
Remove template text-only packages which are alread included in source-build (#13380) 2022-03-11 15:49:32 -06:00
dotnet-bot
bf7f0fb150 Merge in 'release/6.0.2xx' changes 2022-03-11 18:41:29 +00:00
Marc Paine
a623165837
Remove emscripten coherency depedency 2022-03-11 10:29:27 -08:00
dotnet-bot
0a881e8874 Merge in 'release/6.0.2xx' changes 2022-03-11 01:05:01 +00:00
Marc Paine
290291a0da Only do signcheck if there are files to sign check 2022-03-10 16:57:47 -08:00
vseanreesermsft
6f507e2be8
Merge pull request #13346 from vseanreesermsft/internal-merge-6.0.2xx-2022-03-08-1137
Merging internal commits for release/6.0.2xx
2022-03-10 16:55:38 -08:00
Marc Paine
1004682469
Merge pull request #13370 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.2xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.2xx'
2022-03-10 16:53:42 -08:00