Commit graph

24933 commits

Author SHA1 Message Date
dotnet-bot
c104168dea Merge in 'release/6.0.4xx' changes 2023-08-09 17:36:05 +00:00
dotnet-bot
3195b05a14 Merge in 'release/6.0.1xx' changes 2023-08-09 17:34:06 +00:00
dotnet-maestro[bot]
95c297b5f7
[release/6.0.4xx] Update dependencies from dotnet/arcade (#17158)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-08-09 10:27:14 -07:00
dotnet-maestro[bot]
936590bd49
[release/6.0.1xx] Update dependencies from dotnet/arcade (#17161)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-08-09 10:25:31 -07:00
dotnet-bot
829ffca204 Merge in 'release/6.0.1xx' changes 2023-08-09 16:26:36 +00:00
NET Source-Build Bot
f2a927934b
.NET Source-Build 6.0.121 August 2023 Updates (#17149) 2023-08-09 16:18:30 +00:00
DotNet-Bot
4cc5d8c18a Update dependencies from https://github.com/dotnet/arcade build 20230808.5
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.23361.3 -> To Version 6.0.0-beta.23408.5
2023-08-09 15:10:40 +00:00
DotNet-Bot
67ece7f3cb Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230809.2
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.413-servicing.23367.15 -> To Version 6.0.414-servicing.23409.2
2023-08-09 10:15:06 +00:00
dotnet-bot
70625222d7 Merge in 'release/6.0.1xx' changes 2023-08-08 22:17:30 +00:00
Marc Paine
bf10800c27
Merging internal commits for release/6.0.1xx (#17134) 2023-08-08 15:08:38 -07:00
DotNet-Bot
10caa4a7f1 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230808.18
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.413-servicing.23367.15 -> To Version 6.0.414-servicing.23408.18
2023-08-08 21:55:54 +00:00
Matt Thalman
4ace1423c3 Remove extra XML doc entry 2023-08-08 15:32:35 -05:00
DotNet-Bot
5368f4278f Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230808.8
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.316-servicing.23367.14 -> To Version 6.0.317-servicing.23408.8
2023-08-08 19:53:57 +00:00
dotnet-bot
a0ee1198f2 Merge in 'release/6.0.1xx' changes 2023-08-08 19:04:38 +00:00
Omair Majid
2a433a301f
[release/6.01xx] Update source-build CI to Fedora 38 (#16649) 2023-08-08 13:56:41 -05:00
dotnet-bot
a67f7b1147 Merge in 'release/6.0.3xx' changes 2023-08-08 17:59:42 +00:00
dotnet-bot
e914cfd6e9 Merge in 'release/6.0.4xx' changes 2023-08-08 17:56:25 +00:00
Marc Paine
91e4326f3d
Merging internal commits for release/6.0.4xx (#17136) 2023-08-08 10:51:41 -07:00
Marc Paine
04357a1539
Merging internal commits for release/6.0.3xx (#17135) 2023-08-08 10:51:38 -07:00
Marc Paine
418f5d7f1c
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#17129) 2023-08-08 10:48:26 -07:00
Sean Reeser
4f13b144fe Merge commit '10710f7d8e8fa29aea83b7ba59c0e169a7afc008' into internal-merge-6.0.4xx-2023-08-08-1012 2023-08-08 10:12:47 -07:00
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
Jason Zhai
5d764e6709 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-08-07 23:10:07 -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
dotnet-bot
d96a4769eb Merge in 'release/6.0.4xx' changes 2023-08-02 07:29:31 +00:00
Jason Zhai
ace7ff936f Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-08-02 00:23:52 -07:00
v-wuzhai
f06047209a
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#17111) 2023-08-02 00:21:25 -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
Marc Paine
0682e45ad0
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2023-08-01 14:45:25 -07:00
dotnet-bot
0297a50b2c Merge in 'release/6.0.4xx' changes 2023-08-01 21:38:48 +00:00
dotnet-bot
53aa93f036 Merge in 'release/6.0.1xx' changes 2023-08-01 21:38:18 +00:00
Marc Paine
0928e1c83d
Update branding to 6.0.414 (#17106) 2023-08-01 14:30:27 -07: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
fd19247682 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230801.9
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.413-servicing.23367.15 -> To Version 6.0.414-servicing.23401.9
2023-08-01 21:00:12 +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
eccb361192 Update branding to 6.0.414 2023-08-01 11:01:05 -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
DotNet Bot
10710f7d8e Merged PR 32707: [internal/release/6.0.4xx] 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:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_gi...
2023-07-17 21:13:18 +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