Commit graph

33444 commits

Author SHA1 Message Date
v-wuzhai
d15bf3c4e2
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#18174) 2024-01-11 18:08:20 -08: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
DotNet Bot
b0ae9a299b Merged PR 36397: [internal/release/7.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 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.15-servicing.23579.2 to 7.0.16-servicing.24060.13 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.15-servicing.23579.2 to 7.0.16-servicing.24060.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.15-servicing.23601.10 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.15-servicing.23601.10 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.15-servicing.23601.10 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.15-servicing.23601.10 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.15-servicing.23601.10 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.15-servicing.23578.3 to 7.0.16-servicing.24060.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:42f6b899-0677-45e7-d6f8-08db826b460b)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 42f6b899-0677-45e7-d6f8-08db826b460b
- **Build**: 20240111.14
- **Date Produced**: January 11, 2024 8:01:30 PM UTC
- **Commit**: b42e612282cfa3fe86419f63091a56b35d915baf
- **Branch**: refs/heads/internal/release/7.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.406 to 7.0.406][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.406-servicing.24061.4 to 7.0.406-servicing.24061.14][1]
  - **Microsoft.NET.Sdk**: [from 7.0.406-servicing.24061.4 to 7.0.406-servicing.24061.14][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.406-servicing.24061.4 to 7.0.406-servicing.24061.14][1]
  - **Microsoft.WindowsD...
2024-01-11 20:24:52 +00:00
DotNet Bot
effa264692 Merged PR 36396: [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.15 to 7.0.16 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.15-servicing.23579.2 to 7.0.16-servicing.24060.13 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.15-servicing.23579.2 to 7.0.16-servicing.24060.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.15-servicing.23601.10 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.15-servicing.23601.10 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.15-servicing.23601.10 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.15-servicing.23601.10 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.15-servicing.23601.10 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.15-servicing.23578.3 to 7.0.16-servicing.24060.7 (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**: 20240111.13
- **Date Produced**: January 11, 2024 7:56:42 PM UTC
- **Commit**: 18d8a2987501c4439ddadf2501a80760f4f87de3
- **Branch**: refs/heads/internal/release/7.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.312 to 7.0.313][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.312-servicing.23601.26 to 7.0.313-servicing.24061.13][1]
  - **Microsoft.NET.Sdk**: [from 7.0.312-servicing.23601.26 to 7.0.313-servicing.24061.13][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.312-servicing.23601.26 to 7.0.313-servicing.24061.13][1]
  - **Microsoft.Windo...
2024-01-11 20:24:51 +00:00
DotNet Bot
1ece4b9932 Merged PR 36395: [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.15 to 7.0.16 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.15-servicing.23579.2 to 7.0.16-servicing.24060.13 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.15-servicing.23579.2 to 7.0.16-servicing.24060.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.15-servicing.23601.10 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.15-servicing.23601.10 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.15-servicing.23601.10 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.15-servicing.23601.10 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.15-servicing.23601.10 to 7.0.16-servicing.24061.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.15-servicing.23578.3 to 7.0.16-servicing.24060.7 (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**: 20240111.12
- **Date Produced**: January 11, 2024 7:56:43 PM UTC
- **Commit**: 383d1cee7ce36156a4adf5d0779c1eb94bf85357
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.116 to 7.0.116][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.116-servicing.24060.20 to 7.0.116-servicing.24061.12][1]
  - **Microsoft.NET.Sdk**: [from 7.0.116-servicing.24060.20 to 7.0.116-servicing.24061.12][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.116-servicing.24060.20 to 7.0.116-servicing.24061.12][1]
  - **Microsoft.Windo...
2024-01-11 20:24:35 +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
b30b06c8c2 Merged PR 36355: [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**: 20240111.4
- **Date Produced**: January 11, 2024 9:24:49 AM UTC
- **Commit**: b0c4f89a12a96383f763852b14707378f810b666
- **Branch**: refs/heads/internal/release/7.0.4xx

[DependencyUpdate]: <> (Begin)

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

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:42f6b899-0677-45e7-d6f8-08db826b460b)
2024-01-11 19:25:46 +00:00
Michael Simons
79cfea2c03
Remove source-build sourcelink snupkg workaround (#18215) 2024-01-11 17:42:51 +00:00
dotnet-bot
3f7ceae52b Merge in 'release/7.0.1xx' changes 2024-01-11 16:13:50 +00:00
Ella Hathaway
77897632e0
Update MsftToSbSdk.diff (#18210) 2024-01-11 10:04:52 -06: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
972bb942f5 Merge in 'release/7.0.1xx' changes 2024-01-11 02:37:42 +00:00
v-wuzhai
4d4dae6ebf
[release/7.0.1xx] Update dependencies from dotnet/arcade (#18199) 2024-01-10 18:29:09 -08:00
NET Source-Build Bot
5e12b89c16
.NET Source-Build 8.0.101 January 2024 Updates (#18156) 2024-01-11 00:08:01 +00:00
Ella Hathaway
bf9a94271e
Update MsftToSbSdk.diff baseline (#18205) 2024-01-10 23:22:15 +00:00
DotNet Bot
8e620d309c Merged PR 36342: [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**: 20240110.20
- **Date Produced**: January 10, 2024 8:42:33 PM UTC
- **Commit**: 9d7476029043125e1f2acb5477c99b1d2710f12c
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.116 to 7.0.116][3]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.116-servicing.24059.23 to 7.0.116-servicing.24060.20][3]
  - **Microsoft.NET.Sdk**: [from 7.0.116-servicing.24059.23 to 7.0.116-servicing.24060.20][3]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.116-servicing.24059.23 to 7.0.116-servicing.24060.20][3]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651)
2024-01-10 23:02:05 +00:00
vseanreesermsft
6f22dc86d8
Merging internal commits for release/8.0.1xx (#18164) 2024-01-10 22:18:47 +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
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-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
dotnet-maestro[bot]
aeb5cae516
[release/6.0.1xx] Update dependencies from dotnet/arcade (#18200)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2024-01-10 11:46:22 -08:00
dotnet-bot
02e82e678d Merge in 'release/7.0.1xx' changes 2024-01-10 17:29:34 +00:00
dotnet-bot
52031d10b0 Merge in 'release/7.0.3xx' changes 2024-01-10 17:28:40 +00:00
dotnet-bot
3e20e13579 Merge in 'release/7.0.4xx' changes 2024-01-10 17:28:35 +00:00
Marc Paine
df468a3a52
Merging internal commits for release/7.0.1xx (#18163) 2024-01-10 09:20:47 -08:00
Marc Paine
f612fda88d
Merging internal commits for release/7.0.3xx (#18162) 2024-01-10 09:20:40 -08:00
Marc Paine
7f4e94ea20
Merging internal commits for release/7.0.4xx (#18161) 2024-01-10 09:20:36 -08:00
dotnet-maestro[bot]
d8a8df7391 Update dependencies from https://github.com/dotnet/arcade build 20240109.5
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.23564.5 -> To Version 7.0.0-beta.24059.5
2024-01-10 17:10:50 +00:00
Matt Thalman
895635d939 Revert change for internal update 2024-01-10 08:49:09 -06:00
Matt Thalman
48bc53793d Revert change for internal update 2024-01-10 08:47:54 -06:00
Matt Thalman
ce6030910e Remove extra line 2024-01-10 08:45:59 -06:00
Matt Thalman
3513a14922 Revert change for internal update 2024-01-10 08:45:25 -06:00
Matt Thalman
d10cd11a6a
Merge branch 'release/7.0.4xx' into internal-merge-7.0.4xx-2024-01-09-1132 2024-01-10 07:42:58 -06:00
Matt Thalman
798145ebe2
Merge branch 'release/7.0.3xx' into internal-merge-7.0.3xx-2024-01-09-1132 2024-01-10 07:42:21 -06:00
Matt Thalman
3da2e7fd7c
Merge branch 'release/7.0.1xx' into internal-merge-7.0.1xx-2024-01-09-1132 2024-01-10 07:38:47 -06:00
Přemek Vysoký
351592c3af
[release/8.0.1xx] Move VMR component list into Components.md (#18061) 2024-01-10 09:45:00 +00:00
Jason Zhai
cd3b32e1da Merge branch 'release/7.0.1xx' into release/7.0.3xx 2024-01-10 00:48:27 -08:00
Jason Zhai
08d6a28231 Merge branch 'release/6.0.4xx' into release/7.0.1xx 2024-01-10 00:44:53 -08:00
Jason Zhai
b29e3f9405 Merge branch 'release/7.0.4xx' into release/8.0.1xx 2024-01-10 00:41:02 -08:00
Jason Zhai
5ec87f33df Merge branch 'release/7.0.4xx' into release/8.0.1xx 2024-01-10 00:37:27 -08:00
Jason Zhai
5ff88611c1 Merge branch 'release/7.0.3xx' into release/7.0.4xx 2024-01-10 00:30:27 -08:00