Commit graph

28855 commits

Author SHA1 Message Date
DotNet Bot
528c684519 Merged PR 33562: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20230903.12
- **Date Produced**: September 4, 2023 6:16:56 AM UTC
- **Commit**: 5c256633d1ecbdf0a252f0ae8a8f6ac80b1daeff
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.122-servicing.23425.21 to 6.0.123-servicing.23453.12][1]
  - **Microsoft.NET.Sdk**: [from 6.0.122-servicing.23425.21 to 6.0.123-servicing.23453.12][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC851641e40c&targetVersion=GC5c256633d1&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
2023-09-14 02:44:26 +00:00
Jason Zhai
40215eb0b8 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-09-13 19:13:49 -07:00
dotnet-bot
58f301a234 Merge in 'release/7.0.3xx' changes 2023-09-14 02:02:23 +00:00
dotnet-bot
3dd3c1ee77 Merge in 'release/6.0.3xx' changes 2023-09-14 02:01:51 +00:00
v-wuzhai
b8d6c9df84
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#17347) 2023-09-14 01:53:22 +00:00
v-wuzhai
7171c500e4
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#17350) 2023-09-14 01:52:25 +00:00
dotnet-bot
aead905c1e Merge in 'release/6.0.1xx' changes 2023-09-13 16:08:13 +00:00
b5fbd1b9bf
[release/6.0.1xx] Fix aspnetcore build on musl-libc platforms (#17324) 2023-09-13 10:57:52 -05:00
Jason Zhai
534924d8ad Merge branch 'release/7.0.1xx' into release/7.0.3xx 2023-09-12 23:59:40 -07:00
Jason Zhai
0a49407f60 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-09-12 23:51:43 -07:00
DotNet-Bot
73452f5f4a Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230912.23
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.414-servicing.23425.32 -> To Version 6.0.415-servicing.23462.23
2023-09-12 22:08:31 +00:00
dotnet-bot
3288abff4a Merge in 'release/6.0.1xx' changes 2023-09-12 21:40:44 +00:00
Noah Gilson
18327ecb64
Merging internal commits for release/6.0.1xx (#17338) 2023-09-12 14:31:34 -07:00
dotnet-bot
d85753bd93 Merge in 'release/7.0.1xx' changes 2023-09-12 21:16:08 +00:00
NET Source-Build Bot
0c7d38132a
.NET Source-Build 7.0.111 September 2023 Updates (#17341) 2023-09-12 16:06:51 -05:00
dotnet-bot
8442a3def3 Merge in 'release/6.0.3xx' changes 2023-09-12 20:42:00 +00:00
dotnet-bot
64d7d8f07b Merge in 'release/6.0.4xx' changes 2023-09-12 20:41:45 +00:00
dotnet-bot
21c0df6055 Merge in 'release/7.0.1xx' changes 2023-09-12 20:41:36 +00:00
dotnet-bot
d7d294d675 Merge in 'release/7.0.3xx' changes 2023-09-12 20:41:29 +00:00
Noah Gilson
c013db3ada
Merging internal commits for release/6.0.3xx (#17337) 2023-09-12 13:32:25 -07:00
Noah Gilson
8ae8f086bc
Merging internal commits for release/6.0.4xx (#17336) 2023-09-12 13:32:15 -07:00
Noah Gilson
3f7c8d8f8c
Merging internal commits for release/7.0.1xx (#17335) 2023-09-12 13:32:10 -07:00
Noah Gilson
804f67d6fd
Merging internal commits for release/7.0.3xx (#17334) 2023-09-12 13:32:06 -07:00
Sean Reeser
6935c9da09 Merge commit 'dc5a76ad5c4ed1292be9d96e40d3baa5cdc6b4ef' into internal-merge-6.0.1xx-2023-09-12-1023 2023-09-12 10:23:22 -07:00
Sean Reeser
817f6beb0d Merge commit 'd9644dc1fe191866cfbd303b9d4250e3ac680d80' into internal-merge-6.0.3xx-2023-09-12-1023 2023-09-12 10:23:13 -07:00
Sean Reeser
e51baa7adb Merge commit 'dc3b5c43414b3d69ce876ba4c7230fbfd04a9170' into internal-merge-6.0.4xx-2023-09-12-1023 2023-09-12 10:23:05 -07:00
Sean Reeser
3bf68f064c Merge commit '06c8b346e488025d42d9cb905b47f4b3c3015ae3' into internal-merge-7.0.1xx-2023-09-12-1019 2023-09-12 10:19:00 -07:00
Sean Reeser
cbcca630a5 Merge commit 'f6a2f50f2d67a07264605ee7044c2515ba30f20f' into internal-merge-7.0.3xx-2023-09-12-1018 2023-09-12 10:18:52 -07:00
DotNet-Bot
8e50270c02 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230905.22
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.414-servicing.23425.32 -> To Version 6.0.415-servicing.23455.22
2023-09-05 22:18:53 +00:00
DotNet-Bot
6807af5fa2 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230903.13
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.317-servicing.23425.24 -> To Version 6.0.318-servicing.23453.13
2023-09-04 06:38:49 +00:00
DotNet-Bot
2a16f1dc25 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230903.14
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.414-servicing.23425.32 -> To Version 6.0.415-servicing.23453.14
2023-09-04 06:38:35 +00:00
DotNet-Bot
0472585a3c Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230903.12
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.122-servicing.23425.21 -> To Version 6.0.123-servicing.23453.12
2023-09-04 06:37:56 +00:00
dotnet-bot
26a9244ef3 Merge in 'release/7.0.3xx' changes 2023-09-04 05:49:57 +00:00
dotnet-bot
8f7dee2c39 Merge in 'release/6.0.4xx' changes 2023-09-04 05:49:20 +00:00
dotnet-bot
dd72f83b43 Merge in 'release/7.0.1xx' changes 2023-09-04 05:49:20 +00:00
dotnet-bot
48f940bf44 Merge in 'release/6.0.3xx' changes 2023-09-04 05:49:03 +00:00
dotnet-bot
0965195453 Merge in 'release/6.0.1xx' changes 2023-09-04 05:48:43 +00:00
v-wuzhai
d84e9af96c
Update branding to 7.0.309 (#17287) 2023-09-04 05:40:33 +00:00
v-wuzhai
430c37f212
Update branding to 7.0.112 (#17286) 2023-09-04 05:40:17 +00:00
v-wuzhai
c6ed0d6cfb
Update branding to 6.0.415 (#17285) 2023-09-04 05:40:02 +00:00
v-wuzhai
a52f21cbfb
Update branding to 6.0.318 (#17284) 2023-09-04 05:39:44 +00:00
v-wuzhai
8660e87f7b
Update branding to 6.0.123 (#17283) 2023-09-04 05:39:27 +00:00
Sean Reeser
92332ccd30 Update branding to 7.0.309 2023-08-31 11:27:07 -07:00
Sean Reeser
529188e483 Update branding to 7.0.112 2023-08-31 11:27:03 -07:00
Sean Reeser
c0954c6aca Update branding to 6.0.415 2023-08-31 11:26:58 -07:00
Sean Reeser
47d41a3d1a Update branding to 6.0.318 2023-08-31 11:26:54 -07:00
Sean Reeser
c8aec3e808 Update branding to 6.0.123 2023-08-31 11:26:49 -07:00
DotNet Bot
f6a2f50f2d Merged PR 33416: [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.11 to 7.0.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.11-servicing.23422.3 to 7.0.11-servicing.23425.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.11-servicing.23422.3 to 7.0.11-servicing.23425.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.11 to 7.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.11-servicing.23422.3 to 7.0.11-servicing.23425.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.11 to 7.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.11-servicing.23422.2 to 7.0.11-servicing.23425.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[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**: 20230825.45
- **Date Produced**: August 25, 2023 9:23:34 PM UTC
- **Commit**: 3df19b5c2397628b241f0785320858fa0ab1d9aa
- **Branch**: refs/heads/internal/release/7.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.308 to 7.0.308][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.308-servicing.23425.34 to 7.0.308-servicing.23425.45][1]
  - **Microsoft.NET.Sdk**: [from 7.0.308-servicing.23425.34 to 7.0.308-servicing.23425.45][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.308-servicing.23425.34 to 7.0.308-servicing.23425.45][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.11 to 7.0.11][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.11-servicing.23422.3 to 7.0.11-servicing.23425.5][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.11-servicing.23422.3 to 7.0.11-servicing.23425.5][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.11 to 7.0.11][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.11-servicing.23422.3 to 7.0.11-servicing.23425.2][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.11 to 7.0.11][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.11-servicing.2...
2023-08-25 21:53:03 +00:00
DotNet Bot
06c8b346e4 Merged PR 33418: [internal/release/7.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 7.0.11 to 7.0.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.11-servicing.23422.3 to 7.0.11-servicing.23425.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.11-servicing.23422.3 to 7.0.11-servicing.23425.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.11 to 7.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.11-servicing.23422.3 to 7.0.11-servicing.23425.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.11 to 7.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.11-servicing.23422.2 to 7.0.11-servicing.23425.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651
- **Build**: 20230825.44
- **Date Produced**: August 25, 2023 9:25:06 PM UTC
- **Commit**: d0b45a002cc72d1932d7c1a6a87482bac3518c5d
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.111 to 7.0.111][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.111-servicing.23425.35 to 7.0.111-servicing.23425.44][1]
  - **Microsoft.NET.Sdk**: [from 7.0.111-servicing.23425.35 to 7.0.111-servicing.23425.44][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.111-servicing.23425.35 to 7.0.111-servicing.23425.44][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.11 to 7.0.11][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.11-servicing.23422.3 to 7.0.11-servicing.23425.5][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.11-servicing.23422.3 to 7.0.11-servicing.23425.5][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.11 to 7.0.11][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.11-servicing.23422.3 to 7.0.11-servicing.23425.2][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.11 to 7.0.11][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.11-servicing.2...
2023-08-25 21:52:56 +00:00
DotNet-Bot
8ccd8a807f Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.44
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.111 -> To Version 7.0.111

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 7.0.11 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk
2023-08-25 21:46:55 +00:00