Commit graph

26517 commits

Author SHA1 Message Date
Jason Zhai
c23d4aa142 Merge branch 'release/6.0.4xx' into release/7.0.1xx 2023-01-11 22:01:14 -08:00
dotnet-maestro[bot]
c66a9c4496
[release/6.0.4xx] Update dependencies from dotnet/arcade (#15261)
[release/6.0.4xx] Update dependencies from dotnet/arcade
2023-01-11 22:22:05 +00:00
v-wuzhai
cdcd5bab1f
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#15242) 2023-01-11 02:04:59 -08:00
Jason Zhai
fe5b067226 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-01-10 22:32:32 -08:00
William Godbe
7c2e144469
[6.0.4xx] Update asp.net templates (#15244) 2023-01-10 15:43:16 -08:00
William Godbe
ba627450f8
[6.0.3xx] Update Asp.Net templates (#15246) 2023-01-10 15:42:58 -08:00
Marc Paine
40cd09ee52
Merging internal commits for release/6.0.3xx (#15237) 2023-01-10 13:27:31 -08:00
Marc Paine
4beb82d928
Merging internal commits for release/6.0.4xx (#15238) 2023-01-10 13:27:18 -08:00
Sean Reeser
56bcc639e4 Merge commit '27ab36058b70b2e05063911df631fbf17f954a35' into internal-merge-6.0.4xx-2023-01-10-1108 2023-01-10 11:08:06 -08:00
Sean Reeser
d2ec709d0d Merge commit 'c61979521a4c6136fac9fa4d60f227c7971c6042' into internal-merge-6.0.3xx-2023-01-10-1107 2023-01-10 11:07:58 -08:00
Marc Paine
e0c95ad21e
Update branding to 7.0.103 (#15184) 2023-01-03 16:34:51 -08:00
Marc Paine
13c09a7c60
Update branding to 6.0.406 (#15183) 2023-01-03 15:54:48 -08:00
Marc Paine
3ceafae5c5
Update branding to 6.0.309 (#15182) 2023-01-03 15:49:15 -08:00
Sean Reeser
fb4333e3fd Update branding to 7.0.103 2023-01-03 15:11:57 -08:00
Sean Reeser
b9ce8d03de Update branding to 6.0.406 2023-01-03 15:11:52 -08:00
Sean Reeser
b36e17c794 Update branding to 6.0.309 2023-01-03 15:11:47 -08:00
v-wuzhai
86ea005bc5
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#15157) 2022-12-21 02:11:37 -08:00
Jason Zhai
26c5f71b86 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-12-21 00:08:52 -08:00
v-wuzhai
79613fc28a
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#15154) 2022-12-20 01:29:00 -08:00
Jason Zhai
704c2ea593 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-12-19 23:31:58 -08:00
NET Source-Build Bot
5174d50e4e
.NET Source-Build 6.0.112 December 2022 Updates (#15127) 2022-12-19 17:20:19 -08:00
dotnet-maestro[bot]
3c4322d8e5
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221208.2 (#15108)
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.22601.1 -> To Version 7.0.0-alpha.1.22608.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-12-09 09:20:47 -06:00
DotNet Bot
27ab36058b Merged PR 28069: [internal/release/6.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 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.12-servicing.22578.4 to 6.0.13-servicing.22601.6 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.12-servicing.22578.4 to 6.0.13-servicing.22601.6 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22568.7 to 6.0.13-servicing.22580.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.12-servicing.22568.7 to 6.0.13-servicing.22580.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.404 to 6.0.405 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.404-rtm.22575.6 to 6.0.405-rtm.22580.43 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.404 to 6.0.405 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.12-servicing.22568.10 to 6.0.13-servicing.22601.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.P...
2022-12-02 15:20:33 +00:00
DotNet Bot
c61979521a Merged PR 28083: [internal/release/6.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 6.0.13 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.13-servicing.22601.1 to 6.0.13-servicing.22601.6 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.13-servicing.22601.1 to 6.0.13-servicing.22601.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.13 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.13-servicing.22579.11 to 6.0.13-servicing.22601.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.13 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.13-servicing.22580.2 to 6.0.13-servicing.22601.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9
- **Build**: 20221201.36
- **Date Produced**: December 2, 2022 12:32:31 AM UTC
- **Commit**: 873cc1a88b27554f9f12d378b91861fc4b82ee56
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.308-servicing.22601.16 to 6.0.308-servicing.22601.36][1]
  - **Microsoft.NET.Sdk**: [from 6.0.308-servicing.22601.16 to 6.0.308-servicing.22601.36][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.13 to 6.0.13][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.13-servicing.22601.1 to 6.0.13-servicing.22601.6][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.13-servicing.22601.1 to 6.0.13-servicing.22601.6][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.13 to 6.0.13][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.13-servicing.22579.11 to 6.0.13-servicing.22601.1][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.13 to 6.0.13][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.13-servicing.22580.2 to 6.0.13-servicing.22601.5][4]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCe6ee3f4&targetVersion=GC873cc1a&_a=files
[2]: https://...
2022-12-02 01:41:45 +00:00
DotNet Bot
7d8d71a2e9 Merged PR 27923: [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**: 20221201.10
- **Date Produced**: December 1, 2022 5:48:23 PM UTC
- **Commit**: c1c65f7d7e470da27409a6b087d17aed0b64beeb
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.404-servicing.22578.8 to 6.0.405-servicing.22601.10][4]
  - **Microsoft.NET.Sdk**: [from 6.0.404-servicing.22578.8 to 6.0.405-servicing.22601.10][4]

[4]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC4b87201&targetVersion=GCc1c65f7&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
2022-12-01 19:48:44 +00:00
DotNet Bot
985447f2fe Merged PR 28024: [internal/release/6.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 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.12-servicing.22578.4 to 6.0.13-servicing.22601.1 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.12-servicing.22578.4 to 6.0.13-servicing.22601.1 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22568.7 to 6.0.13-servicing.22580.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.12-servicing.22568.7 to 6.0.13-servicing.22580.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.12-servicing.22571.9 to 6.0.13-servicing.22580.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.307 to 6.0.308 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.307-servicing.22575.5 to 6.0.308-servicing.22580.45 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.307 to 6.0.308 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.12-servicing.22568.10 to 6.0.13-servicing.22579.11 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft...
2022-12-01 19:48:16 +00:00
dotnet-maestro[bot]
de57a6e8e4
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221201.1 (#15077)
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.22531.3 -> To Version 7.0.0-alpha.1.22601.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-12-01 12:31:44 -06:00
DotNet Bot
0e4e584bba [internal/release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages 2022-12-01 13:31:18 +00:00
DotNet Bot
98712840e7 [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk 2022-12-01 10:33:48 +00:00
dotnet-bot
cba1b3bd98 Merge in 'release/6.0.4xx' changes 2022-11-30 23:08:19 +00:00
Marc Paine
78c26b9419
Merge pull request #15064 from dotnet-maestro-bot/merge/release/6.0.3xx-to-release/6.0.4xx
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'
2022-11-30 14:57:55 -08:00
Marc Paine
2b28337c1e
Merge pull request #15066 from dotnet/darc-release/6.0.4xx-1cebb19e-c314-4bf3-b2c4-759cf84b5048
[release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages
2022-11-30 14:57:36 -08:00
Marc Paine
79caab773c
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2022-11-30 09:20:43 -08:00
dotnet-maestro[bot]
97dc64711f Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221130.2
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22570.2 -> To Version 6.0.0-servicing.22580.2
2022-11-30 16:33:53 +00:00
dotnet-bot
07a449566e Merge in 'release/6.0.3xx' changes 2022-11-30 15:06:05 +00:00
dotnet-maestro-bot
1674f77f14
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#15058)
* [release/6.0.1xx] Add CI for security-partners-dotnet (#14963)

* Add CI for dotnet-security-partners

* Remove nuget configs from all repo submodules

* Address code review

* Move security-partners ci to tarball/eng dir

* Copy out installer NuGet config before build

* Fix relative path for installer template

* Update src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml

Co-authored-by: Michael Simons <msimons@microsoft.com>

* Revert "Remove nuget configs from all repo submodules"

This reverts commit 87b8a2c523eb03a5d3eee1dcde3e01c15bddc3d2.

Co-authored-by: Michael Simons <msimons@microsoft.com>

* Update branding to 6.0.113

Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: Sean Reeser <v-seanreeser@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
2022-11-30 08:57:17 -06:00
Marc Paine
2ce3123a08
Merge pull request #15051 from vseanreesermsft/branding-6.0.113-2022-11-29-1042
Update branding to 6.0.113
2022-11-29 12:23:49 -08:00
Marc Paine
ce2f541919
Merge pull request #15054 from vseanreesermsft/branding-7.0.102-2022-11-29-1042
Update branding to 7.0.102
2022-11-29 12:15:10 -08:00
dotnet-bot
fd441fcd64 Merge in 'release/6.0.4xx' changes 2022-11-29 19:33:28 +00:00
dotnet-bot
853f30348e Merge in 'release/6.0.3xx' changes 2022-11-29 19:33:00 +00:00
Marc Paine
7052aedf45
Merge pull request #15053 from vseanreesermsft/branding-6.0.405-2022-11-29-1042
Update branding to 6.0.405
2022-11-29 11:24:11 -08:00
Marc Paine
eead96c50f
Merge pull request #15052 from vseanreesermsft/branding-6.0.308-2022-11-29-1042
Update branding to 6.0.308
2022-11-29 11:22:39 -08:00
Sean Reeser
b1a9c9ca02 Update branding to 7.0.102 2022-11-29 10:42:32 -08:00
Sean Reeser
41303c7fc4 Update branding to 6.0.405 2022-11-29 10:42:27 -08:00
Sean Reeser
5621f190dc Update branding to 6.0.308 2022-11-29 10:42:23 -08:00
Sean Reeser
a01a61788b Update branding to 6.0.113 2022-11-29 10:42:18 -08:00
DotNet Bot
be4f3ec411 Merged PR 27854: [internal/release/6.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 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.404 to 6.0.404 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.404-rtm.22571.13 to 6.0.404-rtm.22575.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.404 to 6.0.404 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22568.10 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22523.2 to 6.0.12-servicing.22569.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20221128.8
- **Date Produced**: November 28, 2022 11:33:35 PM UTC
- **Commit**: 4b872018e4f78db68cdc8568b80999eb25b3d7c1
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.404-servicing.22572.23 to 6.0.404-servicing.22578.8][1]
  - **Microsoft.NET.Sdk**: [from 6.0.404-servicing.22572.23 to 6.0.404-servicing.22578.8][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.12 to 6.0.12][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4][2]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.404 to 6.0.404][3]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.404-rtm.22571.13 to 6.0.404-rtm.22575.6][3]
  - **Microsoft.DotNet.Common.ProjectTem...
2022-11-29 00:25:33 +00:00
DotNet Bot
55b7c993a1 Merged PR 27853: [internal/release/6.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 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.307 to 6.0.307 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.307-servicing.22571.12 to 6.0.307-servicing.22575.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.307 to 6.0.307 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22523.4 to 6.0.12-servicing.22568.10 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22523.2 to 6.0.12-servicing.22569.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9
- **Build**: 20221128.7
- **Date Produced**: November 28, 2022 11:33:02 PM UTC
- **Commit**: 9a2ae60264377b0ead2ddbaf4ecc0a307488a22e
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.307-servicing.22572.12 to 6.0.307-servicing.22578.7][1]
  - **Microsoft.NET.Sdk**: [from 6.0.307-servicing.22572.12 to 6.0.307-servicing.22578.7][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.12 to 6.0.12][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.12-servicing.22554.3 to 6.0.12-servicing.22578.4][2]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.307 to 6.0.307][3]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.307-servicing.22571.12 to 6.0.307-servicing.22575.5][3]
  - **Microsoft....
2022-11-29 00:25:25 +00:00
Chris Rummel
ca64f84e41
Override some versions for nonshipping runtime packages. (#15045)
Source-build 7.0.0 created these packages with an incorrect version number which is stuckthe previously-source-built PVP for the 7.0.1 release.  This causes a problem if bootstapping because the Microsoft versions of these packages don't actually exist, so trying to download them fails.  This change allows us to override the version read out of PVP and set it to the actual version used by runtime.
2022-11-28 17:12:22 -06:00
DotNet Bot
2e998bcbea Merged PR 27765: [internal/release/6.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 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22523.3 to 6.0.12-servicing.22554.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22523.3 to 6.0.12-servicing.22554.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.12 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20221122.23
- **Date Produced**: November 22, 2022 10:51:20 PM UTC
- **Commit**: f97d3fbf9f1ac425f1cd0d74efba7fa61d799fd1
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.404-servicing.22571.18 to 6.0.404-servicing.22572.23][1]
  - **Microsoft.NET.Sdk**: [from 6.0.404-servicing.22571.18 to 6.0.404-servicing.22572.23][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.12][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22523.3 to 6.0.12-servicing.22554.3][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22523.3 to 6.0.12-servicing.22554.3][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.12][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.12][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCbd3ef45&targetVersion=GCf97d3fb&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCee26d5b&targetVersion=GCfb08461&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
2022-11-22 23:17:59 +00:00