Commit graph

25643 commits

Author SHA1 Message Date
dotnet-bot
e44e8593a8 Merge in 'release/6.0.4xx' changes 2024-03-14 21:52:56 +00:00
dotnet-maestro[bot]
614fd28fba
[release/6.0.4xx] Update dependencies from dotnet/arcade (#19058)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2024-03-14 14:43:34 -07:00
dotnet-maestro[bot]
a4fd17a84f Update dependencies from https://github.com/dotnet/arcade build
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.24162.4 -> To Version 6.0.0-beta.24163.13
2024-03-14 20:33:56 +00:00
dotnet-bot
02ce9ca75c Merge in 'release/6.0.4xx' changes 2024-03-14 17:42:42 +00:00
dotnet-bot
daf83c33c8 Merge in 'release/6.0.1xx' changes 2024-03-14 17:42:30 +00:00
Marc Paine
839c8a5400
Merging internal commits for release/6.0.4xx (#18998) 2024-03-14 10:33:27 -07:00
Marc Paine
fb7f8a3b04
Merging internal commits for release/6.0.1xx (#18997) 2024-03-14 10:33:21 -07:00
dotnet-bot
bb4f0f1be8 Merge in 'release/6.0.1xx' changes 2024-03-13 21:46:08 +00:00
dotnet-bot
72c73e3a2f Merge in 'release/6.0.4xx' changes 2024-03-13 21:46:02 +00:00
Marc Paine
972d53be73
Update the nuget and msbuild ref versions for the installer tasks (#18989) 2024-03-13 14:36:37 -07:00
Marc Paine
a881a65c7a
Update the nuget and msbuild ref versions for the installer tasks to the matching version we ship (#18988) 2024-03-13 14:36:32 -07:00
dotnet-bot
10d3c4a5b1 Merge in 'release/6.0.1xx' changes 2024-03-13 20:29:49 +00:00
Matt Thalman
ac2eb96fd9
Update 6.0 SDK diff baseline (#19039) 2024-03-13 20:19:07 +00:00
dotnet-bot
bd21aa101f Merge in 'release/6.0.1xx' changes 2024-03-13 17:54:39 +00:00
dotnet-bot
0e30767c54 Merge in 'release/6.0.4xx' changes 2024-03-13 17:53:48 +00:00
JL03-Yue
e024d3d5d6
[release/6.0.1xx] Update dependencies from dotnet/arcade (#19031) 2024-03-13 10:37:51 -07:00
JL03-Yue
e5ab17730f
[release/6.0.4xx] Update dependencies from dotnet/arcade (#19032) 2024-03-13 10:37:46 -07:00
Sean Reeser
2b4eb3315c Merged PR 38051: [internal/release/6.0.4xx] Merge from public
Merge from public release/6.0.4xx to internal/release/6.0.4xx and resolve conflicts if necessary
2024-03-13 16:23:18 +00:00
dotnet-maestro[bot]
7e397bfe9b Update dependencies from https://github.com/dotnet/arcade build
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.24113.1 -> To Version 6.0.0-beta.24162.4
2024-03-13 15:10:49 +00:00
dotnet-maestro[bot]
b130f8f444 Update dependencies from https://github.com/dotnet/arcade build
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.24113.1 -> To Version 6.0.0-beta.24162.4
2024-03-13 15:08:19 +00:00
dotnet-bot
1aa9ecc628 Merge in 'release/6.0.1xx' changes 2024-03-12 20:54:45 +00:00
NET Source-Build Bot
2f4fd5305b
.NET Source-Build 6.0.128 March 2024 Updates (#19006) 2024-03-12 14:45:21 -06:00
Marc Paine
32965a6b7c Update the SRM version to match the version coming from msbuild 2024-03-12 11:38:45 -07:00
Sean Reeser
bffc895167 Merge commit 'ea26d0c1484823abd26709e62b789839fbc028c1' into internal-merge-6.0.4xx-2024-03-12-1049 2024-03-12 10:49:02 -07:00
Sean Reeser
1d51aa9e84 Merge commit '28e71a2d7eb0ca1c92dde910520e5c511109c7d6' into internal-merge-6.0.1xx-2024-03-12-1048 2024-03-12 10:48:52 -07:00
dotnet-bot
ead0c396e1 Merge in 'release/6.0.1xx' changes 2024-03-12 17:26:18 +00:00
Marc Paine
bf11f7df86
[release/6.0.4xx] Add -pr version of pipeline (#18955) 2024-03-12 10:17:24 -07:00
Marc Paine
76abc091c9
[release/6.0.1xx] Add -pr version of pipeline (#18954) 2024-03-12 10:16:52 -07:00
Marc Paine
0178176a36 Update to the 6.0.4xx version 2024-03-12 09:54:04 -07:00
Marc Paine
54c244e049 Update the nuget and msbuild ref versions for the installer tasks to the matching version we ship 2024-03-12 09:53:02 -07:00
Marc Paine
68baf9ee04 Update the nuget and msbuild ref versions for the installer tasks to the matching version we ship 2024-03-12 09:51:06 -07:00
Jason Zhai
b89f87a1dd Merge branch 'release/6.0.1xx' into release/6.0.4xx 2024-03-12 02:01:32 -07:00
dotnet-bot
10c6d7228f Merge in 'release/6.0.1xx' changes 2024-03-11 19:16:55 +00:00
Nikola Milosavljevic
ea08eb4e48
[release/6.0.1xx] Use SHA256 for RPM digest (#18112) 2024-03-11 12:06:58 -07:00
Jason Zhai
ca47aa74e9 [release/6.0.4xx] Add -pr version of pipeline 2024-03-11 02:15:24 -07:00
Jason Zhai
6419ad9ee9 [release/6.0.1xx] Add -pr version of pipeline 2024-03-11 02:14:15 -07:00
v-wuzhai
f6d914f297
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#18784) 2024-03-07 10:34:53 +08:00
dotnet-bot
99f9864ae0 Merge in 'release/6.0.1xx' changes 2024-03-05 22:13:45 +00:00
Marc Paine
a25a861289
Update branding to 6.0.129 (#18876) 2024-03-05 14:02:40 -08:00
Marc Paine
f9ea702d3d
Update branding to 6.0.421 (#18877) 2024-03-05 14:02:37 -08:00
Sean Reeser
0fd3c1e80c Update branding to 6.0.421 2024-03-05 10:59:10 -08:00
Sean Reeser
1fd59c4a43 Update branding to 6.0.129 2024-03-05 10:59:06 -08:00
Jason Zhai
49d9a3b4cc Merge branch 'release/6.0.1xx' into release/6.0.4xx 2024-02-26 22:40:18 -08:00
dotnet-bot
fc7cfe37e8 Merge in 'release/6.0.1xx' changes 2024-02-26 19:33:02 +00:00
Ella Hathaway
fc93fb378e
Update 6.0 SDK diff baseline (#18780) 2024-02-26 19:23:50 +00:00
Sean Reeser
28e71a2d7e Merged PR 37583: [internal/release/6.0.1xx] Merge from public
Merge from public release/6.0.1xx to internal/release/6.0.1xx and resolve conflicts if necessary
2024-02-21 22:15:56 +00:00
dotnet-maestro[bot]
c5f74545ca
[release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages (#18733)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2024-02-21 13:56:58 -06:00
dotnet-maestro[bot]
a84a23f57f
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#18737)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2024-02-21 13:45:10 -06:00
DotNet Bot
0446892871 Merged PR 37535: [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.28 to 6.0.28 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.28-servicing.24116.13 to 6.0.28-servicing.24120.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.28-servicing.24116.13 to 6.0.28-servicing.24120.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.28 to 6.0.28 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.28-servicing.24116.7 to 6.0.28-servicing.24120.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.28 to 6.0.28 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.28-servicing.24116.14 to 6.0.28-servicing.24120.2 (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**: 20240220.32
- **Date Produced**: February 21, 2024 7:36:05 AM UTC
- **Commit**: 1adb0ada3366f315e32a2b6c80971aafda533569
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.128-servicing.24120.25 to 6.0.128-servicing.24120.32][1]
  - **Microsoft.NET.Sdk**: [from 6.0.128-servicing.24120.25 to 6.0.128-servicing.24120.32][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.28 to 6.0.28][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.28-servicing.24116.13 to 6.0.28-servicing.24120.3][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.28-servicing.24116.13 to 6.0.28-servicing.24120.3][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.28 to 6.0.28][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.28-servicing.24116.7 to 6.0.28-servicing.24120.4][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.28 to 6.0.28][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.28-servicing.24116.14 to 6.0.28-servicing.24120.2][4]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCca9da549d26abef31e0f41cb5f1c4598f90571da&targetVers...
2024-02-21 18:24:57 +00:00
DotNet Bot
ea26d0c148 Merged PR 37536: [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.28 to 6.0.28 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.28-servicing.24116.13 to 6.0.28-servicing.24120.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.28-servicing.24116.13 to 6.0.28-servicing.24120.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.28 to 6.0.28 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.28-servicing.24116.7 to 6.0.28-servicing.24120.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.28 to 6.0.28 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.28-servicing.24116.14 to 6.0.28-servicing.24120.2 (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/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20240220.33
- **Date Produced**: February 21, 2024 7:36:06 AM UTC
- **Commit**: c1d600871abca733031eac0a17821179193da113
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.420-servicing.24120.26 to 6.0.420-servicing.24120.33][1]
  - **Microsoft.NET.Sdk**: [from 6.0.420-servicing.24120.26 to 6.0.420-servicing.24120.33][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.28 to 6.0.28][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.28-servicing.24116.13 to 6.0.28-servicing.24120.3][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.28-servicing.24116.13 to 6.0.28-servicing.24120.3][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.28 to 6.0.28][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.28-servicing.24116.7 to 6.0.28-servicing.24120.4][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.28 to 6.0.28][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.28-servicing.24116.14 to 6.0.28-servicing.24120.2][4]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC7392200c7ca1a316b5ae7e98263ba6c26be4f833&targetVers...
2024-02-21 18:24:56 +00:00