Commit graph

28249 commits

Author SHA1 Message Date
DotNet-Bot
21f8baf0e2 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.118 -> To Version 7.0.118

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64
 From Version 7.0.17 -> To Version 7.0.18 (parent: Microsoft.NET.Sdk
2024-03-19 20:36:15 +00:00
dotnet-bot
0b2eccdb51 Merge in 'release/7.0.1xx' changes 2024-03-15 05:47:46 +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
dotnet-bot
19eff839aa Merge in 'release/7.0.1xx' changes 2024-03-14 17:42:39 +00: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
dotnet-bot
d47ec0380b Merge in 'release/7.0.1xx' changes 2024-03-13 21:46:08 +00: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
dotnet-bot
d510a5339a Merge in 'release/7.0.1xx' changes 2024-03-13 19:59:22 +00:00
Matt Thalman
a941a6af23
Update 7.0 SDK diff baseline (#19038) 2024-03-13 19:49:39 +00:00
dotnet-bot
a2a22ab2db Merge in 'release/7.0.1xx' changes 2024-03-13 17:51:37 +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 Bot
9669f6b130 Merged PR 37871: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651
- **Build**: 20240307.7
- **Date Produced**: March 7, 2024 3:32:50 PM UTC
- **Commit**: bac945733c7eb99914baa4373695f05f353dad1a
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.117 to 7.0.118][2]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.117-servicing.24116.88 to 7.0.118-servicing.24157.7][2]
  - **Microsoft.NET.Sdk**: [from 7.0.117-servicing.24116.88 to 7.0.118-servicing.24157.7][2]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.117-servicing.24116.88 to 7.0.118-servicing.24157.7][2]

[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCdb7d0ce81917cecead7e0097923d4c1f84753293&targetVersion=GCbac945733c7eb99914baa4373695f05f353dad1a&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651)
2024-03-13 17:14:02 +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]
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
dotnet-bot
c3af3367a9 Merge in 'release/7.0.1xx' changes 2024-03-12 20:55:15 +00: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
dotnet-bot
77b3dbf4ed Merge in 'release/7.0.1xx' changes 2024-03-12 17:27:52 +00: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
dotnet-bot
81664e3bbe Merge in 'release/7.0.1xx' changes 2024-03-11 02:34:30 +00: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
DotNet-Bot
d611982e25 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240307.7
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.117 -> To Version 7.0.118
2024-03-07 15:55:33 +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
dotnet-bot
f63658eea7 Merge in 'release/7.0.1xx' changes 2024-03-06 07:24:37 +00:00
v-wuzhai
1475541511
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#18740) 2024-03-06 15:15:03 +08:00
DotNet-Bot
7d08553461 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240305.25
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.117 -> To Version 7.0.118
2024-03-06 03:29:00 +00:00
dotnet-bot
a8002fd3fe Merge in 'release/7.0.1xx' changes 2024-03-05 22:13:22 +00: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
dotnet-bot
17cc6a40d1 Merge in 'release/7.0.1xx' changes 2024-02-26 19:28:57 +00:00