Commit graph

29548 commits

Author SHA1 Message Date
Marc Paine
414fa9d373
Merging internal commits for release/7.0.3xx (#19760) 2024-05-17 11:26:22 -07:00
vseanreesermsft
abcb45acfa
Update branding to 7.0.317 (#19778) 2024-05-17 07:13:30 -07:00
DotNet Bot
fd20a8cec8 Merged PR 39140: [internal/release/7.0.3xx] 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.AspNetCore.App.Ref**: from 7.0.19 to 7.0.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.19 to 7.0.19 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Build**: from 17.6.10 to 17.6.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.SourceBuild.Intermediate.msbuild**: from 17.6.10-preview-23329-03 to 17.6.11-preview-24222-15 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76
- **Build**: 20240423.9
- **Date Produced**: April 23, 2024 9:32:12 PM UTC
- **Commit**: 98554e0c58a2221a77a6469abbb4525d677447f6
- **Branch**: refs/heads/internal/release/7.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.316 to 7.0.316][3]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.316-servicing.24217.4 to 7.0.316-servicing.24223.9][3]
  - **Microsoft.NET.Sdk**: [from 7.0.316-servicing.24217.4 to 7.0.316-servicing.24223.9][3]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.316-servicing.24217.4 to 7.0.316-servicing.24223.9][3]
  - **Microsoft.AspNetCore.App.Ref**: [from 7.0.19 to 7.0.19][4]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6][4]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.19 to 7.0.19][4]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6][4]
  - **dotnet-dev-certs**: [from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6][4]
  - **dotnet-user-jwts**: [from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6][4]
  - **dotnet-us...
2024-04-23 22:15:15 +00:00
Sean Reeser
4f49705e0c Merged PR 39076: [internal/release/7.0.3xx] Updated NuGet.config - add feed for msbuild-Trusted-6918b86
Updated NuGet.config - add feed for msbuild-Trusted-6918b86
2024-04-19 16:47:58 +00:00
DotNet Bot
88fcd75f32 Merged PR 39010: [internal/release/7.0.3xx] 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 7.0.18 to 7.0.19 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.18-servicing.24170.3 to 7.0.19-servicing.24216.14 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.18-servicing.24170.3 to 7.0.19-servicing.24216.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 7.0.18 to 7.0.19 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.18-servicing.24169.14 to 7.0.19-servicing.24215.23 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.18 to 7.0.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.18 to 7.0.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.18 to 7.0.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 7.0.18 to 7.0.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.18-servicing.24169.24 to 7.0.19-servicing.24216.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.18 to 7.0.19 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.18-servicing.24169.24 to 7.0.19-servicing.24216.12 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.18-servicing.24169.24 to 7.0.19-servicing.24216.12 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.18-servicing.24169.24 to 7.0.19-servicing.24216.12 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.18-servicing.24169.24 to 7.0.19-servicing.24216.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.18 to 7.0.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.18-servicing.24169.17 to 7.0.19-servicing.24216.14 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.18 to 7.0.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.18-servicing.24169.14 to 7.0.19-servicing.24216.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.18-servicing.24169.14 to 7.0.19-servicing.24215.23 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**...
2024-04-17 18:20:20 +00:00
v-wuzhai
10bea68ce7
[release/7.0.3xx] Update dependencies from dotnet/source-build-externals (#19486) 2024-04-16 19:08:21 -07:00
dotnet-maestro[bot]
4a7229219e Update dependencies from https://github.com/dotnet/source-build-externals build 20240416.2
Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 7.0.0-alpha.1.24210.1 -> To Version 7.0.0-alpha.1.24216.2
2024-04-16 18:51:20 +00:00
Michael Yanni
dd3790fd4e
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#19456) 2024-04-12 16:14:33 -07:00
Michael Yanni
68a33dff48
Merge branch 'release/7.0.3xx' into merge/release/7.0.1xx-to-release/7.0.3xx 2024-04-12 14:57:14 -07:00
Michael Yanni
8728b72ef3
[release/7.0.3xx] Update dependencies from dotnet/arcade (#19454) 2024-04-12 13:06:23 -07:00
Michael Yanni
d83fd4c5a5
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#19439) 2024-04-12 12:55:54 -07:00
Jacques Eloff
660ffb0f15
Update WiX to 3.14.8722 (#19409) 2024-04-12 10:16:00 -07:00
Jacques Eloff
cea52fcafd
Update WiX to 3.14.1.8722 (#19408) 2024-04-12 10:15:55 -07:00
dotnet-maestro[bot]
6d2926d16a Update dependencies from https://github.com/dotnet/arcade build 20240412.2
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.24209.2 -> To Version 7.0.0-beta.24212.2
2024-04-12 16:52:15 +00:00
Jason Zhai
c069d5541b Merge branch 'release/6.0.4xx' into release/7.0.1xx 2024-04-11 23:42:27 -07:00
Michael Yanni
479481a19a
[release/7.0.1xx] Update dependencies from dotnet/source-build-externals (#19437) 2024-04-11 13:53:11 -07:00
Michael Yanni
2c9f4495b2
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#19426) 2024-04-11 10:40:37 -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
dotnet-maestro[bot]
67cd0dac2d Update dependencies from https://github.com/dotnet/source-build-externals build 20240410.1
Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 7.0.0-alpha.1.24201.2 -> To Version 7.0.0-alpha.1.24210.1
2024-04-11 12:37:50 +00:00
Jason Zhai
c635b48b06 Merge branch 'release/7.0.1xx' into release/7.0.3xx 2024-04-11 01:24:38 -07:00
v-wuzhai
01940a9d1d
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#19431) 2024-04-11 01:18:16 -07:00
Jason Zhai
073953323a Merge branch 'release/6.0.1xx' into release/6.0.4xx 2024-04-10 22:59:02 -07:00
Jason Zhai
2d56bb8119 Merge branch 'release/6.0.4xx' into release/7.0.1xx 2024-04-10 22:45:00 -07:00
Michael Yanni
d6bd3a5d7d
[release/7.0.3xx] Update dependencies from dotnet/source-build-externals (#19424) 2024-04-10 15:05:20 -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
Michael Yanni
1bfc2458ba
[release/7.0.3xx] Update dependencies from dotnet/arcade (#19402) 2024-04-10 14:51:47 -07:00
Michael Yanni
53e0a410eb
[release/7.0.1xx] Update dependencies from dotnet/arcade (#19411) 2024-04-10 13:46:12 -07:00
Matt Thalman
436da5e6bb
Update SB SDK diff baseline (#19413) 2024-04-10 20:13:07 +00:00
Matt Thalman
8b00bdb59d
Update SB SDK diff baseline (#19414) 2024-04-10 19:45:17 +00:00
dotnet-maestro[bot]
38f3a6ebea Update dependencies from https://github.com/dotnet/source-build-externals build 20240410.1
Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 7.0.0-alpha.1.24201.2 -> To Version 7.0.0-alpha.1.24210.1
2024-04-10 18:59:21 +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
dotnet-maestro[bot]
0bdf76fe00 Update dependencies from https://github.com/dotnet/arcade build 20240409.2
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.24204.2 -> To Version 7.0.0-beta.24209.2
2024-04-10 17:11:56 +00:00
dotnet-maestro[bot]
d18629dc95 Update dependencies from https://github.com/dotnet/arcade build 20240409.2
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.24176.7 -> To Version 7.0.0-beta.24209.2
2024-04-10 17:10:07 +00:00
dotnet-maestro[bot]
bb04692b93 Update dependencies from https://github.com/dotnet/arcade build 20240409.2
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.24204.2 -> To Version 7.0.0-beta.24209.2
2024-04-10 15:42:25 +00:00
Oleksandr Didyk
a976090924
.NET Source-Build 6.0.129 April 2024 Updates (#19371) 2024-04-10 11:35:35 +02:00
Oleksandr Didyk
a0c84133de
.NET Source-Build 7.0.118 April 2024 Updates (#19381) 2024-04-10 11:35:18 +02:00
Michael Yanni
1a9770c225
Merging internal commits for release/7.0.1xx (#19378) 2024-04-09 14:51:41 -07:00
Michael Yanni
486ccc7aeb
Merging internal commits for release/7.0.3xx (#19377) 2024-04-09 14:51:36 -07: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
dotnet-sb-bot
2df25924d7 update global.json and Versions.props for .NET SDK 7.0.118 2024-04-09 20:12:09 +00:00
Sean Reeser
9ea370eaaa Merge commit 'ef7589b476034bb95ccba0abe6c9fc05d20ecf6f' into internal-merge-7.0.1xx-2024-04-09-1227 2024-04-09 12:27:15 -07:00
Sean Reeser
a849ecff27 Merge commit 'c268ea61ccf05c113680c5b4348dd6683c855b6b' into internal-merge-7.0.3xx-2024-04-09-1227 2024-04-09 12:27:07 -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
v-wuzhai
92c8d58053
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#19295) 2024-04-07 22:40:16 -07:00
Jason Zhai
0ba027e471 Merge branch 'release/6.0.4xx' into release/7.0.1xx 2024-04-07 19:41:44 -07:00