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

Author: dougbu

src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj

@@ -16,6 +16,10 @@
       <_Parameter1>SharedFxVersion</_Parameter1>
       <_Parameter2>$(SharedFxVersion)</_Parameter2>
     </AssemblyAttribute>
+    <AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
+      <_Parameter1>DefaultNetCoreTargetFramework</_Parameter1>
+      <_Parameter2>$(DefaultNetCoreTargetFramework)</_Parameter2>
+    </AssemblyAttribute>
     <AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
       <_Parameter1>TargetRuntimeIdentifier</_Parameter1>
       <_Parameter2>$(TargetRuntimeIdentifier)</_Parameter2>

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")}";
 

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");

src/Framework/test/TestData.cs

@@ -151,83 +151,83 @@ static TestData()
             };
             ListedTargetingPackAssemblies = new SortedDictionary<string, string>
             {
-                { "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");