Commit graph

25475 commits

Author SHA1 Message Date
Forgind
9691661f08
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#19882) 2024-06-05 07:24:12 -07:00
Jason Zhai
383f5b9c8c Merge branch 'release/6.0.1xx' into release/6.0.4xx 2024-06-04 22:58:02 -07:00
Marc Paine
b3059959aa
Disable CG on PR builds (#19796) 2024-06-04 16:00:32 -07:00
v-wuzhai
3221daed6f
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#19836) 2024-06-04 03:01:04 +00:00
Wenwen
c6cdec7ef1
Update 6.0 SDK diff test baseline (#19858) 2024-05-29 08:00:24 -05:00
NET Source-Build Bot
6da1788bab
.NET Source-Build 6.0.131 May 2024 Updates (#19856) 2024-05-28 23:39:21 +00:00
Jason Zhai
42f4263bba Merge branch 'release/6.0.1xx' into release/6.0.4xx 2024-05-22 22:39:01 -07:00
Ella Hathaway
35e9dc1c22
Update 6.0 Test Baselines (#19798) 2024-05-22 10:38:28 -07:00
Michael Simons
c67756174d
[release/6.0.1xx] Update 6.0 source-build CI distro matrix (#19828)
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
2024-05-22 10:43:15 -05:00
dotnet-maestro[bot]
45db330cbd
[release/6.0.4xx] Update dependencies from dotnet/arcade (#19806)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2024-05-20 14:36:23 -07:00
dotnet-maestro[bot]
aac91328f1
[release/6.0.1xx] Update dependencies from dotnet/arcade (#19805)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2024-05-20 14:35:52 -07:00
Marc Paine
c0318f0c90
Disable CG on PR builds 2024-05-17 13:51:35 -07:00
dotnet-maestro[bot]
9f98e10e56
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#19773)
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2024-05-17 19:14:16 +00:00
dotnet-maestro[bot]
1293b87cff
[release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages (#19772)
[release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages
2024-05-17 19:12:18 +00:00
Marc Paine
627b9287f0
Update branding to 6.0.132 (#19781) 2024-05-17 11:26:58 -07:00
Marc Paine
31efcd5e7d
Update branding to 6.0.424 (#19782) 2024-05-17 11:26:56 -07:00
Sean Reeser
6dd1a6d039 Update branding to 6.0.424 2024-05-16 17:40:06 -07:00
Sean Reeser
ebf9c02c90 Update branding to 6.0.132 2024-05-16 17:40:02 -07:00
v-wuzhai
c1eda3c9af
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#19762) 2024-05-15 22:38:41 -07:00
Marc Paine
a4b6c201cf
[release/6.0.4xx] Update to later version of nuget (#19757) 2024-05-15 14:16:23 -07:00
Marc Paine
dc33740b7d
Update to later version of nuget (#19756) 2024-05-15 14:16:03 -07:00
v-wuzhai
40e4ab7ed8
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#19753) 2024-05-15 02:48:10 -07:00
Jason Zhai
39729d8949 Merge branch 'release/6.0.1xx' into release/6.0.4xx 2024-05-14 23:07:06 -07:00
Marc Paine
a407745f76 Update to later version of nuget 2024-05-15 00:17:51 +00:00
Marc Paine
43ff23c646
Update to later version of nuget 2024-05-14 17:15:50 -07:00
NET Source-Build Bot
d3db392d69
.NET Source-Build 6.0.130 May 2024 Updates (#19751) 2024-05-14 14:50:31 -07:00
Marc Paine
259d4d36e1
Merging internal commits for release/6.0.1xx (#19744) 2024-05-14 13:38:48 -07:00
Marc Paine
81c3660f88
Merging internal commits for release/6.0.4xx (#19745) 2024-05-14 11:52:30 -07:00
Sean Reeser
d72263767e Merge commit 'ae2bd4ec541f39c094376bdbc14138a38ec4caa1' into internal-merge-6.0.4xx-2024-05-14-1028 2024-05-14 10:28:37 -07:00
Sean Reeser
5ec71d06e8 Merge commit 'a883df0be948105c30b07338b747301318cdc2bc' into internal-merge-6.0.1xx-2024-05-14-1028 2024-05-14 10:28:27 -07:00
dotnet-maestro-bot
a94d7b39b3
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#19688)
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
2024-05-06 20:44:40 +00:00
Matt Thalman
9e764900e8
Migrate security-partners-dotnet pipeline to 1ES (#19621) 2024-05-06 14:19:05 -05:00
v-wuzhai
6f09d2c420
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#19583) 2024-05-05 23:21:58 -07:00
Jason Zhai
ca14d50f79 Merge branch 'release/6.0.1xx' into release/6.0.4xx 2024-05-05 20:07:04 -07:00
Marc Paine
f1352c6bd7
Update branding to 6.0.423 (#19625) 2024-05-02 10:58:18 -07:00
Marc Paine
e4118ea665
Update branding to 6.0.131 (#19624) 2024-05-02 10:58:14 -07:00
Sean Reeser
9175bb16aa Update branding to 6.0.423 2024-05-01 14:46:20 -07:00
Sean Reeser
e0f3d157d2 Update branding to 6.0.131 2024-05-01 14:46:16 -07:00
DotNet Bot
ae2bd4ec54 Merged PR 39289: [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.DotNet.Common.ItemTemplates**: from 6.0.422 to 6.0.422 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.422-rtm.24219.4 to 6.0.422-rtm.24229.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.422 to 6.0.422 (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**: 20240429.15
- **Date Produced**: April 29, 2024 10:47:36 PM UTC
- **Commit**: b47e9d314726020921851f007797b479a5f6905e
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.422-servicing.24219.30 to 6.0.422-servicing.24229.15][1]
  - **Microsoft.NET.Sdk**: [from 6.0.422-servicing.24219.30 to 6.0.422-servicing.24229.15][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.422 to 6.0.422][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.422-rtm.24219.4 to 6.0.422-rtm.24229.7][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.422 to 6.0.422][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC8cf6c33a08b323b46d298b83937a623059638611&targetVersion=GCb47e9d314726020921851f007797b479a5f6905e&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCeffe0d00ab994d57a5e1334667dec144f9f2a9e9&targetVersion=GC086db5520af132ac32dcf8cce8ad4d561b868363&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
2024-04-29 23:13:26 +00:00
DotNet Bot
a883df0be9 Merged PR 39288: [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.DotNet.Common.ItemTemplates**: from 6.0.130 to 6.0.130 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.130-servicing.24216.15 to 6.0.130-servicing.24229.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.130 to 6.0.130 (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**: 20240429.17
- **Date Produced**: April 29, 2024 10:42:03 PM UTC
- **Commit**: 0aff0db725f3979688ed1d6692f3507dc0e2daa2
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.130-servicing.24222.5 to 6.0.130-servicing.24229.17][1]
  - **Microsoft.NET.Sdk**: [from 6.0.130-servicing.24222.5 to 6.0.130-servicing.24229.17][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.130 to 6.0.130][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.130-servicing.24216.15 to 6.0.130-servicing.24229.9][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.130 to 6.0.130][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC214a5b1a89eab20d08419f9a446807ed91e48f25&targetVersion=GC0aff0db725f3979688ed1d6692f3507dc0e2daa2&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCded0b713ad5db1c4cd83c8287624355038b864b4&targetVersion=GCf9d1cd96d58bf8e5fb569eaef4956089817c2842&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
2024-04-29 23:10:46 +00:00
dotnet-bot
927251530e Merge in 'release/6.0.1xx' changes 2024-04-24 18:34:52 +00:00
Ella Hathaway
6b41ecb70a
Update MsftToSbSdk.diff (#19569) 2024-04-24 11:25:10 -07:00
Sean Reeser
9efa2d1b46 Merged PR 39163: Deleted Source Build patch for format repo 0002-Add-explicit-System.Text.Json...
Deleted Source Build patch for format repo 0002-Add-explicit-System.Text.Json-dependency.patch
2024-04-23 21:23:09 +00:00
dotnet-bot
be9294ee9c Merge in 'release/6.0.4xx' changes 2024-04-23 02:17:18 +00:00
v-wuzhai
1ac85a9fd3
[release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages (#19557) 2024-04-22 19:07:51 -07:00
dotnet-bot
ec841bc3e4 Merge in 'release/6.0.1xx' changes 2024-04-22 20:57:50 +00:00
dotnet-maestro[bot]
201e451886
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#19556)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2024-04-22 13:48:05 -07:00
DotNet Bot
0ac2d170a8 Merged PR 39127: [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.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.29-servicing.24171.9 to 6.0.30-servicing.24217.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.29-servicing.24171.9 to 6.0.30-servicing.24217.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.129 to 6.0.130 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.129-servicing.24171.8 to 6.0.130-servicing.24216.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.129 to 6.0.130 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.29-servicing.24171.6 to 6.0.30-servicing.24216.19 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.29-servicing.24171.7 to 6.0.30-servicing.24216.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
...
2024-04-22 20:43:25 +00:00
DotNet Bot
1e32a8348f Merged PR 39109: [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.DotNet.Common.ItemTemplates**: from 6.0.422 to 6.0.422 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.422-rtm.24218.5 to 6.0.422-rtm.24219.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.422 to 6.0.422 (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**: 20240419.30
- **Date Produced**: April 20, 2024 1:55:25 AM UTC
- **Commit**: 8cf6c33a08b323b46d298b83937a623059638611
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.422-servicing.24218.15 to 6.0.422-servicing.24219.30][1]
  - **Microsoft.NET.Sdk**: [from 6.0.422-servicing.24218.15 to 6.0.422-servicing.24219.30][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.422 to 6.0.422][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.422-rtm.24218.5 to 6.0.422-rtm.24219.4][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.422 to 6.0.422][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC2633fcf4a1c687675464ba179c5c79ad5e75a237&targetVersion=GC8cf6c33a08b323b46d298b83937a623059638611&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCef00e74f0a21b8a8192c1c409c154070ef39b95e&targetVersion=GCeffe0d00ab994d57a5e1334667dec144f9f2a9e9&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
2024-04-22 19:41:34 +00:00
dotnet-maestro[bot]
c88ad5affe Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240422.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.24217.1 -> To Version 6.0.0-servicing.24222.1
2024-04-22 18:06:16 +00:00