Commit graph

28241 commits

Author SHA1 Message Date
Marc Paine
362dca36b1
[release/7.0.1xx] Update dependencies from dotnet/arcade (#19133) 2024-04-02 14:41:30 -07:00
Marc Paine
75fc928c36
Update branding to 7.0.119 (#19271) 2024-04-02 14:39:02 -07:00
Sean Reeser
06b037aefb Update branding to 7.0.119 2024-04-02 11:55:45 -07:00
dotnet-maestro[bot]
e7c3e52404 Update dependencies from https://github.com/dotnet/arcade build 20240326.7
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.24114.4 -> To Version 7.0.0-beta.24176.7
2024-04-01 22:19:03 +00:00
dotnet-maestro[bot]
c752048aa2 Update dependencies from https://github.com/dotnet/arcade build
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.24114.4 -> To Version 7.0.0-beta.24171.6
2024-03-22 03:42:09 +00:00
dotnet-maestro[bot]
32becbf8c1 Update dependencies from https://github.com/dotnet/arcade build
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.24114.4 -> To Version 7.0.0-beta.24171.2
2024-03-21 22:37:28 +00:00
Ella Hathaway
ea960a5f5f
Update MsftToSbSdk.diff baseline (#19117) 2024-03-20 23:09:58 +00:00
v-wuzhai
4dd5216cb1
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#19036) 2024-03-15 13:38:40 +08:00
Jason Zhai
8aa0fd7d2f Merge branch 'release/6.0.4xx' into release/7.0.1xx 2024-03-14 19:40:36 -07: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
Marc Paine
a8dc34ff55
Merging internal commits for release/7.0.1xx (#19001) 2024-03-14 10:33:40 -07:00
Marc Paine
839c8a5400
Merging internal commits for release/6.0.4xx (#18998) 2024-03-14 10:33:27 -07:00
Marc Paine
3ab7923320
Update the nuget and msbuild ref versions for the installer tasks (#19009) 2024-03-13 14:36:40 -07:00
Marc Paine
972d53be73
Update the nuget and msbuild ref versions for the installer tasks (#18989) 2024-03-13 14:36:37 -07:00
Matt Thalman
a941a6af23
Update 7.0 SDK diff baseline (#19038) 2024-03-13 19:49:39 +00:00
JL03-Yue
e5ab17730f
[release/6.0.4xx] Update dependencies from dotnet/arcade (#19032) 2024-03-13 10:37:46 -07:00
JL03-Yue
713a17caf9
[release/7.0.1xx] Update dependencies from dotnet/source-build-externals (#19026) 2024-03-13 10:36:52 -07: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]
19ba28f763 Update dependencies from https://github.com/dotnet/source-build-externals build
Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 7.0.0-alpha.1.24158.4 -> To Version 7.0.0-alpha.1.24162.2
2024-03-13 12:22:34 +00:00
Marc Paine
83f3cc20f4
source build needs the 7.0 version it looks like. Let's see if that works. 2024-03-12 16:13:30 -07:00
NET Source-Build Bot
016e1e4c01
.NET Source-Build 7.0.117 March 2024 Updates (#19005) 2024-03-12 14:46:04 -06:00
Marc Paine
6e0da5d6f2 Update to the 7.0.1xx versions 2024-03-12 12:37:40 -07:00
Marc Paine
977b3bce63 Update the nuget and msbuild ref versions for the installer tasks to the matching version we ship 2024-03-12 11:55:05 -07: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
794bf95db3 Merge commit '00be3a36b879a2007beb22715bdd949b3174f8a9' into internal-merge-7.0.1xx-2024-03-12-1055 2024-03-12 10:55:06 -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
Marc Paine
14d8fa2866
[release/7.0.1xx] Add -pr version of pipeline (#18956) 2024-03-12 10:18:02 -07:00
Marc Paine
bf11f7df86
[release/6.0.4xx] Add -pr version of pipeline (#18955) 2024-03-12 10:17:24 -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
Jason Zhai
0d96200a8e [release/7.0.1xx] Add -pr version of pipeline 2024-03-11 02:18:09 -07:00
Jason Zhai
ca47aa74e9 [release/6.0.4xx] Add -pr version of pipeline 2024-03-11 02:15:24 -07:00
v-wuzhai
56e2bd3065
[release/7.0.1xx] Update dependencies from dotnet/source-build-externals (#18938) 2024-03-11 10:22:42 +08:00
dotnet-maestro[bot]
0c257f30af Update dependencies from https://github.com/dotnet/source-build-externals build 20240308.4
Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 7.0.0-alpha.1.24059.2 -> To Version 7.0.0-alpha.1.24158.4
2024-03-10 12:32:58 +00:00
dotnet-maestro[bot]
36e3ca0708 Update dependencies from https://github.com/dotnet/source-build-externals build 20240308.4
Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 7.0.0-alpha.1.24059.2 -> To Version 7.0.0-alpha.1.24158.4
2024-03-09 13:35:15 +00:00
v-wuzhai
f6d914f297
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#18784) 2024-03-07 10:34:53 +08:00
v-wuzhai
1475541511
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#18740) 2024-03-06 15:15:03 +08:00
Marc Paine
f9ea702d3d
Update branding to 6.0.421 (#18877) 2024-03-05 14:02:37 -08:00
Marc Paine
780dd29abc
Update branding to 7.0.118 (#18878) 2024-03-05 14:02:35 -08:00
Sean Reeser
599edfd2e9 Update branding to 7.0.118 2024-03-05 10:59:15 -08:00
Sean Reeser
0fd3c1e80c Update branding to 6.0.421 2024-03-05 10:59:10 -08:00
Jason Zhai
49d9a3b4cc Merge branch 'release/6.0.1xx' into release/6.0.4xx 2024-02-26 22:40:18 -08:00
Ella Hathaway
fc93fb378e
Update 6.0 SDK diff baseline (#18780) 2024-02-26 19:23:50 +00:00
Ella Hathaway
387338af69
Update 7.0 SDK diff baseline (#18781) 2024-02-26 19:19:42 +00:00
Jason Zhai
8c00090eed Merge branch 'release/6.0.4xx' into release/7.0.1xx 2024-02-21 19:06:00 -08:00
Sean Reeser
00be3a36b8 Merged PR 37584: [internal/release/7.0.1xx] Merge from public
Merge from public release/7.0.1xx to internal/release/7.0.1xx and resolve conflicts if necessary
2024-02-21 22:16:50 +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]
4c11f5ca09
[release/7.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#18736)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2024-02-21 13:46:01 -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
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