mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
28501 commits 41 branches 190 tags 95 MiB
Commit graph

28501 commits

This branch
This branch
All branches
Author SHA1 Message Date
DotNet Bot
46b5572002 Merged PR 34018: [internal/release/frameshift/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.NETCore.App.Ref**: from 7.0.10 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.10-servicing.23363.12 to 7.0.12-servicing.23477.20 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.10 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.10 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.10 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 7.0.10 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.10-servicing.23364.39 to 7.0.12-servicing.23478.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.10 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.10-servicing.23364.39 to 7.0.12-servicing.23478.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.10-servicing.23364.39 to 7.0.12-servicing.23478.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.10-servicing.23364.39 to 7.0.12-servicing.23478.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.10-servicing.23364.39 to 7.0.12-servicing.23478.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.ILLink.Tasks**: from 7.0.100-1.23321.1 to 7.0.100-1.23401.1 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.10-servicing.23363.12 to 7.0.12-servicing.23477.20 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**: from 7.0.10 to 7.0.11 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.10-servicing.23363.12 to 7.0.12-servicing.23477.20 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100**: from 7.0.10 to 7.0.11 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:d52de2a0-7c5a-452e-752b-08dbbf92e774)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: d52de2a0-7c5a-452e-752b-08dbbf92e774
- **Build**: 20230928.17
- **Date Produced**: September 28, 2023 3:39:44 PM UTC
- **Commit**: 804aff807ca42d6f112bf7dd26dfe6161aa1f11b
- **Branch**: refs/heads/internal/release/frameshift/7.0.3xx
...
 2023-09-28 16:26:56 +00:00
DotNet-Bot
ce6ed2d04a Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230928.17 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.307 -> To Version 7.0.309

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,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.NET.ILLink.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.10 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk
 2023-09-28 16:10:16 +00:00
DotNet-Bot
2f011300bf Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230928.8 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.307 -> To Version 7.0.309

Dependency coherency updates

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.NET.ILLink.Tasks
 From Version 7.0.10 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk
 2023-09-28 15:01:07 +00:00
Matt Thalman
71749d3383
Handle variations in branch names for triggering SB tarball build (#17434) 2023-09-27 21:48:21 +00:00
DotNet Bot
3f0b731d1d Merged PR 33761: [internal/release/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk 
This pull request updates the following dependencies

[marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76
- **Build**: 20230919.17
- **Date Produced**: September 19, 2023 6:25:46 PM UTC
- **Commit**: afdaa753974497c5189c6f8713aac005589771a5
- **Branch**: refs/heads/internal/release/7.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.309 to 7.0.309][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.309-servicing.23465.30 to 7.0.309-servicing.23469.17][1]
  - **Microsoft.NET.Sdk**: [from 7.0.309-servicing.23465.30 to 7.0.309-servicing.23469.17][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.309-servicing.23465.30 to 7.0.309-servicing.23469.17][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:ca5481e4-f667-4dcd-b176-08db3b93de76)
 2023-09-19 18:52:23 +00:00
DotNet-Bot
21a1321b35 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230919.17 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.309 -> To Version 7.0.309
 2023-09-19 18:48:29 +00:00
DotNet Bot
a6caaa0992 Merged PR 33723: [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.12 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.12-servicing.23463.5 to 7.0.12-servicing.23465.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.12-servicing.23463.5 to 7.0.12-servicing.23465.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 7.0.12 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.12-servicing.23464.9 to 7.0.12-servicing.23465.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.12 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.12-servicing.23464.9 to 7.0.12-servicing.23465.12 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.12-servicing.23464.9 to 7.0.12-servicing.23465.12 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.12-servicing.23464.9 to 7.0.12-servicing.23465.12 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.12-servicing.23464.9 to 7.0.12-servicing.23465.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.12 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.12-servicing.23463.13 to 7.0.12-servicing.23465.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.12 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.12-servicing.23463.6 to 7.0.12-servicing.23465.3 (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**: 20230915.30
- **Date Produced**: September 15, 2023 10:04:47 PM UTC
- **Commit**: 0bfd8c30c267fe1ae21eab586a22aa119677e0b1
- **Branch**: refs/heads/internal/release/7.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.309 to 7.0.309][3]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.309-servicing.23464.37 to 7.0.309-servicing.23465.30][3]
  - **Microsoft.NET.Sdk**: [from 7.0.309-servicing.2...
 2023-09-15 23:04:41 +00:00
DotNet-Bot
4ac38fb555 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230915.30 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.309 -> To Version 7.0.309

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.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 7.0.12 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk
 2023-09-15 22:26:37 +00:00
DotNet-Bot
8f9c6a465f Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230915.23 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.309 -> To Version 7.0.309

Dependency coherency updates

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
 From Version 7.0.12 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk
 2023-09-15 20:34:14 +00:00
v-wuzhai
2c5539a854
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#17364) 2023-09-15 00:20:27 -07:00
Jason Zhai
9b26695694 Merge branch 'release/6.0.4xx' into release/7.0.1xx 2023-09-14 23:02:32 -07:00
DotNet Bot
2ee09718d1 Merged PR 33710: [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.12 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.11-servicing.23425.5 to 7.0.12-servicing.23463.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.11-servicing.23425.5 to 7.0.12-servicing.23463.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 7.0.11 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.11-servicing.23424.27 to 7.0.12-servicing.23463.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.11 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.11 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.11 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 7.0.11 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.11-servicing.23425.2 to 7.0.12-servicing.23464.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.11 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.11-servicing.23425.2 to 7.0.12-servicing.23464.9 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.11-servicing.23425.2 to 7.0.12-servicing.23464.9 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.11-servicing.23425.2 to 7.0.12-servicing.23464.9 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.11-servicing.23425.2 to 7.0.12-servicing.23464.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.11 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.11-servicing.23425.2 to 7.0.12-servicing.23463.13 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.11 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.11-servicing.23425.6 to 7.0.12-servicing.23463.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.11-servicing.23424.27 to 7.0.12-servicing.23463.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**: from 7.0.11 to...
 2023-09-15 00:20:29 +00:00
DotNet-Bot
c199984faf Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230914.37 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.308 -> To Version 7.0.309

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,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.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.11 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk
 2023-09-14 23:55:47 +00:00
Marc Paine
1de4dda4b8
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#17355) 2023-09-14 13:22:24 -07: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
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
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
Noah Gilson
18327ecb64
Merging internal commits for release/6.0.1xx (#17338) 2023-09-12 14:31:34 -07: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
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
26a9244ef3 Merge in 'release/7.0.3xx' changes 2023-09-04 05:49:57 +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
DotNet-Bot
6c569fb358 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.45 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.308 -> To Version 7.0.308

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:44:28 +00:00
DotNet Bot
04c1377a0d Merged PR 33411: [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.11 to 7.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.11-servicing.23422.8 to 7.0.11-servicing.23425.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.11 to 7.0.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.11-servicing.23422.8 to 7.0.11-servicing.23425.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.11-servicing.23422.8 to 7.0.11-servicing.23425.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.11-servicing.23422.8 to 7.0.11-servicing.23425.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.11-servicing.23422.8 to 7.0.11-servicing.23425.2 (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**: 20230825.34
- **Date Produced**: August 25, 2023 6:34:43 PM UTC
- **Commit**: f469d782833a83a3c210f3ed1807f2c05a2ba6d4
- **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.20 to 7.0.308-servicing.23425.34][1]
  - **Microsoft.NET.Sdk**: [from 7.0.308-servicing.23425.20 to 7.0.308-servicing.23425.34][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.308-servicing.23425.20 to 7.0.308-servicing.23425.34][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 7.0.11 to 7.0.11][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.11-servicing.23422.8 to 7.0.11-servicing.23425.2][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.11 to 7.0.11][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.11-servicing.23422.8 to 7.0.11-servicing.23425.2][2]
  - **dotnet-dev-certs**: [from 7.0.11-servicing.23422.8 to 7.0.11-servicing.23425.2][2]
  - **dotnet-user-jwts**: [from 7.0.11-servicing.23422.8 to 7.0.11-servicing.23425.2][2]
  - **dotnet-user-secrets**: [from 7.0.11-servicing.23422.8 to 7.0.11-servicing.23425.2][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC95fefa4d1d&targetVersion=GCf469d78283&_a=files
[2]: https...
 2023-08-25 19:08:32 +00:00
DotNet Bot
67532b2845 Merged PR 33410: [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.AspNetCore.App.Ref**: from 7.0.11 to 7.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.11-servicing.23422.8 to 7.0.11-servicing.23425.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.11 to 7.0.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.11-servicing.23422.8 to 7.0.11-servicing.23425.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.11-servicing.23422.8 to 7.0.11-servicing.23425.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.11-servicing.23422.8 to 7.0.11-servicing.23425.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.11-servicing.23422.8 to 7.0.11-servicing.23425.2 (parent: Microsoft.NET.Sdk)

[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.35
- **Date Produced**: August 25, 2023 6:34:14 PM UTC
- **Commit**: d52e32cde3bfffcdb95d1eb0bc16251a8f3e53d4
- **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.26 to 7.0.111-servicing.23425.35][1]
  - **Microsoft.NET.Sdk**: [from 7.0.111-servicing.23425.26 to 7.0.111-servicing.23425.35][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.111-servicing.23425.26 to 7.0.111-servicing.23425.35][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 7.0.11 to 7.0.11][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.11-servicing.23422.8 to 7.0.11-servicing.23425.2][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.11 to 7.0.11][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.11-servicing.23422.8 to 7.0.11-servicing.23425.2][2]
  - **dotnet-dev-certs**: [from 7.0.11-servicing.23422.8 to 7.0.11-servicing.23425.2][2]
  - **dotnet-user-jwts**: [from 7.0.11-servicing.23422.8 to 7.0.11-servicing.23425.2][2]
  - **dotnet-user-secrets**: [from 7.0.11-servicing.23422.8 to 7.0.11-servicing.23425.2][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCdc70f49b6f&targetVersion=GCd52e32cde3&_a=files
[2]: https...
 2023-08-25 19:08:32 +00:00
DotNet-Bot
85f6922cb3 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.34 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.308 -> To Version 7.0.308

Dependency coherency updates

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
 From Version 7.0.11 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk
 2023-08-25 19:00:44 +00:00