Commit graph

25429 commits

Author SHA1 Message Date
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
Ella Hathaway
6b41ecb70a
Update MsftToSbSdk.diff (#19569) 2024-04-24 11:25:10 -07: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-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-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
Michael Yanni
70f9444495
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#19543) 2024-04-19 15:12:50 -07:00
Michael Yanni
d17dd8a47d Merge branch 'release/6.0.4xx' into merge/release/6.0.1xx-to-release/6.0.4xx
# Conflicts:
#	NuGet.config
2024-04-19 14:43:16 -07:00
Ella Hathaway
9255bc013b
Add SBRP DependencyPackageProjects Build Infra (#19419) 2024-04-19 11:07:59 -05:00
v-wuzhai
0f89ff8a9b
[release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages (#19514) 2024-04-17 19:22:40 -07:00
dotnet-maestro[bot]
28f0ea76ee Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240417.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.24172.6 -> To Version 6.0.0-servicing.24217.1
2024-04-17 21:27:04 +00:00
Michael Yanni
16c903fd57
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#19458) 2024-04-12 13:04:10 -07:00
Jacques Eloff
09b5a52c2e
Update WiX to 3.14.1.8722 (#19407) 2024-04-12 11:01:27 -07:00
Jacques Eloff
b931c3d611
Update WiX to 3.14.1.8722 (#19406) 2024-04-12 10:57:49 -07:00
Michael Yanni
37cde3336b
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#19425) 2024-04-11 10:40:24 -07:00
Jason Zhai
073953323a Merge branch 'release/6.0.1xx' into release/6.0.4xx 2024-04-10 22:59:02 -07:00
Michael Yanni
2747184d8d
[release/6.0.4xx] Update dependencies from dotnet/arcade (#19422) 2024-04-10 14:55:51 -07:00
Michael Yanni
5c48c422c3
[release/6.0.1xx] Update dependencies from dotnet/arcade (#19421) 2024-04-10 14:53:39 -07:00
Matt Thalman
8b00bdb59d
Update SB SDK diff baseline (#19414) 2024-04-10 19:45:17 +00:00
dotnet-maestro[bot]
fbfea7c0c3 Update dependencies from https://github.com/dotnet/arcade build 20240404.4
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.24176.9 -> To Version 6.0.0-beta.24204.4
2024-04-10 18:00:04 +00:00
dotnet-maestro[bot]
b7e4f2a9a6 Update dependencies from https://github.com/dotnet/arcade build 20240404.4
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.24176.9 -> To Version 6.0.0-beta.24204.4
2024-04-10 17:57:40 +00:00
Oleksandr Didyk
a976090924
.NET Source-Build 6.0.129 April 2024 Updates (#19371) 2024-04-10 11:35:35 +02:00
Michael Yanni
4969250c8c
Merging internal commits for release/6.0.1xx (#19375) 2024-04-09 14:51:05 -07:00
Michael Yanni
a5a242b3a9
Merging internal commits for release/6.0.4xx (#19374) 2024-04-09 14:51:00 -07:00
Sean Reeser
8ed11380d7 Merge commit '7c9bddb16035cbe6bf19e7cad6d2c694154529b4' into internal-merge-6.0.1xx-2024-04-09-1222 2024-04-09 12:22:33 -07:00
Sean Reeser
5532cc99d6 Merge commit '04f27549cdbdcb0d6784037693769c93ed1de787' into internal-merge-6.0.4xx-2024-04-09-1222 2024-04-09 12:22:24 -07:00
dotnet-sb-bot
4479dc8f02 update global.json and Versions.props for .NET SDK 6.0.129 2024-04-09 19:14:32 +00:00
Marc Paine
d7b3353516
Rewrite testhost.json (#19320) 2024-04-05 13:12:40 -07:00
Jakub Jareš
8f232fb8af
Merge branch 'release/6.0.4xx' into fix-newtonsoft-in-deps-6-0-4xx 2024-04-05 12:56:20 +02:00
Jakub Jareš
6bc4c2adf8 Rewrite testhost.json 2024-04-05 12:52:51 +02:00
Forgind
07e0cabba2
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#19280) 2024-04-03 09:41:12 -07:00
Jason Zhai
3350fd06f2 Merge branch 'release/6.0.1xx' into release/6.0.4xx 2024-04-02 19:41:35 -07:00
Forgind
df8d48bce0
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#18970) 2024-04-02 15:08:32 -07:00
Michael Yanni
4308c39b28
[6.0.1xx] Migrate to 1ES templates for internal builds (#19130)
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
2024-04-02 15:07:15 -07:00
dotnet-maestro[bot]
59b9f4ee08
[release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages (#19149)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2024-04-02 15:06:58 -07:00
dotnet-maestro[bot]
8c3184079c
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#19150)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2024-04-02 15:06:10 -07:00
v-wuzhai
ee8c8a8d63
[release/6.0.1xx] Remove 2.1-5.0 templates (#19236) 2024-04-02 15:04:10 -07:00
Michael Yanni
7696697e0d
[6.0.4xx] Migrate to 1ES templates for internal builds (#19187)
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
2024-04-02 15:03:37 -07:00
Marc Paine
f8245c9bee
[release/6.0.1xx] Update dependencies from dotnet/arcade (#19256) 2024-04-02 14:40:28 -07:00
Marc Paine
cadad63f21
[release/6.0.4xx] Update dependencies from dotnet/arcade (#19254) 2024-04-02 14:40:25 -07:00
Marc Paine
4eb2b30db4
Update branding to 6.0.422 (#19270) 2024-04-02 14:38:59 -07:00
Marc Paine
9ad02d27ea
Update branding to 6.0.130 (#19269) 2024-04-02 14:38:56 -07:00
Sean Reeser
71acbd380f Update branding to 6.0.422 2024-04-02 11:55:40 -07:00
Sean Reeser
6ec2902bf9 Update branding to 6.0.130 2024-04-02 11:55:35 -07:00
dotnet-maestro[bot]
d30a98c1f7 Update dependencies from https://github.com/dotnet/arcade build 20240326.9
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.24163.13 -> To Version 6.0.0-beta.24176.9
2024-04-01 22:19:12 +00:00
dotnet-maestro[bot]
a07cb5e274 Update dependencies from https://github.com/dotnet/arcade build 20240326.9
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.24163.13 -> To Version 6.0.0-beta.24176.9
2024-04-01 22:19:05 +00:00
DotNet Bot
7c9bddb160 Merged PR 38481: [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.29 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.29-servicing.24169.26 to 6.0.29-servicing.24171.9 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.29-servicing.24169.26 to 6.0.29-servicing.24171.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.29-servicing.24169.15 to 6.0.29-servicing.24171.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.29-servicing.24169.12 to 6.0.29-servicing.24171.7 (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**:
- **Date Produced**: March 22, 2024 4:35:37 PM UTC
- **Commit**: c5a811d50196cfc9525891c16b256ee4962b20e1
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.129-servicing.24171.13 to 6.0.129-servicing.24172.15][1]
  - **Microsoft.NET.Sdk**: [from 6.0.129-servicing.24171.13 to 6.0.129-servicing.24172.15][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.29 to 6.0.29][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.29-servicing.24169.26 to 6.0.29-servicing.24171.9][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.29-servicing.24169.26 to 6.0.29-servicing.24171.9][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.29 to 6.0.29][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.29-servicing.24169.15 to 6.0.29-servicing.24171.6][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.29 to 6.0.29][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.29-servicing.24169.12 to 6.0.29-servicing.24171.7][4]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC2b0455d3437ef2eb6fdf72a2e306d644b601860a&targetVersion=GCc5a811...
2024-03-22 17:14:54 +00:00