Commit graph

24135 commits

Author SHA1 Message Date
Sean Reeser
ea9b0feb0e Merge commit '5d26c38ee96606c1e474039d445c27cba6d2b229' into internal-merge-6.0.3xx-2023-08-08-1012 2023-08-08 10:12:38 -07:00
Sean Reeser
f8278428f7 Merge commit '00e4340849d26c84e65f750acb91355d4c40f9ae' into internal-merge-6.0.1xx-2023-08-08-1012 2023-08-08 10:12:29 -07:00
dotnet-bot
7611b7220e Merge in 'release/6.0.3xx' changes 2023-08-08 06:07:58 +00:00
v-wuzhai
8dd5e6171b
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#17006) 2023-08-07 22:59:48 -07:00
Jason Zhai
ace7ff936f Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-08-02 00:23:52 -07:00
DotNet-Bot
fe9469ff1c Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230801.20
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.316-servicing.23367.14 -> To Version 6.0.317-servicing.23401.20
2023-08-01 23:37:34 +00:00
dotnet-bot
53aa93f036 Merge in 'release/6.0.1xx' changes 2023-08-01 21:38:18 +00:00
Marc Paine
41fa0fb5c5
Update branding to 6.0.122 (#17104) 2023-08-01 14:30:19 -07:00
DotNet-Bot
4e40396054 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230801.7
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.316-servicing.23367.14 -> To Version 6.0.317-servicing.23401.7
2023-08-01 21:01:13 +00:00
dotnet-bot
c99e58a539 Merge in 'release/6.0.3xx' changes 2023-08-01 19:12:05 +00:00
Marc Paine
d867a33063
Update branding to 6.0.317 (#17105) 2023-08-01 12:04:00 -07:00
Sean Reeser
9beeb9ef34 Update branding to 6.0.317 2023-08-01 11:01:00 -07:00
Sean Reeser
4ccaa3edee Update branding to 6.0.122 2023-08-01 11:00:55 -07:00
Matt Thalman
b0dda375d1 Merged PR 32726: Update SB test baselines
This reverts the changes that were made in https://github.com/dotnet/installer/pull/16959 and https://github.com/dotnet/installer/pull/16972. These changes only apply to the internal repo.
2023-07-18 20:37:24 +00:00
dotnet-bot
5b0d71301f Merge in 'release/6.0.1xx' changes 2023-07-18 15:44:04 +00:00
Matt Thalman
63943c0014
Update SB SDK diff baseline (#16972) 2023-07-18 08:35:41 -07:00
Matt Mitchell
00e4340849 Merged PR 32708: Remove applied source build patch
- Please add description for changes you are making.
- If there is an issue related to this PR, please add the reference.

Remove applied source build patch
2023-07-17 22:00:26 +00:00
Matt Mitchell
5d26c38ee9 Merged PR 32709: Remove applied source build patch
- Please add description for changes you are making.
- If there is an issue related to this PR, please add the reference.

Remove applied source build patch
2023-07-17 21:09:22 +00:00
DotNet Bot
98f27054ba Merged PR 32706: [internal/release/6.0.3xx] 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.21 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.21-servicing.23364.1 to 6.0.21-servicing.23367.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.21-servicing.23364.1 to 6.0.21-servicing.23367.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.20-servicing.23320.17 to 6.0.21-servicing.23363.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.20-servicing.23320.17 to 6.0.21-servicing.23363.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.21 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.21-servicing.23363.15 to 6.0.21-servicing.23364.38 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.21 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.21-servicing.23363.15 to 6.0.21-servicing.23364.38 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.21-servicing.23363.15 to 6.0.21-servicing.23364.38 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.21-servicing.23363.15 to 6.0.21-servicing.23364.38 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.21 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.21-servicing.23363.11 to 6.0.21-servicing.23364.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.21 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.21-servicing.23363.8 to 6.0.21-servicing.23364.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://dev.azure.com/dnceng/internal/_gi...
2023-07-17 19:44:38 +00:00
DotNet-Bot
4dce61d3fa Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230717.14
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.316-servicing.23364.13 -> To Version 6.0.316-servicing.23367.14

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 6.0.21 -> To Version 6.0.21 (parent: Microsoft.NET.Sdk
2023-07-17 19:38:09 +00:00
DotNet Bot
6fa0f1b887 Merged PR 32700: [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.21 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.21-servicing.23364.1 to 6.0.21-servicing.23367.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.21-servicing.23364.1 to 6.0.21-servicing.23367.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.21 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.21-servicing.23363.15 to 6.0.21-servicing.23364.38 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.21 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.21-servicing.23363.15 to 6.0.21-servicing.23364.38 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.21-servicing.23363.15 to 6.0.21-servicing.23364.38 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.21-servicing.23363.15 to 6.0.21-servicing.23364.38 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.21 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.21-servicing.23363.11 to 6.0.21-servicing.23364.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.21 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.21-servicing.23363.8 to 6.0.21-servicing.23364.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[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**: 20230717.13
- **Date Produced**: July 17, 2023 6:56:40 PM UTC
- **Commit**: 1f77c362a752e25c643140f014af4ee0a05fce4b
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.121-servicing.23364.11 to 6.0.121-servicing.23367.13][1]
  - **Microsoft.NET.Sdk**: [from 6.0.121-servicing.23364.11 to 6.0.121-servicing.23367.13][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.21 to 6.0.21][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.21-serv...
2023-07-17 19:34:18 +00:00
DotNet-Bot
08035c4074 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230717.13
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.121-servicing.23364.11 -> To Version 6.0.121-servicing.23367.13

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 6.0.21 -> To Version 6.0.21 (parent: Microsoft.NET.Sdk
2023-07-17 19:29:33 +00:00
DotNet Bot
1a18daf344 Merged PR 32636: [internal/release/6.0.3xx] 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.20 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.20-servicing.23321.10 to 6.0.21-servicing.23364.1 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.20-servicing.23321.10 to 6.0.21-servicing.23364.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.20-servicing.23321.6 to 6.0.21-servicing.23363.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.20-servicing.23321.6 to 6.0.21-servicing.23363.15 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.20-servicing.23321.6 to 6.0.21-servicing.23363.15 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.20-servicing.23321.6 to 6.0.21-servicing.23363.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.315 to 6.0.316 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.315-servicing.23322.5 to 6.0.316-servicing.23363.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.315 to 6.0.316 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.20-servicing.23321.4 to 6.0.21-servicing.23363.11 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.20-servicing.23321.8 to 6.0.21-servicing.23363.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9
- **Build**: 20230714.13
- **Date Produced**: July 14, 2023 12:47:47 PM UTC
- **Commit**: 1439d8bce6207584e4f75fb24691d2f146b93be5
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSB...
2023-07-14 13:39:54 +00:00
DotNet Bot
93429caeb2 Merged PR 32635: [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.20 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.20-servicing.23321.10 to 6.0.21-servicing.23364.1 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.20-servicing.23321.10 to 6.0.21-servicing.23364.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.20-servicing.23320.17 to 6.0.21-servicing.23363.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.20-servicing.23321.6 to 6.0.21-servicing.23363.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.20-servicing.23321.6 to 6.0.21-servicing.23363.15 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.20-servicing.23321.6 to 6.0.21-servicing.23363.15 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.20-servicing.23321.6 to 6.0.21-servicing.23363.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.120 to 6.0.121 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.120-servicing.23322.4 to 6.0.121-servicing.23363.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.120 to 6.0.121 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.20-servicing.23321.4 to 6.0.21-servicing.23363.11 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.20 to 6.0.21 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.20-servicing.23321.8 to 6.0.21-servicing.23363.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x6...
2023-07-14 13:39:54 +00:00
DotNet-Bot
ed642f02d8 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230714.13
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.315-servicing.23322.16 -> To Version 6.0.316-servicing.23364.13

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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
 From Version 6.0.20 -> To Version 6.0.21 (parent: Microsoft.NET.Sdk
2023-07-14 13:05:58 +00:00
DotNet-Bot
5db1934e43 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230714.11
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.120-servicing.23322.14 -> To Version 6.0.121-servicing.23364.11

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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.20 -> To Version 6.0.21 (parent: Microsoft.NET.Sdk
2023-07-14 13:05:29 +00:00
DotNet Bot
1d8493312b Merged PR 32552: [internal/release/6.0.3xx] Update dependencies from dotnet/arcade
This pull request updates the following dependencies

[marker]: <> (Begin:6d383863-e2a5-4edc-fb90-08da32c10934)
## From https://github.com/dotnet/arcade
- **Subscription**: 6d383863-e2a5-4edc-fb90-08da32c10934
- **Build**: 20230711.3
- **Date Produced**: July 11, 2023 9:00:39 PM UTC
- **Commit**: cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34
- **Branch**: refs/heads/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Arcade.Sdk**: [from 6.0.0-beta.23313.5 to 6.0.0-beta.23361.3][1]
  - **Microsoft.DotNet.Build.Tasks.Installers**: [from 6.0.0-beta.23313.5 to 6.0.0-beta.23361.3][1]
  - **Microsoft.DotNet.CMake.Sdk**: [from 6.0.0-beta.23313.5 to 6.0.0-beta.23361.3][1]

[1]: 91616785a1...cd79d2e8f7

[DependencyUpdate]: <> (End)

- **Updates to .NET SDKs:**
  - Updates tools.dotnet to 6.0.120

[marker]: <> (End:6d383863-e2a5-4edc-fb90-08da32c10934)
2023-07-14 03:24:52 +00:00
dotnet-bot
285100665a Merge in 'release/6.0.3xx' changes 2023-07-13 18:36:36 +00:00
Marc Paine
14ef081cb6
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#16970) 2023-07-13 11:27:45 -07:00
Jason Zhai
5c7af0f162 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-07-12 20:01:36 -07:00
dotnet-bot
30943937b3 Merge in 'release/6.0.1xx' changes 2023-07-12 21:02:42 +00:00
dotnet-maestro[bot]
5677e50878
[release/6.0.1xx] Update dependencies from dotnet/arcade (#16969)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-07-12 13:53:44 -07:00
DotNet-Bot
d1ab1020fd Update dependencies from https://github.com/dotnet/arcade build 20230711.3
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.23313.5 -> To Version 6.0.0-beta.23361.3
2023-07-12 18:35:57 +00:00
dotnet-bot
7b89b61f03 Merge in 'release/6.0.3xx' changes 2023-07-12 18:30:19 +00:00
Forgind
75f4ed5036
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#16949) 2023-07-12 11:21:44 -07:00
dotnet-bot
a34b113b63 Merge in 'release/6.0.1xx' changes 2023-07-12 16:58:53 +00:00
Matt Thalman
f326414f09
Update MissingXmlDoc baseline (#16959) 2023-07-12 16:50:32 +00:00
Jason Zhai
eb232fd2eb Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-07-11 23:03:16 -07:00
dotnet-bot
e4da153c52 Merge in 'release/6.0.1xx' changes 2023-07-11 19:09:06 +00:00
NET Source-Build Bot
03de5438b7
.NET Source-Build 6.0.120 July 2023 Updates (#16942) 2023-07-11 14:01:05 -05:00
dotnet-bot
96433bf8ee Merge in 'release/6.0.1xx' changes 2023-07-11 18:55:52 +00:00
Marc Paine
810f8e82ba
Merging internal commits for release/6.0.1xx (#16937) 2023-07-11 11:47:50 -07:00
dotnet-bot
50c0dad894 Merge in 'release/6.0.3xx' changes 2023-07-11 18:44:46 +00:00
Marc Paine
eb4b20c720
Merging internal commits for release/6.0.3xx (#16938) 2023-07-11 11:35:33 -07:00
Sean Reeser
8ad8121e95 Merge commit '2282fe998c54635c744653971f1903f98a33d49b' into internal-merge-6.0.3xx-2023-07-11-1016 2023-07-11 10:16:57 -07:00
Sean Reeser
3ee1863ab0 Merge commit 'd63b17be66f766a5381950bce677884e4e3bb5b6' into internal-merge-6.0.1xx-2023-07-11-1016 2023-07-11 10:16:47 -07:00
dotnet-bot
eb79b57356 Merge in 'release/6.0.3xx' changes 2023-07-07 20:15:57 +00:00
dotnet-maestro-bot
fd5696554a
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#16898)
Co-authored-by: Nikola Milosavljevic <nikolam@microsoft.com>
Co-authored-by: Sean Reeser <v-seanreeser@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
2023-07-07 13:07:58 -07:00
dotnet-bot
827f0bbd97 Merge in 'release/6.0.1xx' changes 2023-07-06 13:46:46 +00:00
Matt Thalman
bd99c96e72
Include RID in SB artifact file names (#16855) 2023-07-06 08:40:35 -05:00