Commit graph

17369 commits

Author SHA1 Message Date
Jason Zhai
c5f98653f7 Merge branch 'release/7.0.3xx' into release/7.0.4xx 2024-01-16 21:48:59 -08:00
Marc Paine
c62ea6c458
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#18171) 2024-01-16 14:39:54 -08:00
dotnet-maestro[bot]
91c1a15716
[release/7.0.3xx] Update dependencies from dotnet/arcade (#18262)
[release/7.0.3xx] Update dependencies from dotnet/arcade
2024-01-16 22:33:06 +00:00
dotnet-maestro[bot]
3d488cd242
[release/7.0.4xx] Update dependencies from dotnet/arcade (#18261)
[release/7.0.4xx] Update dependencies from dotnet/arcade
2024-01-16 22:33:02 +00:00
Marc Paine
bdfa8c336d
Fix the duplicate properties added in the internal to public merge (#18224) 2024-01-16 09:09:22 -08:00
dotnet-maestro[bot]
a8524c0378 Update dependencies from https://github.com/dotnet/source-build-externals build 20240115.1
Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 8.0.0-alpha.1.24059.4 -> To Version 8.0.0-alpha.1.24065.1
2024-01-15 15:16:43 +00:00
v-wuzhai
0817d8d668
[release/8.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#18231) 2024-01-14 18:19:16 -08:00
dotnet-bot
2ceb7bf98e Merge in 'release/8.0.1xx' changes 2024-01-12 19:10:39 +00:00
github-actions[bot]
0bf95ed6be
[release/8.0.1xx] Fix VMR build tagging (#18233) 2024-01-12 19:01:37 +00:00
dotnet-maestro[bot]
002ea12140 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240111.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.23565.1 -> To Version 8.0.0-alpha.1.24061.1
2024-01-12 13:55:04 +00:00
Marc Paine
7e1c638384
Fix the duplicate properties added in the internal to public merge
The internal to public duplicated all the maui and aspire workload properties for some reason. Deleted the duplicates.
2024-01-11 16:07:57 -08:00
dotnet-maestro[bot]
ee1d3986c2
[release/7.0.4xx] Update dependencies from dotnet/arcade (#18217)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2024-01-11 16:04:05 -08:00
dotnet-maestro[bot]
fe5615852f
[release/7.0.3xx] Update dependencies from dotnet/arcade (#18218)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2024-01-11 16:03:46 -08:00
Sean Reeser
92376a1741 Merged PR 36353: [internal/release/8.0.1xx] Merge from public
Merge from public release/8.0.1xx to internal/release/8.0.1xx and resolve conflicts if necessary
2024-01-11 21:26:50 +00:00
DotNet-Bot
316a491c2b Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240111.14
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.406 -> To Version 7.0.406

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,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 7.0.15 -> To Version 7.0.16 (parent: Microsoft.NET.Sdk
2024-01-11 20:21:19 +00:00
DotNet-Bot
6811cdf123 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240111.13
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.312 -> To Version 7.0.313

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,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 7.0.15 -> To Version 7.0.16 (parent: Microsoft.NET.Sdk
2024-01-11 20:17:01 +00:00
DotNet-Bot
10b2130b4d Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240111.12
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.116 -> To Version 7.0.116

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,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 7.0.15 -> To Version 7.0.16 (parent: Microsoft.NET.Sdk
2024-01-11 20:16:26 +00:00
DotNet-Bot
091ea132a1 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240111.11
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.102 -> To Version 8.0.102

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 8.0.1 -> To Version 8.0.2 (parent: Microsoft.NET.Sdk
2024-01-11 20:13:26 +00:00
DotNet-Bot
e5dda827c7 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240111.5
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.102 -> To Version 8.0.102
2024-01-11 09:53:08 +00:00
DotNet-Bot
bfa637a450 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240111.4
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.406 -> To Version 7.0.406
2024-01-11 09:44:22 +00:00
DotNet-Bot
fe0bfacae4 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240110.68
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.102 -> To Version 8.0.102
2024-01-11 06:58:07 +00:00
DotNet-Bot
d637fd7421 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240110.59
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.102 -> To Version 8.0.102
2024-01-11 03:17:33 +00:00
dotnet-bot
972bb942f5 Merge in 'release/7.0.1xx' changes 2024-01-11 02:37:42 +00:00
vseanreesermsft
6f22dc86d8
Merging internal commits for release/8.0.1xx (#18164) 2024-01-10 22:18:47 +00:00
DotNet-Bot
4ae5d7e51c Dependency coherency updates
Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 4.8.0-7.23572.1 -> To Version 4.8.0-7.23614.11 (parent: Microsoft.NET.Sdk
2024-01-10 21:50:55 +00:00
DotNet-Bot
e12ee35f0f Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240110.23
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.102 -> To Version 8.0.102
2024-01-10 21:50:39 +00:00
DotNet-Bot
025137ea96 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240110.4
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.102 -> To Version 8.0.102
2024-01-10 21:50:23 +00:00
DotNet-Bot
9180eebc61 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240109.33
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.102 -> To Version 8.0.102
2024-01-10 21:50:05 +00:00
DotNet-Bot
2e669e9d54 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240108.12
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.102 -> To Version 8.0.102
2024-01-10 21:49:49 +00:00
DotNet-Bot
dca8a067c2 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240107.7
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.102 -> To Version 8.0.102
2024-01-10 21:49:29 +00:00
DotNet-Bot
afadbc3ccc Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240105.6
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.102 -> To Version 8.0.102
2024-01-10 21:49:13 +00:00
DotNet-Bot
2794f20bef Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240104.14
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.102 -> To Version 8.0.102
2024-01-10 21:48:57 +00:00
DotNet-Bot
66d539aea1 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240104.10
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.102 -> To Version 8.0.102
2024-01-10 21:48:41 +00:00
DotNet-Bot
b9d63771bf Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240104.3
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.102 -> To Version 8.0.102
2024-01-10 21:48:24 +00:00
DotNet-Bot
d17f5ffab9 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240103.21
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.102 -> To Version 8.0.102
2024-01-10 21:48:08 +00:00
DotNet-Bot
c0dc125d9a Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240103.10
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.102 -> To Version 8.0.102
2024-01-10 21:47:52 +00:00
DotNet-Bot
2217b1761f Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240103.4
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.102 -> To Version 8.0.102
2024-01-10 21:47:35 +00:00
DotNet-Bot
68e5684c92 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240103.2
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.102 -> To Version 8.0.102
2024-01-10 21:47:20 +00:00
DotNet-Bot
d0308b1908 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240102.29
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.102 -> To Version 8.0.102
2024-01-10 21:47:04 +00:00
DotNet-Bot
207f9ee61d Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240102.22
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.102 -> To Version 8.0.102
2024-01-10 21:46:48 +00:00
DotNet-Bot
954efb0193 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240110.20
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.116 -> To Version 7.0.116
2024-01-10 21:46:43 +00:00
DotNet-Bot
abee5165c4 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240102.15
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.101 -> To Version 8.0.102
2024-01-10 21:46:29 +00:00
DotNet-Bot
e6b3619857 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240109.23
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.116 -> To Version 7.0.116
2024-01-10 21:46:26 +00:00
DotNet-Bot
e33a1900c7 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240102.13
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.115 -> To Version 7.0.116
2024-01-10 21:46:09 +00:00
DotNet Bot
94e5676cf9 Merged PR 35913: [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**: 20231211.7
- **Date Produced**: December 11, 2023 3:53:06 PM UTC
- **Commit**: 1d26c769c9167ac9012c3e1fc0be86c9acffbde5
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.115 to 7.0.115][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.115-servicing.23601.25 to 7.0.115-servicing.23611.7][1]
  - **Microsoft.NET.Sdk**: [from 7.0.115-servicing.23601.25 to 7.0.115-servicing.23611.7][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.115-servicing.23601.25 to 7.0.115-servicing.23611.7][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651)
2024-01-10 21:45:37 +00:00
DotNet Bot
d89e442832 Merged PR 35914: [internal/release/7.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:42f6b899-0677-45e7-d6f8-08db826b460b)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 42f6b899-0677-45e7-d6f8-08db826b460b
- **Build**: 20240109.34
- **Date Produced**: January 10, 2024 6:37:20 AM UTC
- **Commit**: f8a7ad732e54f6f2f248ba3d7877afe6e8e1ec8c
- **Branch**: refs/heads/internal/release/7.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.405 to 7.0.406][7]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.405-servicing.23601.27 to 7.0.406-servicing.24059.34][7]
  - **Microsoft.NET.Sdk**: [from 7.0.405-servicing.23601.27 to 7.0.406-servicing.24059.34][7]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.405-servicing.23601.27 to 7.0.406-servicing.24059.34][7]

[7]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC6e7e4b10f05d98471ed979e481f515fa750c52ae&targetVersion=GCf8a7ad732e54f6f2f248ba3d7877afe6e8e1ec8c&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:42f6b899-0677-45e7-d6f8-08db826b460b)
2024-01-10 21:45:36 +00:00
DotNet Bot
15e9330aa8 Merged PR 35911: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20240109.36
- **Date Produced**: January 10, 2024 6:22:10 AM UTC
- **Commit**: 27f723cb002f38336f60be5644dbe9e59cb2678a
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.418-servicing.23605.39 to 6.0.419-servicing.24059.36][3]
  - **Microsoft.NET.Sdk**: [from 6.0.418-servicing.23605.39 to 6.0.419-servicing.24059.36][3]

[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1209a0007f12258907100d2ae06eaf8ef98c69e4&targetVersion=GC27f723cb002f38336f60be5644dbe9e59cb2678a&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
2024-01-10 21:45:33 +00:00
dotnet-maestro[bot]
e6ae75cdf5
[release/8.0.1xx] Update dependencies from dotnet/arcade (#18197)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2024-01-10 11:47:11 -08:00
dotnet-maestro[bot]
9bfe9ba33e
[release/6.0.4xx] Update dependencies from dotnet/arcade (#18198)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2024-01-10 11:46:50 -08:00
Forgind
347397db24
Merge branch 'release/7.0.1xx' into darc-release/7.0.1xx-b2970a76-888c-4c81-b6b1-b5158c1c0cf3 2024-01-10 11:46:33 -08:00