* Revert "Revert "[release/6.0.1xx] Switch to stable RTM branding" (#12470)"
This reverts commit 2bca7f450a.
* Workaround F# failures in tests
* No need for feed
[release/6.0.1xx-rc2] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rc.2.21459.14 to 6.0.0-rc.2.21465.8 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rc.2.21459.14 to 6.0.0-rc.2.21465.8 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rc.2.21459.14 to 6.0.0-rc.2.21465.8 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Ref: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21464.21 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21464.21 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21464.21 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21464.21 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21464.21 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.Platforms: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21464.21 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref: from 6.0.0-rc.2.21460.4 to 6.0.0-rc.2.21465.1 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rc.2.21460.4 to 6.0.0-rc.2.21465.1 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rc.2.21460.4 to 6.0.0-rc.2.21465.1 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21460.4 to 6.0.0-rc.2.21465.1 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 6.0.0-rc.2.21460.4 to 6.0.0-rc.2.21465.1 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 6.0.0-rc.2.21460.4 to 6.0.0-rc.2.21465.1 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rc.2.21459.6 to 6.0.100-rtm.21465.1 (parent: Microsoft.NET.Sdk)
- Microsoft.TemplateEngine.Cli: from 6.0.100-rc.2.21459.6 to 6.0.100-rtm.21465.1 (parent: Microsoft.NET.Sdk)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rc.2.21459.14 to 6.0.0-rc.2.21465.8 (parent: Microsoft.NET.Sdk)
- Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rc.2.21459.12 to 6.0.0-rtm.21464.18 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rc.2.21459.14 to 6.0.0-rc.2.21465.8 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rc.2.21459.13 to 6.0.0-rc.2.21465.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21457.19 to 4.0.0-5.21466.5 (parent: Microsoft.NET.Sdk)
- Microsoft.Build: from 17.0.0-preview-21460-01 to 17.0.0-preview-21465-01 (parent: Microsoft.NET.Sdk)
- NuGet.Build.Tasks: from 6.0.0-preview.4.243 to 6.0.0-rc.244 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rc.2.21460.8 to 6.0.0-rc.2.21464.21 (parent: Microsoft.NET.Sdk)
- Microsoft.SourceBuild.Intermediate.source-build: from 0.1.0-alpha.1.21460.1 to 0.1.0-alpha.1.21460.1 (parent: Microsoft.NET.Sdk)
- React to https://github.com/dotnet/templating/issues/3898
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.6.21274.7 to 6.0.0-preview.6.21276.1 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.6.21274.7 to 6.0.0-preview.6.21276.1 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.6.21274.1 to 6.0.0-preview.6.21275.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Ref: from 6.0.0-preview.6.21274.1 to 6.0.0-preview.6.21275.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.6.21274.1 to 6.0.0-preview.6.21275.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.6.21274.1 to 6.0.0-preview.6.21275.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.6.21274.1 to 6.0.0-preview.6.21275.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.Platforms: from 6.0.0-preview.6.21274.1 to 6.0.0-preview.6.21275.1 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.6.21274.12 to 6.0.0-preview.6.21275.8 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.6.21274.12 to 6.0.0-preview.6.21275.8 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.6.21274.12 to 6.0.0-preview.6.21275.8 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.6.21274.12 to 6.0.0-preview.6.21275.8 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 6.0.0-preview.6.21274.12 to 6.0.0-preview.6.21275.8 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 6.0.0-preview.6.21274.12 to 6.0.0-preview.6.21275.8 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.6.21275.1 to 6.0.100-preview.6.21276.3 (parent: Microsoft.NET.Sdk)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.6.21274.7 to 6.0.0-preview.6.21276.1 (parent: Microsoft.NET.Sdk)
- Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-preview.6.21274.6 to 6.0.0-preview.6.21276.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.6.21274.7 to 6.0.0-preview.6.21276.1 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.6.21274.6 to 6.0.0-preview.6.21276.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.Net.Compilers.Toolset: from 4.0.0-1.21274.8 to 4.0.0-1.21275.5 (parent: Microsoft.NET.Sdk)
- NuGet.Build.Tasks: from 5.10.0-rc.7240 to 6.0.0-preview.1.66 (parent: Microsoft.NET.Sdk)
- Remove test for reactredux template
See dotnet/aspnetcore#32598
* fixesdotnet/templating#3054dotnet/templating#2797 checks if the templates shipped with SDK have net6.0 set as default framework
adds new data sets for templating managed templates
adds basic tests on item templates as they were missing
console templates are targeting net6.0 already so fixesdotnet/installer#8974
* made a special case for 'grpc' not to run on linux-musl
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.4.21213.9 to 6.0.0-preview.4.21215.3 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.4.21213.9 to 6.0.0-preview.4.21215.3 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.4.21213.3 to 6.0.0-preview.4.21215.2 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Ref: from 6.0.0-preview.4.21213.3 to 6.0.0-preview.4.21215.2 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.4.21213.3 to 6.0.0-preview.4.21215.2 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.4.21213.3 to 6.0.0-preview.4.21215.2 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.4.21213.3 to 6.0.0-preview.4.21215.2 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.Platforms: from 6.0.0-preview.4.21213.3 to 6.0.0-preview.4.21215.2 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.4.21213.1 to 6.0.0-preview.4.21215.16 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.4.21213.1 to 6.0.0-preview.4.21215.16 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.4.21213.1 to 6.0.0-preview.4.21215.16 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.4.21213.1 to 6.0.0-preview.4.21215.16 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 6.0.0-preview.4.21213.1 to 6.0.0-preview.4.21215.16 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 6.0.0-preview.4.21213.1 to 6.0.0-preview.4.21215.16 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.4.21213.1 to 6.0.100-preview.4.21216.1 (parent: Microsoft.NET.Sdk)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.4.21213.9 to 6.0.0-preview.4.21215.3 (parent: Microsoft.NET.Sdk)
- Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-preview.4.21213.10 to 6.0.0-preview.4.21215.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.4.21213.9 to 6.0.0-preview.4.21215.3 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.4.21213.18 to 6.0.0-preview.4.21215.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.FSharp.Compiler: from 11.4.2-beta.21212.7 to 11.4.2-beta.21214.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.2.21212.5 to 6.0.100-preview.2.21215.2 (parent: Microsoft.NET.Sdk)
- Microsoft.Net.Compilers.Toolset: from 3.10.0-3.21213.18 to 3.10.0-3.21215.28 (parent: Microsoft.NET.Sdk)
- validate inserted manifest
- Merge branch 'darc-main-64df7133-1e9b-45ab-b603-1cefc648ba97' of https://github.com/dotnet/core-sdk into darc-main-64df7133-1e9b-45ab-b603-1cefc648ba97
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.4.21206.2 to 6.0.0-preview.4.21212.1 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.4.21206.2 to 6.0.0-preview.4.21212.1 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.4.21205.3 to 6.0.0-preview.4.21213.3 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Ref: from 6.0.0-preview.4.21205.3 to 6.0.0-preview.4.21213.3 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.4.21205.3 to 6.0.0-preview.4.21213.3 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.4.21205.3 to 6.0.0-preview.4.21213.3 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.4.21205.3 to 6.0.0-preview.4.21213.3 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.Platforms: from 6.0.0-preview.4.21205.3 to 6.0.0-preview.4.21213.3 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.4.21207.16 to 6.0.0-preview.4.21213.1 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.4.21207.16 to 6.0.0-preview.4.21213.1 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.4.21207.16 to 6.0.0-preview.4.21213.1 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.4.21207.16 to 6.0.0-preview.4.21213.1 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 6.0.0-preview.4.21207.16 to 6.0.0-preview.4.21213.1 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 6.0.0-preview.4.21207.16 to 6.0.0-preview.4.21213.1 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.4.21206.2 to 6.0.100-preview.4.21213.1 (parent: Microsoft.NET.Sdk)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.4.21206.2 to 6.0.0-preview.4.21212.1 (parent: Microsoft.NET.Sdk)
- Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-preview.4.21205.2 to 6.0.0-preview.4.21212.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.4.21206.2 to 6.0.0-preview.4.21212.1 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.4.21206.1 to 6.0.0-preview.4.21212.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.FSharp.Compiler: from 11.4.2-beta.21204.5 to 11.4.2-beta.21212.7 (parent: Microsoft.NET.Sdk)
- Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.2.21207.1 to 6.0.100-preview.2.21212.5 (parent: Microsoft.NET.Sdk)
- Microsoft.Net.Compilers.Toolset: from 3.10.0-3.21208.2 to 3.10.0-3.21213.18 (parent: Microsoft.NET.Sdk)
- NuGet.Build.Tasks: from 5.10.0-preview.2.7190 to 5.10.0-preview.2.7203 (parent: Microsoft.NET.Sdk)
- Merge branch 'main' into darc-main-4ed89ff0-d420-4cac-9486-36d8a69c8e12
- Set DOTNET_CLI_RUN_MSBUILD_OUTOFPROC=true for SdkTests.csproj
Forces the started dotnet CLI to not load MSBuild.dll in-proc, see https://github.com/dotnet/installer/pull/10185#issuecomment-819463807.
[master] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.AspNetCore.App.Ref: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
- Microsoft.EntityFrameworkCore: from 6.0.0-alpha.1.20509.5 to 6.0.0-alpha.1.20560.6 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
- dotnet-watch: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
- Update installer target framework to 6.0
- Install 5.0.0 and 3.1.0 runtime
- Merge remote-tracking branch 'upstream/master' into darc-master-4cce5096-36fd-4b94-ba12-5d198a821a27
- Update SDK to one that targets 6.0
- disable test as tool build for now
- Fix aspnet runtime RID
[master] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20417.4 to 6.0.0-alpha.1.20531.1 (parent: Microsoft.NET.Sdk)
- Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20417.4 to 6.0.0-alpha.1.20531.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Ref: from 6.0.0-alpha.1.20513.9 to 6.0.0-alpha.1.20551.7 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Internal: from 6.0.0-alpha.1.20513.9 to 6.0.0-alpha.1.20551.7 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-alpha.1.20513.9 to 6.0.0-alpha.1.20551.7 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Host.win-x64: from 6.0.0-alpha.1.20513.9 to 6.0.0-alpha.1.20551.7 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.DotNetHostResolver: from 6.0.0-alpha.1.20513.9 to 6.0.0-alpha.1.20551.7 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.Platforms: from 6.0.0-alpha.1.20513.9 to 6.0.0-alpha.1.20551.7 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref: from 6.0.0-alpha.1.20513.8 to 6.0.0-alpha.1.20526.6 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-alpha.1.20513.8 to 6.0.0-alpha.1.20526.6 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-alpha.1.20513.8 to 6.0.0-alpha.1.20526.6 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 6.0.0-alpha.1.20513.8 to 6.0.0-alpha.1.20526.6 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 6.0.0-alpha.1.20513.8 to 6.0.0-alpha.1.20526.6 (parent: Microsoft.NET.Sdk)
- dotnet-watch: from 6.0.0-alpha.1.20513.8 to 6.0.0-alpha.1.20526.6 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Common.ItemTemplates: from 6.0.0-alpha.1.20514.1 to 6.0.0-alpha.1.20552.1 (parent: Microsoft.NET.Sdk)
- Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20417.1 to 6.0.0-alpha.1.20528.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20417.4 to 6.0.0-alpha.1.20531.1 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20417.3 to 6.0.0-alpha.1.20529.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.NET.Test.Sdk: from 16.9.0-preview-20201013-01 to 16.8.0-release-20201022-02 (parent: Microsoft.NET.Sdk)
- Microsoft.NET.ILLink.Tasks: from 6.0.0-alpha.1.20514.1 to 6.0.0-alpha.1.20527.2 (parent: Microsoft.NET.Sdk)
- Microsoft.Net.Compilers.Toolset: from 3.9.0-1.20513.7 to 3.9.0-2.20552.4 (parent: Microsoft.NET.Sdk)
- Microsoft.Build: from 16.9.0-preview-20513-07 to 16.9.0-preview-20530-04 (parent: Microsoft.NET.Sdk)
- NuGet.Build.Tasks: from 5.8.0-rc.6860 to 5.8.0-rc.6930 (parent: Microsoft.NET.Sdk)
- Update name of VS.Redist package
- Update VS.Redist
- Update Version.Details.xml
- Update Versions.props
- Merge branch 'master' into darc-master-e43dc338-58af-4dcb-8f48-e598405b6d80
- Disable test
This change is required for RTM stable builds. When stable versions are generated the CalculateTemplateVersions task will fail.
For .NET 3.x, installer is partially on arcade. It uses its own versioning model, but the arcade generated versions are actually set (specifically VersionSuffix). So even when stable builds are generated, VersionSuffix is available. It is unused when the aspnetcore template versions are stable.
For .NET 5, installer is now fully on arcade versioning, which means VersionSuffix is not set when stable versions are generated.
Instead of using installer's version suffix if aspnetcore's template versions are unstable, use the version suffix of the aspnetcore template versions. This subtley affects the installer directory of the templates:
If the aspnetcore version is: 5.0.0-rc.1.1234.5
And the installer version is: 5.0.100-rc.1.9999.9
Then:
Template install dir before this change: .dotnet\templates\5.0.0-rc.1.9999.9
Template install dir after this change: .dotnet\templates\5.0.0-rc.1.1234.5
Of note: The overall template layout doesn't make a ton of sense. The aspnetcore template version is used for the install directory, but many different templates are put in this directory, including some that have completely different versions.
[master] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20453.28 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20453.28 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20453.28 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20453.28 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20453.28 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20453.28 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.2.20454.3 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.2.20454.3 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.2.20454.3 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.2.20454.3 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.2.20454.3 (parent: Microsoft.NET.Sdk)
- dotnet-watch: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.2.20454.3 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Common.ItemTemplates: from 5.0.0-rc.1.20419.1 to 6.0.0-alpha.1.20454.5 (parent: Microsoft.NET.Sdk)
- Updates:
- Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20420.8 to 6.0.100-alpha.1.20454.15
- Microsoft.NET.Sdk: from 5.0.100-rc.1.20420.8 to 6.0.100-alpha.1.20454.15
- Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20453.28
- Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20453.28
- Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20453.28
- Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20453.28
- Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20453.28
- Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20417.14 to 6.0.0-alpha.1.20453.28
- Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.2.20454.3
- Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.2.20454.3
- VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.2.20454.3
- dotnet-dev-certs: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.2.20454.3
- dotnet-user-secrets: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.2.20454.3
- dotnet-watch: from 5.0.0-rc.1.20419.22 to 5.0.0-rc.2.20454.3
- Microsoft.DotNet.Common.ItemTemplates: from 5.0.0-rc.1.20419.1 to 6.0.0-alpha.1.20454.5
- Update NuGet.config
- Updates for 6.0 runtime
- Reenabling test
- Fixup toolset base url