Commit graph

24622 commits

Author SHA1 Message Date
Doug Bunting
e3c78bf16d
[6.0.3xx] Update template versions from dotnet/aspnetcore (#13840) 2022-05-13 14:24:38 -07:00
Doug Bunting
ff5d93bff8
[6.0.4xx] Update template versions from dotnet/aspnetcore (#13841) 2022-05-13 14:24:31 -07:00
Doug Bunting
ee1b7085a6
[6.0.1xx] Update template versions from dotnet/aspnetcore (#13839) 2022-05-13 14:24:13 -07:00
Logan Bussell
b555f1cb54
[main] Onboard roslyn-analyzers and aspnetcore to source-build (#13830) 2022-05-13 15:24:06 -05:00
Chris Rummel
b648ad31b1
[main] Handle NuGet package source mapping in source-build tasks. (#13788) 2022-05-13 14:52:42 -05:00
dotnet-maestro[bot]
b14efdd3e8 Update dependencies from https://github.com/dotnet/sdk build 20220513.20
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22263.20

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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.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,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 6.0.4 -> To Version 6.0.5 (parent: Microsoft.NET.Sdk
2022-05-13 18:41:45 +00:00
dotnet-maestro[bot]
873a395a93 Update dependencies from https://github.com/dotnet/sdk build 20220513.6
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22263.6

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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.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,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 6.0.4 -> To Version 6.0.5 (parent: Microsoft.NET.Sdk
2022-05-13 13:11:54 +00:00
dotnet-maestro[bot]
e42c70d7c0 Update dependencies from https://github.com/dotnet/arcade build 20220512.8
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 7.0.0-beta.22261.14 -> To Version 7.0.0-beta.22262.8

Dependency coherency updates

Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks
 From Version 1.2.0-beta-22259-01 -> To Version 1.2.0-beta-22260-02 (parent: Microsoft.DotNet.Arcade.Sdk
2022-05-13 12:31:25 +00:00
dotnet-maestro[bot]
bf117cb0d3
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220512.1 (#13832)
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages


 - Merge branch 'release/6.0.1xx' of https://github.com/dotnet/installer into darc-release/6.0.1xx-7bf204aa-9e0a-41ec-a411-ae6cd93b52b9
2022-05-13 07:54:02 +00:00
dotnet-maestro[bot]
fef0562ee6 Update dependencies from https://github.com/dotnet/sdk build 20220512.32
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22262.32

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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.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,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 6.0.4 -> To Version 6.0.5 (parent: Microsoft.NET.Sdk
2022-05-13 06:58:04 +00:00
dotnet-maestro[bot]
f05c1cde28
Update dependencies from https://github.com/dotnet/arcade build 20220511.14 (#13831)
[main] Update dependencies from dotnet/arcade
2022-05-13 05:53:38 +00:00
dotnet-maestro[bot]
62682ff5c2
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220511.1 (#13829)
[main] Update dependencies from dotnet/source-build-reference-packages
2022-05-13 05:51:04 +00:00
dotnet-maestro[bot]
bc534ac149 Update dependencies from https://github.com/dotnet/sdk build 20220512.31
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22262.31

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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.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,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 6.0.4 -> To Version 6.0.5 (parent: Microsoft.NET.Sdk
2022-05-13 05:24:15 +00:00
dotnet-maestro[bot]
48843f3e8f
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220512.1 (#13834)
[release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages
2022-05-13 04:12:42 +00:00
Logan Bussell
59df269041
[main] Onboard runtime-portable and runtime (#13770)
* Enable runtime and runtime-portable in source-build known-good.proj

* Add patch that retargets runtime to net7.0

* Re-enable RepositoryReferences to runtime in other repos
2022-05-12 17:09:11 -07:00
dotnet-maestro[bot]
a6d7629c98 Update dependencies from https://github.com/dotnet/sdk build 20220512.18
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22262.18

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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.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.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Build
 From Version 6.0.4 -> To Version 6.0.5 (parent: Microsoft.NET.Sdk
2022-05-12 22:40:36 +00:00
dotnet-maestro[bot]
e22d016def Update dependencies from https://github.com/dotnet/sdk build 20220512.11
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22262.11

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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.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.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Build
 From Version 6.0.4 -> To Version 6.0.5 (parent: Microsoft.NET.Sdk
2022-05-12 20:20:44 +00:00
dotnet-maestro[bot]
e01c18dae4
Update dependencies from https://github.com/dotnet/arcade build 20220511.7 (#13836)
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22254.3 -> To Version 6.0.0-beta.22261.7

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-05-12 11:16:09 -07:00
dotnet-maestro[bot]
8e2b01df3f
Update dependencies from https://github.com/dotnet/arcade build 20220511.7 (#13835)
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22254.3 -> To Version 6.0.0-beta.22261.7

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-05-12 11:15:48 -07:00
dotnet-maestro[bot]
e7e3f6810f Update dependencies from https://github.com/dotnet/sdk build 20220511.17
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22261.17

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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.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.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Build
 From Version 6.0.4 -> To Version 6.0.5 (parent: Microsoft.NET.Sdk
2022-05-11 22:20:56 +00:00
Marc Paine
25d225d6c3
Merge pull request #13801 from dotnet/marcpopMSFT-removeoldubuntu
Remove 16.04 ubuntu legs and old docker files.
2022-05-11 14:36:16 -07:00
Michael Simons
e7e17f8252
Update TestScenario to use rid based on current arch (#13819) 2022-05-11 13:35:39 -05:00
dotnet-maestro[bot]
0be55844f8
Update dependencies from https://github.com/dotnet/arcade build 20220510.2 (#13825)
[main] Update dependencies from dotnet/arcade
- Coherency Updates:
  - Microsoft.SourceLink.GitHub: from 1.2.0-beta-22258-01 to 1.2.0-beta-22259-01 (parent: Microsoft.DotNet.Arcade.Sdk)
2022-05-11 18:05:01 +00:00
dotnet-maestro[bot]
5aa38fc977
Update dependencies from https://github.com/dotnet/test-templates build 20220511.1 (#13824)
[main] Update dependencies from dotnet/test-templates
2022-05-11 18:02:24 +00:00
dotnet-maestro[bot]
7118da0861 Update dependencies from https://github.com/dotnet/sdk build 20220511.4
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22261.4

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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.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.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Build
 From Version 6.0.4 -> To Version 6.0.5 (parent: Microsoft.NET.Sdk
2022-05-11 16:48:06 +00:00
dotnet-maestro[bot]
f4831d9ec8 Update dependencies from https://github.com/dotnet/sdk build 20220511.3
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22260.30 -> To Version 6.0.400-preview.22261.3

Dependency coherency updates

Microsoft.Build
 From Version 17.3.0-preview-22259-01 -> To Version 17.3.0-preview-22261-02 (parent: Microsoft.NET.Sdk
2022-05-11 15:40:14 +00:00
Matt Mitchell
e458f68b5c
Merge pull request #13820 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-05-11 08:30:16 -07:00
v-wuzhai
0b38e9f904
Merge pull request #13823 from dotnet/darc-release/6.0.4xx-18a150f7-fa93-427a-9e59-3566ce7705bc
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-05-11 02:05:24 -07:00
dotnet-maestro[bot]
ed8d729bf8 Update dependencies from https://github.com/dotnet/sdk build 20220510.30
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22260.23 -> To Version 6.0.400-preview.22260.30

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.3.0-2.22260.4 -> To Version 4.3.0-2.22260.5 (parent: Microsoft.NET.Sdk
2022-05-11 07:38:36 +00:00
v-wuzhai
cc5ac02b4c
Merge pull request #13810 from dotnet/darc-main-dc00e914-4391-4e2c-adb3-e2d3411f0555
[main] Update dependencies from dotnet/arcade
2022-05-10 23:34:05 -07:00
v-wuzhai
31758156f3
Merge pull request #13822 from dotnet/darc-release/6.0.4xx-cabb13df-933f-4fa0-aacd-5e92ba6be2bf
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-05-10 23:33:23 -07: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
dotnet-maestro[bot]
8f637ffc7d Update dependencies from https://github.com/dotnet/sdk build 20220510.23
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22260.1 -> To Version 6.0.400-preview.22260.23

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.3.0-2.22259.10 -> To Version 4.3.0-2.22260.4 (parent: Microsoft.NET.Sdk
2022-05-11 03:23:49 +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
Marc Paine
b780816763
Merge pull request #13818 from dotnet/marcpopMSFT-updateimplicitversions
Update implicit versions
2022-05-10 13:54:01 -07:00
Marc Paine
77c0a24d72
Merge pull request #13814 from vseanreesermsft/internal-merge-6.0.3xx-2022-05-10-1208
Merging internal commits for release/6.0.3xx
2022-05-10 13:19:40 -07:00
Marc Paine
71250d9bb3
Update GenerateBundledVersions.targets 2022-05-10 12:25:57 -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
Michael Simons
ccef905a85
Enable fsharp build in source-build tarball (#13738) 2022-05-10 08:50:32 -05:00
dotnet-maestro[bot]
684d4d0d8b Update dependencies from https://github.com/dotnet/arcade build 20220509.5
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 7.0.0-beta.22255.2 -> To Version 7.0.0-beta.22259.5

Dependency coherency updates

Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks
 From Version 1.2.0-beta-22251-01 -> To Version 1.2.0-beta-22258-01 (parent: Microsoft.DotNet.Arcade.Sdk
2022-05-10 12:34:27 +00:00
v-wuzhai
da9dcce306
Merge pull request #13798 from dotnet/darc-main-b606fb9e-091c-4fb9-ac52-d37428c4d283
[main] Update dependencies from dotnet/sdk
2022-05-10 02:22:28 -07:00
v-wuzhai
d543dcde5e
Merge pull request #13808 from dotnet/darc-release/6.0.4xx-d3600eb1-6b25-46cc-80a3-36ef3180216f
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-05-10 02:21:25 -07:00
v-wuzhai
8cd3ca1d52
Merge pull request #13806 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-05-10 02:20:12 -07:00
dotnet-maestro[bot]
b4b53efa2e Update dependencies from https://github.com/dotnet/sdk build 20220510.1
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22259.15 -> To Version 6.0.400-preview.22260.1

Dependency coherency updates

Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 4.3.0-2.22257.1 -> To Version 4.3.0-2.22259.10 (parent: Microsoft.NET.Sdk
2022-05-10 07:58:27 +00:00
Jason Zhai
ffa3570a2e Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-05-09 23:51:19 -07:00
dotnet-maestro[bot]
60e0fae92c Update dependencies from https://github.com/dotnet/sdk build 20220509.19
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.400-preview.22259.15 -> To Version 6.0.400-preview.22259.19

Dependency coherency updates

Microsoft.Build
 From Version 17.3.0-preview-22256-03 -> To Version 17.3.0-preview-22259-01 (parent: Microsoft.NET.Sdk
2022-05-10 06:49:56 +00:00
dotnet-maestro[bot]
beda57f6b8 Update dependencies from https://github.com/dotnet/sdk build 20220509.18
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.5.22256.17 -> To Version 7.0.100-preview.5.22259.18

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-preview.5.22255.12 -> To Version 7.0.0-preview.5.22259.2 (parent: Microsoft.NET.Sdk
2022-05-10 06:37:01 +00:00