Commit graph

25219 commits

Author SHA1 Message Date
dotnet-bot
2ee5d1eef6 Merge in 'release/6.0.4xx' changes 2024-02-12 17:51:53 +00:00
github-actions[bot]
b30ddf54fe
[release/6.0.4xx] Update to latest WiX version (#18607)
Co-authored-by: Jacques Eloff <joeloff@users.noreply.github.com>
2024-02-12 09:43:14 -08:00
dotnet-bot
cd3210ccdf Merge in 'release/6.0.4xx' changes 2024-02-09 01:28:56 +00:00
v-wuzhai
f0110f5f5c
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#18542) 2024-02-08 17:20:32 -08:00
Jason Zhai
286d227a78 Merge branch 'release/6.0.1xx' into release/6.0.4xx 2024-02-06 22:13:08 -08:00
v-wuzhai
0f86d2e134
Update branding to 6.0.128 (#18527) 2024-02-06 18:45:37 -08:00
dotnet-bot
dd6a4d8c36 Merge in 'release/6.0.4xx' changes 2024-02-06 22:31:26 +00:00
vseanreesermsft
a9611179db
Update branding to 6.0.420 (#18528) 2024-02-06 14:23:02 -08:00
Sean Reeser
f32ea3eca6 Update branding to 6.0.128 2024-02-06 12:11:27 -08:00
DotNet Bot
2dae3fec70 Merged PR 36689: [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.27 to 6.0.27 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.27-servicing.24067.4 to 6.0.27-servicing.24070.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.27-servicing.24067.4 to 6.0.27-servicing.24070.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.27-servicing.24066.28 to 6.0.27-servicing.24069.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.27-servicing.24067.9 to 6.0.27-servicing.24070.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.27-servicing.24067.9 to 6.0.27-servicing.24070.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.27-servicing.24067.9 to 6.0.27-servicing.24070.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.27-servicing.24067.9 to 6.0.27-servicing.24070.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.419 to 6.0.419 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.419-rtm.24067.1 to 6.0.419-rtm.24070.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.419 to 6.0.419 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.27-servicing.24067.5 to 6.0.27-servicing.24070.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.27 to 6.0.27 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.27-servicing.24067.2 to 6.0.27-servicing.24070.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **VS.Redist....
2024-01-21 17:44:38 +00:00
DotNet Bot
17ffde1590 Merged PR 36658: [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**:
  - **NuGet.Build.Tasks**: from 6.3.3-rc.3 to 6.3.4-rc.2 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20240118.70
- **Date Produced**: January 19, 2024 5:50:03 AM UTC
- **Commit**: 73488a9d44f28afcde25d918c914d796be481792
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.419-servicing.24068.22 to 6.0.419-servicing.24068.70][1]
  - **Microsoft.NET.Sdk**: [from 6.0.419-servicing.24068.22 to 6.0.419-servicing.24068.70][1]
  - **NuGet.Build.Tasks**: [from 6.3.3-rc.3 to 6.3.4-rc.2][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCac40f93a6256add2d43ac56332518b82ac8726a4&targetVersion=GC73488a9d44f28afcde25d918c914d796be481792&_a=files
[2]: https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted/branches?baseVersion=GC5e444458a8c4a2dac9806fc1d387b7f157669540&targetVersion=GC5e444458a8c4a2dac9806fc1d387b7f157669540&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
2024-01-19 17:41:03 +00:00
DotNet-Bot
7cd79ed951 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240118.70
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.419-servicing.24068.22 -> To Version 6.0.419-servicing.24068.70

Dependency coherency updates

NuGet.Build.Tasks
 From Version 6.3.3-rc.3 -> To Version 6.3.4-rc.2 (parent: Microsoft.NET.Sdk
2024-01-19 06:09:06 +00:00
DotNet Bot
6405b4c3bd Merged PR 36616: [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.26 to 6.0.27 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.26-servicing.23605.4 to 6.0.27-servicing.24067.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.26-servicing.23605.4 to 6.0.27-servicing.24067.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.26-servicing.23605.8 to 6.0.27-servicing.24066.28 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.26-servicing.23605.6 to 6.0.27-servicing.24067.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23605.6 to 6.0.27-servicing.24067.9 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.26-servicing.23605.6 to 6.0.27-servicing.24067.9 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.26-servicing.23605.6 to 6.0.27-servicing.24067.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.418 to 6.0.419 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.418-rtm.23605.6 to 6.0.419-rtm.24067.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.418 to 6.0.419 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.26-servicing.23605.5 to 6.0.27-servicing.24067.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.26-servicing.23605.3 to 6.0.27-servicing.24067.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **VS.Redist.C...
2024-01-18 18:20:27 +00:00
dotnet-bot
469991ed34 Merge in 'release/6.0.4xx' changes 2024-01-16 22:47:22 +00:00
Marc Paine
6034134ce4
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#18175) 2024-01-16 14:39:45 -08:00
Ella Hathaway
bf9a94271e
Update MsftToSbSdk.diff baseline (#18205) 2024-01-10 23:22:15 +00:00
DotNet Bot
15e9330aa8 Merged PR 35911: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20240109.36
- **Date Produced**: January 10, 2024 6:22:10 AM UTC
- **Commit**: 27f723cb002f38336f60be5644dbe9e59cb2678a
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.418-servicing.23605.39 to 6.0.419-servicing.24059.36][3]
  - **Microsoft.NET.Sdk**: [from 6.0.418-servicing.23605.39 to 6.0.419-servicing.24059.36][3]

[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1209a0007f12258907100d2ae06eaf8ef98c69e4&targetVersion=GC27f723cb002f38336f60be5644dbe9e59cb2678a&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
2024-01-10 21:45:33 +00:00
dotnet-bot
49237a39a1 Merge in 'release/6.0.4xx' changes 2024-01-10 19:56:32 +00:00
dotnet-maestro[bot]
9bfe9ba33e
[release/6.0.4xx] Update dependencies from dotnet/arcade (#18198)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2024-01-10 11:46:50 -08:00
dotnet-maestro[bot]
aeb5cae516
[release/6.0.1xx] Update dependencies from dotnet/arcade (#18200)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2024-01-10 11:46:22 -08:00
Jason Zhai
b29e3f9405 Merge branch 'release/7.0.4xx' into release/8.0.1xx 2024-01-10 00:41:02 -08:00
DotNet-Bot
48bba8fffc Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240109.36
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.418-servicing.23605.39 -> To Version 6.0.419-servicing.24059.36
2024-01-10 06:42:22 +00:00
dotnet-bot
b4b6453738 Merge in 'release/6.0.4xx' changes 2024-01-10 02:50:48 +00:00
v-wuzhai
0cf4403bee
[release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages (#18180) 2024-01-09 18:42:55 -08:00
dotnet-maestro[bot]
5c2dd5b5cc Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240109.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22580.2 -> To Version 6.0.0-servicing.24059.1
2024-01-10 01:31:14 +00:00
dotnet-bot
fe5794c7e9 Merge in 'release/6.0.4xx' changes 2024-01-10 00:25:37 +00:00
Marc Paine
6672beff8d
Merging internal commits for release/6.0.1xx (#18160) 2024-01-09 16:19:49 -08:00
Marc Paine
0e483b7ed1
Merging internal commits for release/6.0.3xx (#18158) 2024-01-09 16:17:32 -08:00
Marc Paine
4bd70a6f3a
Merging internal commits for release/6.0.4xx (#18159) 2024-01-09 16:17:29 -08:00
NET Source-Build Bot
e063df5601
.NET Source-Build 6.0.126 January 2024 Updates (#18155) 2024-01-09 20:23:36 +00:00
Sean Reeser
aa45fea5d5 Merge commit '06a93b906c5570bbbdc1a446b4a203d598202c39' into internal-merge-6.0.1xx-2024-01-09-1127 2024-01-09 11:27:51 -08:00
Sean Reeser
d0166f584e Merge commit '21f869269cd98994015d2efbc1c4ab1b2c0beec7' into internal-merge-6.0.4xx-2024-01-09-1127 2024-01-09 11:27:43 -08:00
Sean Reeser
1441f62d70 Merge commit '61baf6999b6dc9e31fc8055f8c32e1ec3d0a98b2' into internal-merge-6.0.3xx-2024-01-09-1127 2024-01-09 11:27:33 -08:00
dotnet-bot
ef7f674ebf Merge in 'release/6.0.4xx' changes 2024-01-04 20:34:05 +00:00
Forgind
af08db0754
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#18077) 2024-01-04 12:26:20 -08:00
Forgind
0f0192eaad
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#18081) 2024-01-03 14:03:16 -08:00
DotNet-Bot
b8afc58d33 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240103.9
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.418-servicing.23605.39 -> To Version 6.0.419-servicing.24053.9
2024-01-03 18:20:09 +00:00
Jason Zhai
d2db5bd104 Merge branch 'release/6.0.4xx' into release/7.0.1xx 2024-01-02 23:05:11 -08:00
Jason Zhai
337c2716d6 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2024-01-02 22:56:31 -08:00
Marc Paine
b39d737b27
Update branding to 6.0.127 (#18070) 2024-01-02 16:15:15 -08:00
Marc Paine
08bedaf218
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#17917) 2024-01-02 15:40:31 -08:00
dotnet-bot
b1c3cfcb85 Merge in 'release/6.0.4xx' changes 2024-01-02 23:17:08 +00:00
Marc Paine
fc5eda0b18
Update branding to 6.0.322 (#18071) 2024-01-02 15:09:30 -08:00
Marc Paine
57aaeba60f
Update branding to 6.0.419 (#18072) 2024-01-02 15:09:20 -08:00
Sean Reeser
9c3dc27baa Update branding to 6.0.419 2024-01-02 13:57:55 -08:00
Sean Reeser
b015286fbf Update branding to 6.0.322 2024-01-02 13:57:51 -08:00
Sean Reeser
fc65f1f49b Update branding to 6.0.127 2024-01-02 13:57:46 -08:00
Matt Thalman
44d4ecfd32
Add back security-partners-dotnet pipeline (#17955) 2023-12-14 11:13:37 -06:00
DotNet-Bot
8bb85379f1 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231211.6
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.418-servicing.23605.39 -> To Version 6.0.418-servicing.23611.6
2023-12-11 16:06:00 +00:00
Jason Zhai
e953162a92 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-12-05 22:14:02 -08:00