From 4590cf97940bc14d0f54f36134f35675c829141c Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Mon, 17 Aug 2020 16:28:10 -0700 Subject: [PATCH 1/5] Update branding to 6.0.0 Alpha1 - hold the TFM back at `net5.0` - correct `TargetFrameworkVersion` in FrameworkList.xml; don't use `$(AspNetCoreMajorMinorVersion)` - move `$(DefaultNetCoreTargetFramework)` to eng/Versions.props - avoid repeating value in AfterSolutionBuild.targets and Directory.Build.props files - add new versions to `TemplatePackageInstaller` - update project template test scripts --- Directory.Build.props | 6 ------ eng/AfterSolutionBuild.targets | 2 +- eng/Versions.props | 11 ++++++++--- .../WebAssembly/Sdk/testassets/Directory.Build.props | 2 -- src/Framework/Directory.Build.props | 2 +- .../Shared/TemplatePackageInstaller.cs | 2 ++ src/ProjectTemplates/scripts/Run-Angular-Locally.ps1 | 2 +- src/ProjectTemplates/scripts/Run-Blazor-Locally.ps1 | 2 +- src/ProjectTemplates/scripts/Run-EmptyWeb-Locally.ps1 | 2 +- src/ProjectTemplates/scripts/Run-Razor-Locally.ps1 | 2 +- src/ProjectTemplates/scripts/Run-React-Locally.ps1 | 2 +- .../scripts/Run-ReactRedux-Locally.ps1 | 2 +- .../scripts/Run-Starterweb-Locally.ps1 | 2 +- src/ProjectTemplates/scripts/Run-Worker-Locally.ps1 | 2 +- src/Razor/test/testassets/Directory.Build.props | 2 -- 15 files changed, 20 insertions(+), 23 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 71fa1aa6afc1..4abbbfb80dc7 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -87,12 +87,6 @@ $(MSBuildProjectDirectory) true - - - net5.0 net461 diff --git a/eng/AfterSolutionBuild.targets b/eng/AfterSolutionBuild.targets index 4a3cb4ba2adf..5c2989479709 100644 --- a/eng/AfterSolutionBuild.targets +++ b/eng/AfterSolutionBuild.targets @@ -15,7 +15,7 @@ + SharedFrameworkTargetFramework="$(DefaultNetCoreTargetFramework)" /> diff --git a/eng/Versions.props b/eng/Versions.props index 95e701563f94..8f31e04cf64a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,16 +6,17 @@ --> - 5 + 6 0 0 + 1 false release - rtm - RTM $(PreReleaseVersionIteration) + alpha + Alpha $(PreReleaseVersionIteration) true false $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) @@ -38,6 +39,10 @@ $(AspNetCorePatchVersion) $(AspNetCoreMajorMinorVersion).$([MSBuild]::Subtract($(AspNetCorePatchVersion), 1)) + + net5.0 diff --git a/src/Components/WebAssembly/Sdk/testassets/Directory.Build.props b/src/Components/WebAssembly/Sdk/testassets/Directory.Build.props index 40fda88dac4a..af468b70fdd0 100644 --- a/src/Components/WebAssembly/Sdk/testassets/Directory.Build.props +++ b/src/Components/WebAssembly/Sdk/testassets/Directory.Build.props @@ -12,8 +12,6 @@ false - net5.0 - $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, 'AspNetCore.sln'))\ $(RepoRoot)src\Razor\Microsoft.NET.Sdk.Razor\src\build\netstandard2.0\Sdk.Razor.CurrentVersion.props diff --git a/src/Framework/Directory.Build.props b/src/Framework/Directory.Build.props index 13342f6cde8e..026b3c7047aa 100644 --- a/src/Framework/Directory.Build.props +++ b/src/Framework/Directory.Build.props @@ -15,7 +15,7 @@ - + diff --git a/src/ProjectTemplates/Shared/TemplatePackageInstaller.cs b/src/ProjectTemplates/Shared/TemplatePackageInstaller.cs index c029db07e092..881e374a2a29 100644 --- a/src/ProjectTemplates/Shared/TemplatePackageInstaller.cs +++ b/src/ProjectTemplates/Shared/TemplatePackageInstaller.cs @@ -32,11 +32,13 @@ internal static class TemplatePackageInstaller "Microsoft.DotNet.Web.ProjectTemplates.3.0", "Microsoft.DotNet.Web.ProjectTemplates.3.1", "Microsoft.DotNet.Web.ProjectTemplates.5.0", + "Microsoft.DotNet.Web.ProjectTemplates.6.0", "Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1", "Microsoft.DotNet.Web.Spa.ProjectTemplates.2.2", "Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0", "Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1", "Microsoft.DotNet.Web.Spa.ProjectTemplates.5.0", + "Microsoft.DotNet.Web.Spa.ProjectTemplates.6.0", "Microsoft.DotNet.Web.Spa.ProjectTemplates", "Microsoft.AspNetCore.Blazor.Templates", }; diff --git a/src/ProjectTemplates/scripts/Run-Angular-Locally.ps1 b/src/ProjectTemplates/scripts/Run-Angular-Locally.ps1 index ec8993da7ea1..3724496d4097 100644 --- a/src/ProjectTemplates/scripts/Run-Angular-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-Angular-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "angular" "angular" "Microsoft.DotNet.Web.Spa.ProjectTemplates.5.0.5.0.0-dev.nupkg" $true +Test-Template "angular" "angular" "Microsoft.DotNet.Web.Spa.ProjectTemplates.6.0.6.0.0-dev.nupkg" $true diff --git a/src/ProjectTemplates/scripts/Run-Blazor-Locally.ps1 b/src/ProjectTemplates/scripts/Run-Blazor-Locally.ps1 index 575036e9c7ac..7a510a7a9a45 100644 --- a/src/ProjectTemplates/scripts/Run-Blazor-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-Blazor-Locally.ps1 @@ -10,4 +10,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "blazorserver" "blazorserver" "Microsoft.DotNet.Web.ProjectTemplates.5.0.5.0.0-dev.nupkg" $false +Test-Template "blazorserver" "blazorserver" "Microsoft.DotNet.Web.ProjectTemplates.6.0.6.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-EmptyWeb-Locally.ps1 b/src/ProjectTemplates/scripts/Run-EmptyWeb-Locally.ps1 index d6859c6f7278..10e743504b58 100644 --- a/src/ProjectTemplates/scripts/Run-EmptyWeb-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-EmptyWeb-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "web" "web" "Microsoft.DotNet.Web.ProjectTemplates.5.0.5.0.0-dev.nupkg" $false +Test-Template "web" "web" "Microsoft.DotNet.Web.ProjectTemplates.6.0.6.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-Razor-Locally.ps1 b/src/ProjectTemplates/scripts/Run-Razor-Locally.ps1 index ecba4fbd8fc1..6f16590be8fe 100644 --- a/src/ProjectTemplates/scripts/Run-Razor-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-Razor-Locally.ps1 @@ -6,4 +6,4 @@ param() . $PSScriptRoot\Test-Template.ps1 -Test-Template "webapp" "webapp -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.5.0.5.0.0-dev.nupkg" $false +Test-Template "webapp" "webapp -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.6.0.6.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-React-Locally.ps1 b/src/ProjectTemplates/scripts/Run-React-Locally.ps1 index 8308860edccf..f69f07a20d24 100644 --- a/src/ProjectTemplates/scripts/Run-React-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-React-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "react" "react" "Microsoft.DotNet.Web.Spa.ProjectTemplates.5.0.5.0.0-dev.nupkg" $true +Test-Template "react" "react" "Microsoft.DotNet.Web.Spa.ProjectTemplates.6.0.6.0.0-dev.nupkg" $true diff --git a/src/ProjectTemplates/scripts/Run-ReactRedux-Locally.ps1 b/src/ProjectTemplates/scripts/Run-ReactRedux-Locally.ps1 index 6100d7cacd13..0eda170ab13e 100644 --- a/src/ProjectTemplates/scripts/Run-ReactRedux-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-ReactRedux-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "reactredux" "reactredux" "Microsoft.DotNet.Web.Spa.ProjectTemplates.5.0.5.0.0-dev.nupkg" $true +Test-Template "reactredux" "reactredux" "Microsoft.DotNet.Web.Spa.ProjectTemplates.6.0.6.0.0-dev.nupkg" $true diff --git a/src/ProjectTemplates/scripts/Run-Starterweb-Locally.ps1 b/src/ProjectTemplates/scripts/Run-Starterweb-Locally.ps1 index 61ad47fbdcfd..ab195cd016ef 100644 --- a/src/ProjectTemplates/scripts/Run-Starterweb-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-Starterweb-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "mvc" "mvc -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.5.0.5.0.0-dev.nupkg" $false +Test-Template "mvc" "mvc -au Individual" "Microsoft.DotNet.Web.ProjectTemplates.6.0.6.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-Worker-Locally.ps1 b/src/ProjectTemplates/scripts/Run-Worker-Locally.ps1 index e6ff856e7e77..9f3c0272096d 100644 --- a/src/ProjectTemplates/scripts/Run-Worker-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-Worker-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "worker" "worker" "Microsoft.DotNet.Web.ProjectTemplates.5.0.5.0.0-dev.nupkg" $false +Test-Template "worker" "worker" "Microsoft.DotNet.Web.ProjectTemplates.6.0.6.0.0-dev.nupkg" $false diff --git a/src/Razor/test/testassets/Directory.Build.props b/src/Razor/test/testassets/Directory.Build.props index ced785009b93..3d4652a0e907 100644 --- a/src/Razor/test/testassets/Directory.Build.props +++ b/src/Razor/test/testassets/Directory.Build.props @@ -12,8 +12,6 @@ false - net5.0 - $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, 'global.json'))\ $(RepoRoot)artifacts\bin\Microsoft.NET.Sdk.Razor\ $(MSBuildThisFileDirectory)blazor.webassembly.js From 67c57b5442336c9bb77ad95eb52f1b1989d43fe8 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 18 Aug 2020 20:54:06 -0700 Subject: [PATCH 2/5] Update / add 6.0 package versions in test expectations - basically, remove test assumptions that branding == target TFM - `TestData` will need another update once 6.0.0.0 assembly versions arrive from dotnet/runtime --- .../Microsoft.AspNetCore.App.UnitTests.csproj | 4 + src/Framework/test/SharedFxTests.cs | 4 +- src/Framework/test/TargetingPackTests.cs | 2 +- src/Framework/test/TestData.cs | 180 +++++++++--------- 4 files changed, 98 insertions(+), 92 deletions(-) diff --git a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj index 3a594e0f301f..bee9ff9066d4 100644 --- a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj +++ b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj @@ -16,6 +16,10 @@ <_Parameter1>SharedFxVersion <_Parameter2>$(SharedFxVersion) + + <_Parameter1>DefaultNetCoreTargetFramework + <_Parameter2>$(DefaultNetCoreTargetFramework) + <_Parameter1>TargetRuntimeIdentifier <_Parameter2>$(TargetRuntimeIdentifier) diff --git a/src/Framework/test/SharedFxTests.cs b/src/Framework/test/SharedFxTests.cs index 227c53140c0e..212534f9e444 100644 --- a/src/Framework/test/SharedFxTests.cs +++ b/src/Framework/test/SharedFxTests.cs @@ -27,7 +27,7 @@ public class SharedFxTests public SharedFxTests(ITestOutputHelper output) { _output = output; - _expectedTfm = "net" + TestData.GetSharedFxVersion().Substring(0, 3); + _expectedTfm = TestData.GetDefaultNetCoreTargetFramework(); _expectedRid = TestData.GetSharedFxRuntimeIdentifier(); _sharedFxRoot = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNET_RUNTIME_PATH")) ? Path.Combine(TestData.GetTestDataValue("SharedFrameworkLayoutRoot"), "shared", "Microsoft.AspNetCore.App", TestData.GetTestDataValue("RuntimePackageVersion")) @@ -108,7 +108,7 @@ public void SharedFrameworkContainsValidDepsJson() { var depsFilePath = Path.Combine(_sharedFxRoot, "Microsoft.AspNetCore.App.deps.json"); - var target = $".NETCoreApp,Version=v{TestData.GetSharedFxVersion().Substring(0, 3)}/{_expectedRid}"; + var target = $".NETCoreApp,Version=v{_expectedTfm.Substring(3)}/{_expectedRid}"; var ridPackageId = $"Microsoft.AspNetCore.App.Runtime.{_expectedRid}"; var libraryId = $"{ridPackageId}/{TestData.GetTestDataValue("RuntimePackageVersion")}"; diff --git a/src/Framework/test/TargetingPackTests.cs b/src/Framework/test/TargetingPackTests.cs index 8d9f02524e24..d1b2f1bba7ee 100644 --- a/src/Framework/test/TargetingPackTests.cs +++ b/src/Framework/test/TargetingPackTests.cs @@ -29,7 +29,7 @@ public TargetingPackTests(ITestOutputHelper output) { _output = output; _expectedRid = TestData.GetSharedFxRuntimeIdentifier(); - _targetingPackTfm = "net" + TestData.GetSharedFxVersion().Substring(0, 3); + _targetingPackTfm = TestData.GetDefaultNetCoreTargetFramework(); var root = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix")) ? TestData.GetTestDataValue("TargetingPackLayoutRoot") : Environment.GetEnvironmentVariable("DOTNET_ROOT"); diff --git a/src/Framework/test/TestData.cs b/src/Framework/test/TestData.cs index 2271d24ece6f..e73cd74901a3 100644 --- a/src/Framework/test/TestData.cs +++ b/src/Framework/test/TestData.cs @@ -151,83 +151,83 @@ static TestData() }; ListedTargetingPackAssemblies = new SortedDictionary { - { "Microsoft.AspNetCore", "5.0.0.0" }, - { "Microsoft.AspNetCore.Antiforgery", "5.0.0.0" }, - { "Microsoft.AspNetCore.Authentication", "5.0.0.0" }, - { "Microsoft.AspNetCore.Authentication.Abstractions", "5.0.0.0" }, - { "Microsoft.AspNetCore.Authentication.Cookies", "5.0.0.0" }, - { "Microsoft.AspNetCore.Authentication.Core", "5.0.0.0" }, - { "Microsoft.AspNetCore.Authentication.OAuth", "5.0.0.0" }, - { "Microsoft.AspNetCore.Authorization", "5.0.0.0" }, - { "Microsoft.AspNetCore.Authorization.Policy", "5.0.0.0" }, - { "Microsoft.AspNetCore.Components", "5.0.0.0" }, - { "Microsoft.AspNetCore.Components.Authorization", "5.0.0.0" }, - { "Microsoft.AspNetCore.Components.Forms", "5.0.0.0" }, - { "Microsoft.AspNetCore.Components.Server", "5.0.0.0" }, - { "Microsoft.AspNetCore.Components.Web", "5.0.0.0" }, - { "Microsoft.AspNetCore.Connections.Abstractions", "5.0.0.0" }, - { "Microsoft.AspNetCore.CookiePolicy", "5.0.0.0" }, - { "Microsoft.AspNetCore.Cors", "5.0.0.0" }, - { "Microsoft.AspNetCore.Cryptography.Internal", "5.0.0.0" }, - { "Microsoft.AspNetCore.Cryptography.KeyDerivation", "5.0.0.0" }, - { "Microsoft.AspNetCore.DataProtection", "5.0.0.0" }, - { "Microsoft.AspNetCore.DataProtection.Abstractions", "5.0.0.0" }, - { "Microsoft.AspNetCore.DataProtection.Extensions", "5.0.0.0" }, - { "Microsoft.AspNetCore.Diagnostics", "5.0.0.0" }, - { "Microsoft.AspNetCore.Diagnostics.Abstractions", "5.0.0.0" }, - { "Microsoft.AspNetCore.Diagnostics.HealthChecks", "5.0.0.0" }, - { "Microsoft.AspNetCore.HostFiltering", "5.0.0.0" }, - { "Microsoft.AspNetCore.Hosting", "5.0.0.0" }, - { "Microsoft.AspNetCore.Hosting.Abstractions", "5.0.0.0" }, - { "Microsoft.AspNetCore.Hosting.Server.Abstractions", "5.0.0.0" }, - { "Microsoft.AspNetCore.Html.Abstractions", "5.0.0.0" }, - { "Microsoft.AspNetCore.Http", "5.0.0.0" }, - { "Microsoft.AspNetCore.Http.Abstractions", "5.0.0.0" }, - { "Microsoft.AspNetCore.Http.Connections", "5.0.0.0" }, - { "Microsoft.AspNetCore.Http.Connections.Common", "5.0.0.0" }, - { "Microsoft.AspNetCore.Http.Extensions", "5.0.0.0" }, - { "Microsoft.AspNetCore.Http.Features", "5.0.0.0" }, - { "Microsoft.AspNetCore.HttpOverrides", "5.0.0.0" }, - { "Microsoft.AspNetCore.HttpsPolicy", "5.0.0.0" }, - { "Microsoft.AspNetCore.Identity", "5.0.0.0" }, - { "Microsoft.AspNetCore.Localization", "5.0.0.0" }, - { "Microsoft.AspNetCore.Localization.Routing", "5.0.0.0" }, - { "Microsoft.AspNetCore.Metadata", "5.0.0.0" }, - { "Microsoft.AspNetCore.Mvc", "5.0.0.0" }, - { "Microsoft.AspNetCore.Mvc.Abstractions", "5.0.0.0" }, - { "Microsoft.AspNetCore.Mvc.ApiExplorer", "5.0.0.0" }, - { "Microsoft.AspNetCore.Mvc.Core", "5.0.0.0" }, - { "Microsoft.AspNetCore.Mvc.Cors", "5.0.0.0" }, - { "Microsoft.AspNetCore.Mvc.DataAnnotations", "5.0.0.0" }, - { "Microsoft.AspNetCore.Mvc.Formatters.Json", "5.0.0.0" }, - { "Microsoft.AspNetCore.Mvc.Formatters.Xml", "5.0.0.0" }, - { "Microsoft.AspNetCore.Mvc.Localization", "5.0.0.0" }, - { "Microsoft.AspNetCore.Mvc.Razor", "5.0.0.0" }, - { "Microsoft.AspNetCore.Mvc.RazorPages", "5.0.0.0" }, - { "Microsoft.AspNetCore.Mvc.TagHelpers", "5.0.0.0" }, - { "Microsoft.AspNetCore.Mvc.ViewFeatures", "5.0.0.0" }, - { "Microsoft.AspNetCore.Razor", "5.0.0.0" }, - { "Microsoft.AspNetCore.Razor.Runtime", "5.0.0.0" }, - { "Microsoft.AspNetCore.ResponseCaching", "5.0.0.0" }, - { "Microsoft.AspNetCore.ResponseCaching.Abstractions", "5.0.0.0" }, - { "Microsoft.AspNetCore.ResponseCompression", "5.0.0.0" }, - { "Microsoft.AspNetCore.Rewrite", "5.0.0.0" }, - { "Microsoft.AspNetCore.Routing", "5.0.0.0" }, - { "Microsoft.AspNetCore.Routing.Abstractions", "5.0.0.0" }, - { "Microsoft.AspNetCore.Server.HttpSys", "5.0.0.0" }, - { "Microsoft.AspNetCore.Server.IIS", "5.0.0.0" }, - { "Microsoft.AspNetCore.Server.IISIntegration", "5.0.0.0" }, - { "Microsoft.AspNetCore.Server.Kestrel", "5.0.0.0" }, - { "Microsoft.AspNetCore.Server.Kestrel.Core", "5.0.0.0" }, - { "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets", "5.0.0.0" }, - { "Microsoft.AspNetCore.Session", "5.0.0.0" }, - { "Microsoft.AspNetCore.SignalR", "5.0.0.0" }, - { "Microsoft.AspNetCore.SignalR.Common", "5.0.0.0" }, - { "Microsoft.AspNetCore.SignalR.Core", "5.0.0.0" }, - { "Microsoft.AspNetCore.SignalR.Protocols.Json", "5.0.0.0" }, - { "Microsoft.AspNetCore.StaticFiles", "5.0.0.0" }, - { "Microsoft.AspNetCore.WebSockets", "5.0.0.0" }, - { "Microsoft.AspNetCore.WebUtilities", "5.0.0.0" }, + { "Microsoft.AspNetCore", "6.0.0.0" }, + { "Microsoft.AspNetCore.Antiforgery", "6.0.0.0" }, + { "Microsoft.AspNetCore.Authentication", "6.0.0.0" }, + { "Microsoft.AspNetCore.Authentication.Abstractions", "6.0.0.0" }, + { "Microsoft.AspNetCore.Authentication.Cookies", "6.0.0.0" }, + { "Microsoft.AspNetCore.Authentication.Core", "6.0.0.0" }, + { "Microsoft.AspNetCore.Authentication.OAuth", "6.0.0.0" }, + { "Microsoft.AspNetCore.Authorization", "6.0.0.0" }, + { "Microsoft.AspNetCore.Authorization.Policy", "6.0.0.0" }, + { "Microsoft.AspNetCore.Components", "6.0.0.0" }, + { "Microsoft.AspNetCore.Components.Authorization", "6.0.0.0" }, + { "Microsoft.AspNetCore.Components.Forms", "6.0.0.0" }, + { "Microsoft.AspNetCore.Components.Server", "6.0.0.0" }, + { "Microsoft.AspNetCore.Components.Web", "6.0.0.0" }, + { "Microsoft.AspNetCore.Connections.Abstractions", "6.0.0.0" }, + { "Microsoft.AspNetCore.CookiePolicy", "6.0.0.0" }, + { "Microsoft.AspNetCore.Cors", "6.0.0.0" }, + { "Microsoft.AspNetCore.Cryptography.Internal", "6.0.0.0" }, + { "Microsoft.AspNetCore.Cryptography.KeyDerivation", "6.0.0.0" }, + { "Microsoft.AspNetCore.DataProtection", "6.0.0.0" }, + { "Microsoft.AspNetCore.DataProtection.Abstractions", "6.0.0.0" }, + { "Microsoft.AspNetCore.DataProtection.Extensions", "6.0.0.0" }, + { "Microsoft.AspNetCore.Diagnostics", "6.0.0.0" }, + { "Microsoft.AspNetCore.Diagnostics.Abstractions", "6.0.0.0" }, + { "Microsoft.AspNetCore.Diagnostics.HealthChecks", "6.0.0.0" }, + { "Microsoft.AspNetCore.HostFiltering", "6.0.0.0" }, + { "Microsoft.AspNetCore.Hosting", "6.0.0.0" }, + { "Microsoft.AspNetCore.Hosting.Abstractions", "6.0.0.0" }, + { "Microsoft.AspNetCore.Hosting.Server.Abstractions", "6.0.0.0" }, + { "Microsoft.AspNetCore.Html.Abstractions", "6.0.0.0" }, + { "Microsoft.AspNetCore.Http", "6.0.0.0" }, + { "Microsoft.AspNetCore.Http.Abstractions", "6.0.0.0" }, + { "Microsoft.AspNetCore.Http.Connections", "6.0.0.0" }, + { "Microsoft.AspNetCore.Http.Connections.Common", "6.0.0.0" }, + { "Microsoft.AspNetCore.Http.Extensions", "6.0.0.0" }, + { "Microsoft.AspNetCore.Http.Features", "6.0.0.0" }, + { "Microsoft.AspNetCore.HttpOverrides", "6.0.0.0" }, + { "Microsoft.AspNetCore.HttpsPolicy", "6.0.0.0" }, + { "Microsoft.AspNetCore.Identity", "6.0.0.0" }, + { "Microsoft.AspNetCore.Localization", "6.0.0.0" }, + { "Microsoft.AspNetCore.Localization.Routing", "6.0.0.0" }, + { "Microsoft.AspNetCore.Metadata", "6.0.0.0" }, + { "Microsoft.AspNetCore.Mvc", "6.0.0.0" }, + { "Microsoft.AspNetCore.Mvc.Abstractions", "6.0.0.0" }, + { "Microsoft.AspNetCore.Mvc.ApiExplorer", "6.0.0.0" }, + { "Microsoft.AspNetCore.Mvc.Core", "6.0.0.0" }, + { "Microsoft.AspNetCore.Mvc.Cors", "6.0.0.0" }, + { "Microsoft.AspNetCore.Mvc.DataAnnotations", "6.0.0.0" }, + { "Microsoft.AspNetCore.Mvc.Formatters.Json", "6.0.0.0" }, + { "Microsoft.AspNetCore.Mvc.Formatters.Xml", "6.0.0.0" }, + { "Microsoft.AspNetCore.Mvc.Localization", "6.0.0.0" }, + { "Microsoft.AspNetCore.Mvc.Razor", "6.0.0.0" }, + { "Microsoft.AspNetCore.Mvc.RazorPages", "6.0.0.0" }, + { "Microsoft.AspNetCore.Mvc.TagHelpers", "6.0.0.0" }, + { "Microsoft.AspNetCore.Mvc.ViewFeatures", "6.0.0.0" }, + { "Microsoft.AspNetCore.Razor", "6.0.0.0" }, + { "Microsoft.AspNetCore.Razor.Runtime", "6.0.0.0" }, + { "Microsoft.AspNetCore.ResponseCaching", "6.0.0.0" }, + { "Microsoft.AspNetCore.ResponseCaching.Abstractions", "6.0.0.0" }, + { "Microsoft.AspNetCore.ResponseCompression", "6.0.0.0" }, + { "Microsoft.AspNetCore.Rewrite", "6.0.0.0" }, + { "Microsoft.AspNetCore.Routing", "6.0.0.0" }, + { "Microsoft.AspNetCore.Routing.Abstractions", "6.0.0.0" }, + { "Microsoft.AspNetCore.Server.HttpSys", "6.0.0.0" }, + { "Microsoft.AspNetCore.Server.IIS", "6.0.0.0" }, + { "Microsoft.AspNetCore.Server.IISIntegration", "6.0.0.0" }, + { "Microsoft.AspNetCore.Server.Kestrel", "6.0.0.0" }, + { "Microsoft.AspNetCore.Server.Kestrel.Core", "6.0.0.0" }, + { "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets", "6.0.0.0" }, + { "Microsoft.AspNetCore.Session", "6.0.0.0" }, + { "Microsoft.AspNetCore.SignalR", "6.0.0.0" }, + { "Microsoft.AspNetCore.SignalR.Common", "6.0.0.0" }, + { "Microsoft.AspNetCore.SignalR.Core", "6.0.0.0" }, + { "Microsoft.AspNetCore.SignalR.Protocols.Json", "6.0.0.0" }, + { "Microsoft.AspNetCore.StaticFiles", "6.0.0.0" }, + { "Microsoft.AspNetCore.WebSockets", "6.0.0.0" }, + { "Microsoft.AspNetCore.WebUtilities", "6.0.0.0" }, { "Microsoft.Extensions.Caching.Abstractions", "5.0.0.0" }, { "Microsoft.Extensions.Caching.Memory", "5.0.0.0" }, { "Microsoft.Extensions.Configuration", "5.0.0.0" }, @@ -238,25 +238,25 @@ static TestData() { "Microsoft.Extensions.Configuration.FileExtensions", "5.0.0.0" }, { "Microsoft.Extensions.Configuration.Ini", "5.0.0.0" }, { "Microsoft.Extensions.Configuration.Json", "5.0.0.0" }, - { "Microsoft.Extensions.Configuration.KeyPerFile", "5.0.0.0" }, + { "Microsoft.Extensions.Configuration.KeyPerFile", "6.0.0.0" }, { "Microsoft.Extensions.Configuration.UserSecrets", "5.0.0.0" }, { "Microsoft.Extensions.Configuration.Xml", "5.0.0.0" }, { "Microsoft.Extensions.DependencyInjection", "5.0.0.0" }, { "Microsoft.Extensions.DependencyInjection.Abstractions", "5.0.0.0" }, - { "Microsoft.Extensions.Diagnostics.HealthChecks", "5.0.0.0" }, - { "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions", "5.0.0.0" }, + { "Microsoft.Extensions.Diagnostics.HealthChecks", "6.0.0.0" }, + { "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions", "6.0.0.0" }, { "Microsoft.Extensions.FileProviders.Abstractions", "5.0.0.0" }, { "Microsoft.Extensions.FileProviders.Composite", "5.0.0.0" }, - { "Microsoft.Extensions.FileProviders.Embedded", "5.0.0.0" }, + { "Microsoft.Extensions.FileProviders.Embedded", "6.0.0.0" }, { "Microsoft.Extensions.FileProviders.Physical", "5.0.0.0" }, { "Microsoft.Extensions.FileSystemGlobbing", "5.0.0.0" }, { "Microsoft.Extensions.Hosting", "5.0.0.0" }, { "Microsoft.Extensions.Hosting.Abstractions", "5.0.0.0" }, { "Microsoft.Extensions.Http", "5.0.0.0" }, - { "Microsoft.Extensions.Identity.Core", "5.0.0.0" }, - { "Microsoft.Extensions.Identity.Stores", "5.0.0.0" }, - { "Microsoft.Extensions.Localization", "5.0.0.0" }, - { "Microsoft.Extensions.Localization.Abstractions", "5.0.0.0" }, + { "Microsoft.Extensions.Identity.Core", "6.0.0.0" }, + { "Microsoft.Extensions.Identity.Stores", "6.0.0.0" }, + { "Microsoft.Extensions.Localization", "6.0.0.0" }, + { "Microsoft.Extensions.Localization.Abstractions", "6.0.0.0" }, { "Microsoft.Extensions.Logging", "5.0.0.0" }, { "Microsoft.Extensions.Logging.Abstractions", "5.0.0.0" }, { "Microsoft.Extensions.Logging.Configuration", "5.0.0.0" }, @@ -265,14 +265,14 @@ static TestData() { "Microsoft.Extensions.Logging.EventLog", "5.0.0.0" }, { "Microsoft.Extensions.Logging.EventSource", "5.0.0.0" }, { "Microsoft.Extensions.Logging.TraceSource", "5.0.0.0" }, - { "Microsoft.Extensions.ObjectPool", "5.0.0.0" }, + { "Microsoft.Extensions.ObjectPool", "6.0.0.0" }, { "Microsoft.Extensions.Options", "5.0.0.0" }, { "Microsoft.Extensions.Options.ConfigurationExtensions", "5.0.0.0" }, { "Microsoft.Extensions.Options.DataAnnotations", "5.0.0.0" }, { "Microsoft.Extensions.Primitives", "5.0.0.0" }, - { "Microsoft.Extensions.WebEncoders", "5.0.0.0" }, - { "Microsoft.JSInterop", "5.0.0.0" }, - { "Microsoft.Net.Http.Headers", "5.0.0.0" }, + { "Microsoft.Extensions.WebEncoders", "6.0.0.0" }, + { "Microsoft.JSInterop", "6.0.0.0" }, + { "Microsoft.Net.Http.Headers", "6.0.0.0" }, { "Microsoft.Win32.Registry", "5.0.0.0" }, { "System.Diagnostics.EventLog", "5.0.0.0" }, { "System.IO.Pipelines", "5.0.0.0" }, @@ -292,6 +292,8 @@ static TestData() public static string GetSharedFxVersion() => GetTestDataValue("SharedFxVersion"); + public static string GetDefaultNetCoreTargetFramework() => GetTestDataValue("DefaultNetCoreTargetFramework"); + public static string GetMicrosoftNETCoreAppPackageVersion() => GetTestDataValue("MicrosoftNETCoreAppRuntimeVersion"); public static string GetReferencePackSharedFxVersion() => GetTestDataValue("ReferencePackSharedFxVersion"); From 6cb5dece4297c8540dd60f6560f1ed25f039a92c Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Sun, 30 Aug 2020 13:44:23 -0700 Subject: [PATCH 3/5] Update `Condition`s on `@(SuppressBaselineReference)` items to 6.0 --- .../Components/src/Microsoft.AspNetCore.Components.csproj | 2 +- src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj | 2 +- .../src/Microsoft.AspNetCore.SpaServices.Extensions.csproj | 2 +- .../src/Microsoft.AspNetCore.Connections.Abstractions.csproj | 2 +- .../src/Microsoft.AspNetCore.SignalR.Client.Core.csproj | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj index 23f816726b13..a87f735c6fe1 100644 --- a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj +++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj @@ -28,7 +28,7 @@ - + diff --git a/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj b/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj index 1c054fcbcf84..112434a637e8 100644 --- a/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj +++ b/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj @@ -43,7 +43,7 @@ - + diff --git a/src/Middleware/SpaServices.Extensions/src/Microsoft.AspNetCore.SpaServices.Extensions.csproj b/src/Middleware/SpaServices.Extensions/src/Microsoft.AspNetCore.SpaServices.Extensions.csproj index f05b05d9ea63..f48c7a56eec1 100644 --- a/src/Middleware/SpaServices.Extensions/src/Microsoft.AspNetCore.SpaServices.Extensions.csproj +++ b/src/Middleware/SpaServices.Extensions/src/Microsoft.AspNetCore.SpaServices.Extensions.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj b/src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj index dda00cbf9235..39732e90e605 100644 --- a/src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj +++ b/src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj @@ -23,7 +23,7 @@ - + From 22206a4e3c77fb8f61b7d487fc20423c60770fad Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 29 Sep 2020 18:15:39 -0700 Subject: [PATCH 4/5] Undo some of #24816 - allow sharedFx assemblies in Microsoft.AspNetCore.Components.WebAssembly.DevServer package - see #26448 about reducing this baggage later in 6.0 --- ...Core.Components.WebAssembly.DevServer.csproj | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj b/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj index 200328464682..4a57cc7f0bb0 100644 --- a/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj +++ b/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj @@ -12,24 +12,10 @@ $(NoWarn.Replace('1591', '')) false - - - true - true - - - - + @@ -46,5 +32,4 @@ - From d357dfa249479ec8fa8060b66d3b906040687da3 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Sat, 10 Oct 2020 13:09:40 -0700 Subject: [PATCH 5/5] Skip IndividualAuth tests on Helix - #26776 --- src/ProjectTemplates/test/IdentityUIPackageTest.cs | 2 +- src/ProjectTemplates/test/MvcTemplateTest.cs | 2 +- src/ProjectTemplates/test/RazorPagesTemplateTest.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ProjectTemplates/test/IdentityUIPackageTest.cs b/src/ProjectTemplates/test/IdentityUIPackageTest.cs index 6d749ea85b21..d5fb7b859463 100644 --- a/src/ProjectTemplates/test/IdentityUIPackageTest.cs +++ b/src/ProjectTemplates/test/IdentityUIPackageTest.cs @@ -74,7 +74,7 @@ public ITestOutputHelper Output }; [ConditionalFact] - [SkipOnHelix("cert failure", Queues = "All.OSX")] + [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/26776")] public async Task IdentityUIPackage_WorksWithDifferentOptions() { var packageOptions = new Dictionary(); diff --git a/src/ProjectTemplates/test/MvcTemplateTest.cs b/src/ProjectTemplates/test/MvcTemplateTest.cs index ec3acab033b9..2be0b5f20f26 100644 --- a/src/ProjectTemplates/test/MvcTemplateTest.cs +++ b/src/ProjectTemplates/test/MvcTemplateTest.cs @@ -118,7 +118,7 @@ private async Task MvcTemplateCore(string languageOverride) [ConditionalTheory] [InlineData(true)] [InlineData(false)] - [SkipOnHelix("cert failure", Queues = "All.OSX")] + [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/26776")] public async Task MvcTemplate_IndividualAuth(bool useLocalDB) { var project = await ProjectFactory.GetOrCreateProject("mvcindividual" + (useLocalDB ? "uld" : ""), Output); diff --git a/src/ProjectTemplates/test/RazorPagesTemplateTest.cs b/src/ProjectTemplates/test/RazorPagesTemplateTest.cs index 61a0d47fb75d..a3d76a51a667 100644 --- a/src/ProjectTemplates/test/RazorPagesTemplateTest.cs +++ b/src/ProjectTemplates/test/RazorPagesTemplateTest.cs @@ -106,7 +106,7 @@ public async Task RazorPagesTemplate_NoAuth() [ConditionalTheory] [InlineData(false)] [InlineData(true)] - [SkipOnHelix("cert failure", Queues = "All.OSX")] + [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/26776")] public async Task RazorPagesTemplate_IndividualAuth(bool useLocalDB) { var project = await ProjectFactory.GetOrCreateProject("razorpagesindividual" + (useLocalDB ? "uld" : ""), Output);