Commit graph

4731 commits

Author SHA1 Message Date
dotnet-bot
d63b17be66 Merge in 'release/6.0.1xx' changes 2023-06-23 18:40:24 +00:00
Matt Thalman
1aeb92395a
Fix SDK version of source-build global.json (#16798) 2023-06-23 18:31:22 +00:00
dotnet-bot
723d5b09c3 Merge in 'release/6.0.1xx' changes 2023-06-23 14:36:28 +00:00
NET Source-Build Bot
8f7ebafe7b
.NET Source-Build 6.0.118 June 2023 Updates (#16670) 2023-06-23 14:27:22 +00:00
Matt Thalman
47aeefdcc0 Merged PR 32193: Set OmniSharp run script to be executable
Backport of https://github.com/dotnet/installer/pull/16772 but had to be modified due to lack of API support in 6.0.
2023-06-22 22:18:15 +00:00
Jason Zhai
bb531ffeab Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-06-15 22:27:02 -07:00
Marc Paine
fae9cf2b3c
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx 2023-06-14 12:51:33 -07:00
Matt Mitchell
d01457385e Merged PR 31376: [internal/release/6.0.1xx] Merge from public
Merge from public release/6.0.1xx to internal/release/6.0.1xx and resolve conflicts if necessary
2023-05-19 16:48:52 +00:00
Matt Thalman
de8c9e71bd Merged PR 31351: Update source-build XML test baseline
The System.Runtime.CompilerServices.Unsafe.xml file no longer is reported as a missing XML doc from the source-build output. Removing it from the baseline.
2023-05-19 16:20:00 +00:00
Matt Thalman
58909d9656
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#16335) 2023-05-08 08:14:01 -05:00
dotnet-maestro-bot
aa85b410d2
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#16330)
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
2023-05-08 07:48:25 -05:00
Matt Thalman
9c98d91d6d
Fix Download MSFT sdk Tarball pattern (#16329) 2023-05-04 21:09:44 +00:00
Jason Zhai
0fcf9ecf2d Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-04-13 19:26:17 -07:00
v-wuzhai
7d4fa59970
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#16110) 2023-04-13 19:24:30 -07:00
Matt Thalman
224920d84e
Update MsftToSbSdk.diff (#16106) 2023-04-13 19:15:31 +00:00
Marc Paine
253b3575d5
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#16096) 2023-04-13 10:16:17 -07:00
Matt Thalman
668276750a
Write and upload updated baselines for source-build content tests (#16088)
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
2023-04-13 14:21:52 +00:00
Matt Thalman
013a5c821e
Update SB test baselines (#16087) 2023-04-13 07:44:57 -05:00
NET Source-Build Bot
31adef2d5f
.NET Source-Build 6.0.116 April 2023 Updates (#16048) 2023-04-11 16:25:18 -05:00
Jason Zhai
6f79e0b9da Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-03-15 19:46:46 -07:00
Marc Paine
251dc81c5e
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx 2023-03-15 12:58:21 -07:00
Chris Rummel
89cf0a81c7
Source-build 6.0.115 March 2023 updates. (#15799) 2023-03-15 11:03:37 -05:00
Jason Zhai
f8496d511c Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-03-09 21:49:55 -08:00
Jason Zhai
6eee81f109 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-03-07 18:42:11 -08:00
Jason Zhai
7514796e54 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-03-07 18:38:58 -08:00
Nikola Milosavljevic
8b853a54c1
[release/6.0.1xx] SDK diff exclusions - backport (#15676) 2023-03-02 09:04:12 -06:00
8616a1d236
[release/6.0.1xx] Arm support (#13378) 2023-02-21 15:44:46 -06:00
Jason Zhai
f707b71546 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-02-19 22:23:44 -08:00
Chris Rummel
914b24dcdd
.NET Source-Build 6.0.114 February 2023 Updates (#15560) 2023-02-17 10:28:43 -06:00
dotnet-maestro-bot
8b9ae41652
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#15473)
Co-authored-by: Sean Reeser <v-seanreeser@microsoft.com>
Co-authored-by: Daniel Plaisted <daplaist@microsoft.com>
Co-authored-by: Chris Rummel <crummel@microsoft.com>
Co-authored-by: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
2023-02-08 14:21:49 -08:00
dotnet-maestro-bot
f0a9fa30d3
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#15458)
Co-authored-by: Chris Rummel <crummel@microsoft.com>
Co-authored-by: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
2023-02-07 23:53:26 +00:00
Chris Rummel
41a85aa01d
Disable secure supply chain check.
These issues are checked for in the individual repos - by the time source-build is building the tarball they have already been processed and approved.
2023-02-02 13:06:10 -06:00
Jason Zhai
3c0e69e09d Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-01-12 22:05:56 -08:00
Jason Zhai
0185d3b525 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-01-11 22:13:38 -08:00
Matt Thalman
d625ce4fb0
Disable CheckEolTargetFramework for all projects (#15222) 2023-01-11 15:34:43 -06:00
NET Source-Build Bot
b6ccfab5b7
.NET Source-Build 6.0.113 January 2023 Updates (#15250) 2023-01-11 08:38:11 -06:00
NET Source-Build Bot
5174d50e4e
.NET Source-Build 6.0.112 December 2022 Updates (#15127) 2022-12-19 17:20:19 -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
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
Logan Bussell
9299e47ab5
[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>
2022-11-17 14:54:28 -08:00
Jason Zhai
ac4026589a Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-11-10 21:53:16 -08:00
Jason Zhai
fa25dc817a Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-11-10 00:29:39 -08:00
dotnet-maestro[bot]
5e29b02b24
[release/6.0.1xx] Update dependencies from dotnet/arcade (#14934)
* Update dependencies from https://github.com/dotnet/arcade build 20221108.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.22512.3 -> To Version 6.0.0-beta.22558.2

* Update SourceBuild.Tasks.csproj tfm

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
2022-11-09 09:50:55 -08:00
NET Source-Build Bot
7bdf6a5ad4
update global.json and Versions.props for .NET SDK 6.0.111 (#14932) 2022-11-09 17:43:09 +00:00
dotnet-maestro[bot]
b874e10f7c
[release/6.0.4xx] Update dependencies from dotnet/arcade (#14935)
* Update dependencies from https://github.com/dotnet/arcade build 20221108.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.22512.3 -> To Version 6.0.0-beta.22558.2

* Update SourceBuild.Tasks.csproj tfm

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
2022-11-09 09:22:49 -08:00
vseanreesermsft
e853b767df
Merging internal commits for release/6.0.1xx (#14926)
* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221017.6

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.110-servicing.22476.46 -> To Version 6.0.111-servicing.22517.6

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0
 From Version 6.0.10 -> To Version 6.0.11 (parent: Microsoft.NET.Sdk

* Update source-build CI to not arm64 leg on internal PRs

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221017.23

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.110-servicing.22476.46 -> To Version 6.0.111-servicing.22517.23

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,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.6.0
 From Version 6.0.10 -> To Version 6.0.11 (parent: Microsoft.NET.Sdk

* Merged PR 26839: Ignore EOL warning for net5.0 in F#.

Ignore EOL warning for net5.0 in F#.

* Merged PR 26844: [internal/release/6.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 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20221018.3
- **Date Produced**: October 18, 2022 5:40:56 PM UTC
- **Commit**: 1b66d2b6f799a623c351d2f4ea3e46a3a65c69c1
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22517.23 to 6.0.111-servicing.22518.3][1]
  - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22517.23 to 6.0.111-servicing.22518.3][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2]
  - **dotnet-dev-certs**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2]
  - **dotnet-user-secrets**: [from 6.0.11-servicing.22511.16 to 6.0.11-servicing.22517.15][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCd4e90ae&targetVersion=GC1b66d2b&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCb786d2b&targetVersion=GCcb12e45&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)

* Merged PR 26849: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk

This pull request updates the following dependencies

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20221018.14
- **Date Produced**: October 19, 2022 12:13:28 AM UTC
- **Commit**: f364505f98c1a6266cc3209616396c35f079e122
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22518.3 to 6.0.111-servicing.22518.14][2]
  - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22518.3 to 6.0.111-servicing.22518.14][2]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][3]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2][3]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][3]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.11-servicing.22513.6 to 6.0.11-servicing.22517.3][4]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][3]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.11-servicing.22517.1 to 6.0.11-servicing.22517.6][5]

[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1b66d2b&targetVersion=GCf364505&_a=files
[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC7b9c4cb&targetVersion=GCd43b60f&_a=files
[4]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCb7a706b&targetVersion=GC1821cb5&_a=files
[5]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC8d60cc7&targetVersion=GC4e1581e&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)

[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.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22518.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.Projec...

* Merged PR 26877: [internal/release/6.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.NETCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20221018.25
- **Date Produced**: October 19, 2022 4:49:17 AM UTC
- **Commit**: d2aa8e2e7c433a280775f3ab9845f5e602fb5537
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22518.14 to 6.0.111-servicing.22518.25][1]
  - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22518.14 to 6.0.111-servicing.22518.25][1]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.11 to 6.0.11][2]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9][2]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.11 to 6.0.11][2]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.11 to 6.0.11][2]
  - **Microsoft.NETCore.Platforms**: [from 6.0.7 to 6.0.7][2]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22514.6 to 6.0.11-servicing.22518.9][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCf364505&targetVersion=GCd2aa8e2&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCc672e90&targetVersion=GCaf5b37c&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)

* Merged PR 26888: [internal/release/6.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 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.111 to 6.0.111 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.111-servicing.22517.3 to 6.0.111-servicing.22518.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.111 to 6.0.111 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20221019.5
- **Date Produced**: October 19, 2022 3:05:49 PM UTC
- **Commit**: eea343b1bcf8392e2ddead88bafe9e9f18105cc2
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22518.25 to 6.0.111-servicing.22519.5][1]
  - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22518.25 to 6.0.111-servicing.22519.5][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2]
  - **dotnet-dev-certs**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2]
  - **dotnet-user-secrets**: [from 6.0.11-servicing.22517.15 to 6.0.11-servicing.22518.17][2]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.111 to 6.0.111][3]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.111-servicing.22517.3 to 6.0.111-servicing.22518.6][3]
...

* Merged PR 26911: [internal/release/6.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 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22519.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22517.6 to 6.0.11-servicing.22519.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20221019.20
- **Date Produced**: October 19, 2022 6:59:59 PM UTC
- **Commit**: c287c60f01cd4abc3efecfd992d2b8a227783900
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22519.5 to 6.0.111-servicing.22519.20][1]
  - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22519.5 to 6.0.111-servicing.22519.20][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22518.2 to 6.0.11-servicing.22519.3][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.11-servicing.22517.3 to 6.0.11-servicing.22519.5][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.11-servicing.22517.6 to 6.0.11-servicing.22519.2][4]

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

* Merged PR 26947: Also set CheckEolTargetFramework=false in F# bootstrap build.

F# bootstrap build also needs this argument.

* Merged PR 26995: [internal/release/6.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.NETCore.App.Ref**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.7 to 6.0.7 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: from 6.0.10 to 6.0.11 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20221023.4
- **Date Produced**: October 23, 2022 10:44:47 PM UTC
- **Commit**: 4c81383014030abdada230e871efd72be72ea5cb
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22519.20 to 6.0.111-servicing.22523.4][1]
  - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22519.20 to 6.0.111-servicing.22523.4][1]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.11 to 6.0.11][2]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4][2]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.11 to 6.0.11][2]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.11 to 6.0.11][2]
  - **Microsoft.NETCore.Platforms**: [from 6.0.7 to 6.0.7][2]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.9 to 6.0.11-servicing.22523.4][2]
  - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.100**: [from 6.0.10 to 6.0.11][3]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCc287c60&targetVersion=GC4c81383&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCaf5b37c&targ...

* Merged PR 27003: [internal/release/6.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 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.111 to 6.0.111 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.111-servicing.22518.6 to 6.0.111-servicing.22523.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.111 to 6.0.111 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20221023.14
- **Date Produced**: October 24, 2022 3:26:12 AM UTC
- **Commit**: ffccd7ef61bd64f4e01cb11e07dc2cdb88e90f54
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22523.4 to 6.0.111-servicing.22523.14][1]
  - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22523.4 to 6.0.111-servicing.22523.14][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2]
  - **dotnet-dev-certs**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2]
  - **dotnet-user-secrets**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.111 to 6.0.111][3]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.111-servicing.22518.6 to 6.0.111-servicing.22523.4][3]
  - **...

* Merged PR 27008: [internal/release/6.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 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.11-servicing.22519.5 to 6.0.11-servicing.22523.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.11-servicing.22519.2 to 6.0.11-servicing.22523.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20221023.21
- **Date Produced**: October 24, 2022 4:33:41 AM UTC
- **Commit**: 8f6e48c18dda13f4ddb7b447d4602629099d3639
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.111-servicing.22523.14 to 6.0.111-servicing.22523.21][1]
  - **Microsoft.NET.Sdk**: [from 6.0.111-servicing.22523.14 to 6.0.111-servicing.22523.21][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.11 to 6.0.11][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.11-servicing.22519.3 to 6.0.11-servicing.22523.3][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.11-servicing.22519.5 to 6.0.11-servicing.22523.4][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.11-servicing.22519.2 to 6.0.11-servicing.22523.2][4]

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

Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
Co-authored-by: DotNet-Bot <dn-bot@microsoft.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
Co-authored-by: Chris Rummel <crummel@microsoft.com>
2022-11-09 09:50:45 -06:00
dotnet-maestro-bot
753a4009a5
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#14911)
* Refactor source-build CI triggers and pools (#14835) (#14878)

* Update triggers to prevent tarball CI from running on 6.0.3xx and 6.0.4xx (#14896)

Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
2022-11-08 08:35:11 -06:00
Michael Simons
d454057851
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx 2022-11-07 17:18:24 -06:00
Michael Simons
081ee69e53
Refactor source-build CI triggers and pools (#14835) (#14878) 2022-11-04 12:04:36 -05:00
Marc Paine
72553f8783
Merge pull request #14889 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-03 22:51:23 -07:00
Marc Paine
7ad7e5f37f
Merge pull request #14836 from joeloff/finalizer2
Ensure finalizer only runs when no matching SDK feature bands are installed
2022-11-03 15:51:28 -07:00
Marc Paine
15aec658a5
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2022-11-03 13:22:52 -07:00
Jason Zhai
f3f7fb6c5d Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-11-02 22:26:15 -07:00
Jacques Eloff
319ac0113e Ensure finalizer only runs when no matching SDK feature bands are installed 2022-10-26 21:24:13 -07:00
Marc Paine
306e6009b3
Fix to final 3.1 build 2022-10-25 10:58:48 -07:00
dotnet-maestro-bot
5b327454b9
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#14807)
* Merged PR 25462: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk

This pull request updates the following dependencies

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20220919.14
- **Date Produced**: September 19, 2022 7:24:58 PM UTC
- **Commit**: 020b4fda1c3cf81307d8f13689d63bb3c09c91a8
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.109-servicing.22421.3 to 6.0.110-servicing.22469.14][23]
  - **Microsoft.NET.Sdk**: [from 6.0.109-servicing.22421.3 to 6.0.110-servicing.22469.14][23]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.9 to 6.0.10][24]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22464.9][24]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22464.9][24]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.9 to 6.0.10][25]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22463.20][25]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][25]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.9 to 6.0.10][25]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.9 to 6.0.10][25]
  - **Microsoft.NETCore.Platforms**: [from 6.0.5 to 6.0.6][26]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.9 to 6.0.10][27]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][27]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27]
  - **dotnet-dev-certs**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27]
  - **dotnet-user-secrets**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.109 to 6.0.110][28]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.109-servicing.22420.11 to 6.0.110-servicing.22464.25][28]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.109 to 6.0.110][28]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][24]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][24]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.9-servicing.22420.4 to 6.0.10-servicing.22456.13][29]
  - **Microsoft.Build**: [from 17.0.0 to 17.0.1][30]
  - **NuGet.Build.Tasks**: [from 6.0.2-rc.5 to 6.0.3-rc.1][31]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22463.20][25]

[23]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC7fffe6d&targetVersion=GC020b4fd&_a=files
[24]: https://dev.azure.com/dnceng/inte...

* Merged PR 26041: [internal/release/6.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 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22464.9 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22464.9 to 6.0.10-servicing.22470.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.10-servicing.22463.20 to 6.0.10-servicing.22469.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.10-servicing.22464.7 to 6.0.10-servicing.22469.29 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.110-servicing.22464.25 to 6.0.110-servicing.22470.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.9-servicing.22419.10 to 6.0.10-servicing.22470.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.10-servicing.22456...

* Merged PR 26213: [internal/release/6.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.NETCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.110-servicing.22470.2 to 6.0.110-servicing.22476.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20220926.22
- **Date Produced**: September 26, 2022 11:14:22 PM UTC
- **Commit**: 4041520e714b4334789706bde25e61ff91cf6c2b
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.110-servicing.22470.38 to 6.0.110-servicing.22476.22][1]
  - **Microsoft.NET.Sdk**: [from 6.0.110-servicing.22470.38 to 6.0.110-servicing.22476.22][1]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.10 to 6.0.10][2]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.10-servicing.22469.10 to 6.0.10-servicing.22476.5][2]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][2]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.10 to 6.0.10][2]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.10 to 6.0.10][2]
  - **Microsoft.NETCore.Platforms**: [from 6.0.6 to 6.0.6][2]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.110 to 6.0.110][3]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.110-servicing.22470.2 to 6.0.110-servicing.22476.12][3]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0*...

* Merged PR 26229: [internal/release/6.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 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.110-servicing.22476.12 to 6.0.110-servicing.22476.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.110 to 6.0.110 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20220926.31
- **Date Produced**: September 27, 2022 1:37:52 AM UTC
- **Commit**: cb11e73629ffbf6eee418a40fc602ceb752794fa
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.110-servicing.22476.22 to 6.0.110-servicing.22476.31][1]
  - **Microsoft.NET.Sdk**: [from 6.0.110-servicing.22476.22 to 6.0.110-servicing.22476.31][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.10 to 6.0.10][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.10 to 6.0.10][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2]
  - **dotnet-dev-certs**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2]
  - **dotnet-user-secrets**: [from 6.0.10-servicing.22469.29 to 6.0.10-servicing.22476.12][2]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.110 to 6.0.110][3]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.110-servicing.22476.12 to 6.0.110-servicing.2247...

* Merged PR 26243: [internal/release/6.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 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22470.9 to 6.0.10-servicing.22476.6 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22470.9 to 6.0.10-servicing.22476.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.10-servicing.22470.3 to 6.0.10-servicing.22476.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.10-servicing.22470.7 to 6.0.10-servicing.22476.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20220926.46
- **Date Produced**: September 27, 2022 3:39:36 AM UTC
- **Commit**: a886cd6214c92f6a5d955c056014820c35591e7b
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.110-servicing.22476.31 to 6.0.110-servicing.22476.46][1]
  - **Microsoft.NET.Sdk**: [from 6.0.110-servicing.22476.31 to 6.0.110-servicing.22476.46][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.10 to 6.0.10][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.10-...

* Update source-build tarball CI to utilize faster build agents (#14795)

Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
Co-authored-by: DotNet Bot <dn-bot@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>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
2022-10-21 08:16:04 -05:00
v-wuzhai
476b7a7d11
Merge pull request #14803 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'
2022-10-20 23:16:12 -07:00
Michael Simons
5700aea798
Update source-build tarball CI to utilize faster build agents (#14795) 2022-10-20 08:18:44 -05:00
Marc Paine
2932e0cd7c
Merge branch 'release/6.0.1xx' into internal-merge-6.0.1xx-2022-10-11-1010 2022-10-14 10:06:10 -07:00
Matt Mitchell
c058f55a7c
Merge branch 'release/6.0.4xx' into internal-merge-6.0.4xx-2022-10-11-1011 2022-10-13 13:47:08 -07:00
Marc Paine
216b75ce9c
Merge pull request #14742 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-10-12 15:30:16 -07:00
dotnet-maestro-bot
0263b7b7da
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#14726)
* [release/6.0.1xx] Enable online and offline source-build tarball build in all PRs (#14711)

* Enable online and offline source-build tarball build in all PRs (#14620)

* Fix source-build CI to not run tarball build when tarball creation fails (#14678)

* Fix source-build CI to not run tarball build when tarball creation failed

* Bad fix

* Revert test patch

* update global.json and Versions.props for .NET SDK 6.0.110 (#14717)

* [release/6.0.1xx] Re-write dotnet-watch smoke test (#14367)

* Re-write dotnet-watch smoke test

* Revert async changes

* Disable source-build tarball validation for non 6.0.1xx legs

Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
2022-10-12 16:14:53 -05:00
Jason Zhai
0d31263c5b Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-10-12 00:13:19 -07:00
Logan Bussell
7aec869534
[release/6.0.1xx] Re-write dotnet-watch smoke test (#14367)
* Re-write dotnet-watch smoke test

* Revert async changes
2022-10-12 01:57:55 +00:00
NET Source-Build Bot
c12ac467c7
update global.json and Versions.props for .NET SDK 6.0.110 (#14717) 2022-10-11 23:42:38 +00:00
Michael Simons
96efc2a855
[release/6.0.1xx] Enable online and offline source-build tarball build in all PRs (#14711)
* Enable online and offline source-build tarball build in all PRs (#14620)

* Fix source-build CI to not run tarball build when tarball creation fails (#14678)

* Fix source-build CI to not run tarball build when tarball creation failed

* Bad fix

* Revert test patch
2022-10-11 16:35:00 -05:00
Marc Paine
2d21c668bb
Merge pull request #14716 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'
2022-10-11 13:00:09 -07:00
Chris Rummel
b389d53439
Add support for using --with-packages with smoke-tests. (#14387) (#14587)
* Add support for using --with-packages with smoke-tests.

* Use a better variable name for custom packages directory.

* Swap conditions so we don't have to delete the archive directory.  Fixes https://github.com/dotnet/source-build/issues/2900.

* Update src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs

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

* Address review feedback.

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

Co-authored-by: Michael Simons <msimons@microsoft.com>
2022-10-11 13:43:26 -05:00
Marc Paine
f1161af25c
Merge pull request #14477 from ayakael/backports/pr-12516-to-release/6.0.1xx
[release/6.0.1xx] GetRuntimeInformation.targets: determine PortableProductMonikerRid based on OSName and Architecture. (backports #12516)
2022-10-11 10:24:07 -07:00
dotnet-bot
f03135fff0 Merge in 'release/6.0.1xx' changes 2022-09-22 15:02:50 +00:00
Logan Bussell
8aec008f2e
Fix MS.Extensions versions in dotnet-format (#14566) 2022-09-21 21:54:18 -07:00
DotNet Bot
5736f0f20f Merged PR 25462: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20220919.14
- **Date Produced**: September 19, 2022 7:24:58 PM UTC
- **Commit**: 020b4fda1c3cf81307d8f13689d63bb3c09c91a8
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.109-servicing.22421.3 to 6.0.110-servicing.22469.14][23]
  - **Microsoft.NET.Sdk**: [from 6.0.109-servicing.22421.3 to 6.0.110-servicing.22469.14][23]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.9 to 6.0.10][24]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22464.9][24]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.9-servicing.22420.3 to 6.0.10-servicing.22464.9][24]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.9 to 6.0.10][25]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22463.20][25]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][25]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.9 to 6.0.10][25]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.9 to 6.0.10][25]
  - **Microsoft.NETCore.Platforms**: [from 6.0.5 to 6.0.6][26]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.9 to 6.0.10][27]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][27]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27]
  - **dotnet-dev-certs**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27]
  - **dotnet-user-secrets**: [from 6.0.9-servicing.22419.26 to 6.0.10-servicing.22464.7][27]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.109 to 6.0.110][28]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.109-servicing.22420.11 to 6.0.110-servicing.22464.25][28]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.109 to 6.0.110][28]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][24]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.9 to 6.0.10][24]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.9-servicing.22420.4 to 6.0.10-servicing.22456.13][29]
  - **Microsoft.Build**: [from 17.0.0 to 17.0.1][30]
  - **NuGet.Build.Tasks**: [from 6.0.2-rc.5 to 6.0.3-rc.1][31]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22419.5 to 6.0.10-servicing.22463.20][25]

[23]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC7fffe6d&targetVersion=GC020b4fd&_a=files
[24]: https://dev.azure.com/dnceng/inte...
2022-09-20 15:12:44 +00:00
Matt Mitchell
b5f732e4b5
Merge pull request #14481 from vseanreesermsft/internal-merge-6.0.1xx-2022-09-13-1003
Merging internal commits for release/6.0.1xx
2022-09-14 14:38:45 -07:00
dotnet-bot
cfc0f130dc Merge in 'release/6.0.1xx' changes 2022-09-14 04:00:44 +00:00
NET Source-Build Bot
f9c278be33
.NET Source-Build 6.0.109 September 2022 Updates (#14482)
* update global.json and Versions.props for .NET SDK 6.0.109

* Use re-uploaded SB artifacts tarball version

Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
2022-09-14 03:50:12 +00:00
Daniel Plaisted
af7672089f Merged PR 25723: use mktemp to correctly use temp files
Apply https://dev.azure.com/dnceng/internal/_git/dotnet-installer/pullrequest/24828 to 6.0.4xx
2022-09-13 22:09:00 +00:00
Sean Reeser
24feaa10a1 Merge commit '58a93139d80490d0724b4d862ba8ee00ceae45d3' into internal-merge-6.0.1xx-2022-09-13-1003 2022-09-13 10:03:50 -07:00
Sean Reeser
1fdee73365 Merge commit 'd61314894c0fdcdb6e9d9c9f1ff5f8a483570d33' into internal-merge-6.0.3xx-2022-09-13-1003 2022-09-13 10:03:41 -07:00
Sean Reeser
2115855cf9 Merge commit '0906eae6f8c72882c197e346b9125f0b69c4b3a7' into internal-merge-6.0.4xx-2022-09-13-1003 2022-09-13 10:03:32 -07:00
73436261e3
GetRuntimeInformation.targets: determine PortableProductMonikerRid based on OSName and Architecture. (backports #12516) 2022-09-13 09:20:55 -04:00
Noah Gilson
be85081b6f use mktemp to correctly use temp files 2022-09-12 21:35:42 -04:00
dotnet-bot
4f86da42de Merge in 'release/6.0.1xx' changes 2022-09-01 19:28:34 +00:00
dotnet-bot
78380c12c3 Merge in 'release/6.0.4xx' changes 2022-09-01 19:28:26 +00:00
Alex Perovich
95d55b351e Update public pool names 2022-08-31 17:18:01 -07:00
Alex Perovich
ddfb6a9e05 Update public pool names 2022-08-31 17:17:51 -07:00
Alex Perovich
e3842453dc Update public pool names 2022-08-31 17:17:42 -07:00
Joshua Larkin
6e464725db Update ManualVersions.props for upcoming Windows SDK projection 2022-08-17 20:21:00 +00:00
Joshua Larkin
22f69f6349 Update ManualVersions.props for upcoming Windows SDK projection 2022-08-17 20:18:07 +00:00
Joshua Larkin
9e5f0c4313 Update ManualVersions.props for upcoming Windows SDK projection 2022-08-16 14:51:28 -04:00
NET Source-Build Bot
f2498acf16
update global.json and Versions.props for .NET SDK 6.0.108 (#14291) 2022-08-09 23:05:31 +00:00
Marc Paine
eaaf3b3160
Merge pull request #14276 from dotnet/marcpopMSFT-addbuildtoversion
Add the full nuget version into the .version file
2022-08-09 14:02:46 -07:00
Marc Paine
b33d35cbe4
Merge pull request #14266 from dotnet/marcpopMSFT-fixapphostdownload
Stop app host downloads for android
2022-08-09 11:48:32 -07:00
Marc Paine
063d79ea3e
Merge pull request #14270 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-08-08 15:51:27 -07:00
Marc Paine
e2a0da3d8f Add the full nuget version into the .version file 2022-08-08 14:21:30 -07:00
Marc Paine
372935eab6
Merge pull request #14268 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'
2022-08-05 15:48:17 -07:00
Michael Simons
e759aafdd0
Update delete files with questionable licenses logic (#14265) 2022-08-05 14:26:50 -05:00
Marc Paine
005dd2364d
Stop app host downloads for android 2022-08-05 12:04:17 -07:00
Marc Paine
9d5facb590
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2022-08-02 17:11:45 -07:00
Marc Paine
91727aeb14
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx 2022-08-02 12:55:16 -07:00
Marc Paine
cf729ea84f Fix the 6.0 WD template bundles to use the 6.0 templates. 2022-07-28 13:34:38 -07:00
Marc Paine
55859829cd
Actually update implicit version to 3.1.28 (#14187) 2022-07-21 10:56:34 -07:00
Marc Paine
6e22d938ef
Update to target 3.1.28 2022-07-14 11:13:38 -07:00
Marc Paine
da4c6c0b23 Fix logic for putting the manifests in the right location. 2022-07-13 17:15:27 -07:00
Marc Paine
6b9fa18ad7
Install the manifests into their specific feature band rather than the current band 2022-07-13 13:43:25 -07:00
NET Source-Build Bot
3c4e56a00a
update global.json and Versions.props for .NET SDK 6.0.107 (#14121) 2022-07-13 09:23:43 -07:00
MichaelSimons
d8580fbd61 Remove unneccessary source-build patch 2022-07-08 15:01:48 +00:00
Jason Zhai
46ac9ba248 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-07-07 19:22:36 -07:00
Logan Bussell
33743c8b9d
Update aspnetcore patch 2022-06-30 10:03:32 -07:00
Marc Paine
8c5b725f5f
Update GenerateBundledVersions.targets 2022-06-29 13:00:55 -07:00
MichaelSimons
3ffbd85ba1 Source-build fixups 2022-06-23 14:30:11 +00:00
Jason Zhai
8460e80d1a Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-06-23 00:11:58 -07:00
Chris Rummel
138bc32cd9
[source-build] [release/6.0.1xx] Additional changes to make the tarball commitable. (#14004)
* Additional changes to make the tarball commitable.
- Add an empty file so an empty packages/prebuilt directory is not removed (NuGet depends on all file sources existing even if empty).
- Use version of source-build-externals with fix for patching in a broken git repo.
- Delete `objects` directory from submodule .gitdirs.

* Enable work-tree and unsafe-paths for repo-level patches to be able to apply in the checked-in tarball.

* Update src/SourceBuild/tarball/patches/nuget-client/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch

Co-authored-by: Michael Simons <msimons@microsoft.com>
2022-06-22 20:33:09 +00:00
Chris Rummel
64a3acb5d0
Fixups to make the tarball committable (#13894) (#13995) 2022-06-15 17:56:59 -05:00
Chris Rummel
6f98d9441d
Fixups to make the tarball committable (#13894) (#13994) 2022-06-15 17:56:07 -05:00
Chris Rummel
898bfe7356
Fixups to make the tarball committable (#13894) 2022-06-15 17:52:57 -05:00
Matt Mitchell
75d4c37cea
Merge pull request #13969 from vseanreesermsft/internal-merge-6.0.3xx-2022-06-14-1031
Merging internal commits for release/6.0.3xx
2022-06-15 12:14:59 -07:00
NET Source-Build Bot
564757c6a5
.NET Source-Build 6.0.106 June 2022 Updates (#13978)
* update global.json and Versions.props for .NET SDK 6.0.106

* Fix Versions.props

Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
2022-06-15 06:07:50 +00:00
Manodasan Wignarajah
aac14e609b
Add support for targeting Windows version 22621 and update Windows SDK projections. (#13976) 2022-06-14 16:34:46 -07:00
Manodasan Wignarajah
616cfe956e
Add support for targeting Windows version 22621 and update Windows SDK projections. (#13975) 2022-06-14 16:34:39 -07:00
Daniel Plaisted
2b6b35eb59
Merge pull request #13977 from manodasanW/release/6.0.4xx
[release/6.0.4xx] Add support for targeting Windows version 22621 and update Windows SDK projections
2022-06-14 16:02:40 -07:00
dotnet-maestro-bot
46ba3d49a8
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#13962)
* Update format of multiple /p parameters

* [release/6.0.3xx] Add razor-compiler to Source Build (#13652)

* Remove NuGet.Client source-build patches

Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
2022-06-14 14:58:21 -07:00
Michael Simons
46f03f644c
Remove source-build nuget.client patch that was backported (#13972) 2022-06-14 20:41:51 +00:00
Sean Reeser
dc1bc88432 Merge commit '43f9b184817e4f48ba091d068a4d517c86daafd3' into internal-merge-6.0.3xx-2022-06-14-1031 2022-06-14 10:31:06 -07:00
Manodasan Wignarajah
87fc91672a Add support for targeting Windows version 22621 and update Windows SDK projections. 2022-06-14 01:23:16 -07:00
Logan Bussell
85086602ad
[release/6.0.3xx] Add razor-compiler to Source Build (#13652) 2022-06-13 22:26:28 +00:00
Jason Zhai
be2059a26b Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-06-09 20:11:25 -07:00
Chris Rummel
17c1d67be5
[release/6.0.3xx] Handle NuGet package source mapping in source-build tasks. (#13733) 2022-06-09 12:57:38 -05:00
Jakub Jareš
0c7c5381b9 Fix cross-gen for DumpMinitool 2022-06-09 08:06:36 +02:00
Marc Paine
138d21e534
Merge pull request #13863 from dotnet/marcpopMSFT-fixdebbuild
Fix the deb build by getting debuild first
2022-06-08 13:05:45 -07:00
Marc Paine
fd0c042c55
Merge pull request #13864 from dotnet/marcpopMSFT-fixdebbuild
Fix the deb build
2022-06-08 13:05:42 -07:00
Marc Paine
92f9b7b00d
Merge pull request #13908 from dotnet/marcpopMSFT-fixdebbuild
Remove the external docker files and fix the debbuild
2022-06-08 13:05:34 -07:00
Marc Paine
8b16a6268f
Only run the deb build on specific legs 2022-06-03 09:12:24 -07:00
Marc Paine
949b047558
Merge pull request #13880 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-05-27 16:30:26 -07:00
dotnet-bot
43f9b18481 Merge in 'release/6.0.3xx' changes 2022-05-27 18:09:36 +00:00
Marc Paine
8845807f72
Update GenerateBundledVersions.targets 2022-05-27 10:22:17 -07:00
Marc Paine
6c07a124b9
Update GenerateBundledVersions.targets 2022-05-27 10:20:07 -07:00
Marc Paine
b6032c3f2c
Merge pull request #13853 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-05-20 15:34:38 -07:00
DotNet Bot
cc7da5b9f3 Merged PR 23001: [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.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.6-servicing.22260.6 to 6.0.6-servicing.22267.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.6-servicing.22260.6 to 6.0.6-servicing.22267.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22255.10 to 6.0.6-servicing.22267.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.6-servicing.22255.10 to 6.0.6-servicing.22267.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.6-servicing.22260.10 to 6.0.6-servicing.22267.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.6-servicing.22260.10 to 6.0.6-servicing.22267.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.6-servicing.22260.10 to 6.0.6-servicing.22267.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.6-servicing.22260.10 to 6.0.6-servicing.22267.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.6-servicing.22255.2 to 6.0.6-servicing.22266.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.6 to 6.0.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.6-servicing.22255.5 to 6.0.6-servicing.22267.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## Fro...
2022-05-18 21:57:33 +00:00
Jason Zhai
6e89ea62c7 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-05-15 21:30:09 -07:00
Michael Simons
e7e17f8252
Update TestScenario to use rid based on current arch (#13819) 2022-05-11 13:35:39 -05:00
Jason Zhai
81727dce7a Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-05-10 23:31:14 -07:00
Jason Zhai
d0481884ef Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-05-10 23:21:04 -07:00
NET Source-Build Bot
9fe7aa2179
update global.json and Versions.props for .NET SDK 6.0.105 (#13821) 2022-05-11 04:25:00 +00:00
vseanreesermsft
72a85dfc6a
Merging internal commits for release/6.0.1xx (#13812)
* Merged PR 22398: [internal/release/6.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 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.4-servicing.22165.2 to 6.0.5-servicing.22213.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.4-servicing.22165.2 to 6.0.5-servicing.22213.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.4-servicing.22164.4 to 6.0.5-servicing.22213.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22214.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22214.12 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22214.12 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22214.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.104 to 6.0.105 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.104-servicing.22164.8 to 6.0.105-servicing.22214.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.104 to 6.0.105 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Net.Compilers.Toolset**: from 4.0.1-1.22157.22 to 4.0.1-1.22181.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22164.4 to 6.0.5-servicing.22213.9 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b...

* Merged PR 22415: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk

This pull request updates the following dependencies

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20220418.14
- **Date Produced**: April 18, 2022 10:36:29 PM UTC
- **Commit**: e910b873d7d62011eb83d9ec9ad2ad09e4a1a2fb
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.105-servicing.22217.2 to 6.0.105-servicing.22218.14][1]
  - **Microsoft.NET.Sdk**: [from 6.0.105-servicing.22217.2 to 6.0.105-servicing.22218.14][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)

* Merged PR 22459: Update source-build to AspNetCoreSharedFxInstallerRid property rename

AspNetCoreSharedFxInstallerRid was renamed to AspNetCoreInstallerRid in 7ce479f5e7.

* Merged PR 22507: [internal/release/6.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 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.5-servicing.22213.4 to 6.0.5-servicing.22215.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.5-servicing.22213.4 to 6.0.5-servicing.22215.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.4-servicing.22165.3 to 6.0.5-servicing.22215.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20220420.15
- **Date Produced**: April 20, 2022 5:24:23 PM UTC
- **Commit**: 0ad59d00ed13d3b5cd1343efb4dde64714f70063
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.105-servicing.22218.14 to 6.0.105-servicing.22220.15][1]
  - **Microsoft.NET.Sdk**: [from 6.0.105-servicing.22218.14 to 6.0.105-servicing.22220.15][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.5 to 6.0.5][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.5-servicing.22213.4 to 6.0.5-servicing.22215.11][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.5-servicing.22213.4 to 6.0.5-servicing.22215.11][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.5 to 6.0.5][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.5 to 6.0.5][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.4-servicing.22165.3 to 6.0.5-servicing.22215.9][3]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCe910b87&targetVersion=GC0ad59d0&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC0636f1e&targetVersion=GCad94063&_a=files
[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCfcb07d6&targetVersion=GC14bf2e5&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208...

* Merged PR 22538: [internal/release/6.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 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20220421.11
- **Date Produced**: April 21, 2022 4:12:47 PM UTC
- **Commit**: ce948f426d1c884d4a7315bd4d745590a797bd48
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.105-servicing.22220.15 to 6.0.105-servicing.22221.11][1]
  - **Microsoft.NET.Sdk**: [from 6.0.105-servicing.22220.15 to 6.0.105-servicing.22221.11][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.5 to 6.0.5][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.5 to 6.0.5][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2][2]
  - **dotnet-dev-certs**: [from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2][2]
  - **dotnet-user-secrets**: [from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC0ad59d0&targetVersion=GCce948f4&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCdd34abd&targetVersion=GCe5f183b&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)

Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
Co-authored-by: DotNet Bot <dn-bot@microsoft.com>
Co-authored-by: Michael Simons (VISUAL STUDIO) <Michael.Simons@microsoft.com>
2022-05-10 17:36:26 -07:00
Sean Reeser
e90af97f22 Merge commit '8473146e7d8d3de5d9558239c46e62d12314d52b' into internal-merge-6.0.3xx-2022-05-10-1208 2022-05-10 12:08:23 -07:00
Marc Paine
cc20380d85
Merge pull request #13735 from dotnet/marcpopMSFT-crosstargetarm64apphosts
Add the cross-targeting app host packs to the arm64 installer
2022-05-10 09:44:28 -07:00
Jason Zhai
305c2d164e Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-05-04 21:15:38 -07:00
Michael Simons
2e47208356
Fix two broken <repo.sha> path references (#13745) 2022-05-03 18:56:39 -05:00
Daniel Plaisted
085ba133f7
Merge pull request #13360 from dsplaisted/linux-arm64-and-mariner2
Add Arm64 RHEL builds
2022-05-03 16:45:19 -07:00
Marc Paine
edea73be18
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2022-05-03 14:59:41 -07:00