Skip to content

Commit 67c57b5

Browse files
dougbudougbu
committed
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
1 parent 4590cf9 commit 67c57b5

File tree

4 files changed

+98
-92
lines changed

4 files changed

+98
-92
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
<_Parameter1>SharedFxVersion</_Parameter1>
1717
<_Parameter2>$(SharedFxVersion)</_Parameter2>
1818
</AssemblyAttribute>
19+
<AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
20+
<_Parameter1>DefaultNetCoreTargetFramework</_Parameter1>
21+
<_Parameter2>$(DefaultNetCoreTargetFramework)</_Parameter2>
22+
</AssemblyAttribute>
1923
<AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
2024
<_Parameter1>TargetRuntimeIdentifier</_Parameter1>
2125
<_Parameter2>$(TargetRuntimeIdentifier)</_Parameter2>

‎src/Framework/test/SharedFxTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class SharedFxTests
2727
public SharedFxTests(ITestOutputHelper output)
2828
{
2929
_output = output;
30-
_expectedTfm = "net" + TestData.GetSharedFxVersion().Substring(0, 3);
30+
_expectedTfm = TestData.GetDefaultNetCoreTargetFramework();
3131
_expectedRid = TestData.GetSharedFxRuntimeIdentifier();
3232
_sharedFxRoot = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNET_RUNTIME_PATH"))
3333
? Path.Combine(TestData.GetTestDataValue("SharedFrameworkLayoutRoot"), "shared", "Microsoft.AspNetCore.App", TestData.GetTestDataValue("RuntimePackageVersion"))
@@ -108,7 +108,7 @@ public void SharedFrameworkContainsValidDepsJson()
108108
{
109109
var depsFilePath = Path.Combine(_sharedFxRoot, "Microsoft.AspNetCore.App.deps.json");
110110

111-
var target = $".NETCoreApp,Version=v{TestData.GetSharedFxVersion().Substring(0, 3)}/{_expectedRid}";
111+
var target = $".NETCoreApp,Version=v{_expectedTfm.Substring(3)}/{_expectedRid}";
112112
var ridPackageId = $"Microsoft.AspNetCore.App.Runtime.{_expectedRid}";
113113
var libraryId = $"{ridPackageId}/{TestData.GetTestDataValue("RuntimePackageVersion")}";
114114

‎src/Framework/test/TargetingPackTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public TargetingPackTests(ITestOutputHelper output)
2929
{
3030
_output = output;
3131
_expectedRid = TestData.GetSharedFxRuntimeIdentifier();
32-
_targetingPackTfm = "net" + TestData.GetSharedFxVersion().Substring(0, 3);
32+
_targetingPackTfm = TestData.GetDefaultNetCoreTargetFramework();
3333
var root = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("helix")) ?
3434
TestData.GetTestDataValue("TargetingPackLayoutRoot") :
3535
Environment.GetEnvironmentVariable("DOTNET_ROOT");

‎src/Framework/test/TestData.cs

Lines changed: 91 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -151,83 +151,83 @@ static TestData()
151151
};
152152
ListedTargetingPackAssemblies = new SortedDictionary<string, string>
153153
{
154-
{ "Microsoft.AspNetCore", "5.0.0.0" },
155-
{ "Microsoft.AspNetCore.Antiforgery", "5.0.0.0" },
156-
{ "Microsoft.AspNetCore.Authentication", "5.0.0.0" },
157-
{ "Microsoft.AspNetCore.Authentication.Abstractions", "5.0.0.0" },
158-
{ "Microsoft.AspNetCore.Authentication.Cookies", "5.0.0.0" },
159-
{ "Microsoft.AspNetCore.Authentication.Core", "5.0.0.0" },
160-
{ "Microsoft.AspNetCore.Authentication.OAuth", "5.0.0.0" },
161-
{ "Microsoft.AspNetCore.Authorization", "5.0.0.0" },
162-
{ "Microsoft.AspNetCore.Authorization.Policy", "5.0.0.0" },
163-
{ "Microsoft.AspNetCore.Components", "5.0.0.0" },
164-
{ "Microsoft.AspNetCore.Components.Authorization", "5.0.0.0" },
165-
{ "Microsoft.AspNetCore.Components.Forms", "5.0.0.0" },
166-
{ "Microsoft.AspNetCore.Components.Server", "5.0.0.0" },
167-
{ "Microsoft.AspNetCore.Components.Web", "5.0.0.0" },
168-
{ "Microsoft.AspNetCore.Connections.Abstractions", "5.0.0.0" },
169-
{ "Microsoft.AspNetCore.CookiePolicy", "5.0.0.0" },
170-
{ "Microsoft.AspNetCore.Cors", "5.0.0.0" },
171-
{ "Microsoft.AspNetCore.Cryptography.Internal", "5.0.0.0" },
172-
{ "Microsoft.AspNetCore.Cryptography.KeyDerivation", "5.0.0.0" },
173-
{ "Microsoft.AspNetCore.DataProtection", "5.0.0.0" },
174-
{ "Microsoft.AspNetCore.DataProtection.Abstractions", "5.0.0.0" },
175-
{ "Microsoft.AspNetCore.DataProtection.Extensions", "5.0.0.0" },
176-
{ "Microsoft.AspNetCore.Diagnostics", "5.0.0.0" },
177-
{ "Microsoft.AspNetCore.Diagnostics.Abstractions", "5.0.0.0" },
178-
{ "Microsoft.AspNetCore.Diagnostics.HealthChecks", "5.0.0.0" },
179-
{ "Microsoft.AspNetCore.HostFiltering", "5.0.0.0" },
180-
{ "Microsoft.AspNetCore.Hosting", "5.0.0.0" },
181-
{ "Microsoft.AspNetCore.Hosting.Abstractions", "5.0.0.0" },
182-
{ "Microsoft.AspNetCore.Hosting.Server.Abstractions", "5.0.0.0" },
183-
{ "Microsoft.AspNetCore.Html.Abstractions", "5.0.0.0" },
184-
{ "Microsoft.AspNetCore.Http", "5.0.0.0" },
185-
{ "Microsoft.AspNetCore.Http.Abstractions", "5.0.0.0" },
186-
{ "Microsoft.AspNetCore.Http.Connections", "5.0.0.0" },
187-
{ "Microsoft.AspNetCore.Http.Connections.Common", "5.0.0.0" },
188-
{ "Microsoft.AspNetCore.Http.Extensions", "5.0.0.0" },
189-
{ "Microsoft.AspNetCore.Http.Features", "5.0.0.0" },
190-
{ "Microsoft.AspNetCore.HttpOverrides", "5.0.0.0" },
191-
{ "Microsoft.AspNetCore.HttpsPolicy", "5.0.0.0" },
192-
{ "Microsoft.AspNetCore.Identity", "5.0.0.0" },
193-
{ "Microsoft.AspNetCore.Localization", "5.0.0.0" },
194-
{ "Microsoft.AspNetCore.Localization.Routing", "5.0.0.0" },
195-
{ "Microsoft.AspNetCore.Metadata", "5.0.0.0" },
196-
{ "Microsoft.AspNetCore.Mvc", "5.0.0.0" },
197-
{ "Microsoft.AspNetCore.Mvc.Abstractions", "5.0.0.0" },
198-
{ "Microsoft.AspNetCore.Mvc.ApiExplorer", "5.0.0.0" },
199-
{ "Microsoft.AspNetCore.Mvc.Core", "5.0.0.0" },
200-
{ "Microsoft.AspNetCore.Mvc.Cors", "5.0.0.0" },
201-
{ "Microsoft.AspNetCore.Mvc.DataAnnotations", "5.0.0.0" },
202-
{ "Microsoft.AspNetCore.Mvc.Formatters.Json", "5.0.0.0" },
203-
{ "Microsoft.AspNetCore.Mvc.Formatters.Xml", "5.0.0.0" },
204-
{ "Microsoft.AspNetCore.Mvc.Localization", "5.0.0.0" },
205-
{ "Microsoft.AspNetCore.Mvc.Razor", "5.0.0.0" },
206-
{ "Microsoft.AspNetCore.Mvc.RazorPages", "5.0.0.0" },
207-
{ "Microsoft.AspNetCore.Mvc.TagHelpers", "5.0.0.0" },
208-
{ "Microsoft.AspNetCore.Mvc.ViewFeatures", "5.0.0.0" },
209-
{ "Microsoft.AspNetCore.Razor", "5.0.0.0" },
210-
{ "Microsoft.AspNetCore.Razor.Runtime", "5.0.0.0" },
211-
{ "Microsoft.AspNetCore.ResponseCaching", "5.0.0.0" },
212-
{ "Microsoft.AspNetCore.ResponseCaching.Abstractions", "5.0.0.0" },
213-
{ "Microsoft.AspNetCore.ResponseCompression", "5.0.0.0" },
214-
{ "Microsoft.AspNetCore.Rewrite", "5.0.0.0" },
215-
{ "Microsoft.AspNetCore.Routing", "5.0.0.0" },
216-
{ "Microsoft.AspNetCore.Routing.Abstractions", "5.0.0.0" },
217-
{ "Microsoft.AspNetCore.Server.HttpSys", "5.0.0.0" },
218-
{ "Microsoft.AspNetCore.Server.IIS", "5.0.0.0" },
219-
{ "Microsoft.AspNetCore.Server.IISIntegration", "5.0.0.0" },
220-
{ "Microsoft.AspNetCore.Server.Kestrel", "5.0.0.0" },
221-
{ "Microsoft.AspNetCore.Server.Kestrel.Core", "5.0.0.0" },
222-
{ "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets", "5.0.0.0" },
223-
{ "Microsoft.AspNetCore.Session", "5.0.0.0" },
224-
{ "Microsoft.AspNetCore.SignalR", "5.0.0.0" },
225-
{ "Microsoft.AspNetCore.SignalR.Common", "5.0.0.0" },
226-
{ "Microsoft.AspNetCore.SignalR.Core", "5.0.0.0" },
227-
{ "Microsoft.AspNetCore.SignalR.Protocols.Json", "5.0.0.0" },
228-
{ "Microsoft.AspNetCore.StaticFiles", "5.0.0.0" },
229-
{ "Microsoft.AspNetCore.WebSockets", "5.0.0.0" },
230-
{ "Microsoft.AspNetCore.WebUtilities", "5.0.0.0" },
154+
{ "Microsoft.AspNetCore", "6.0.0.0" },
155+
{ "Microsoft.AspNetCore.Antiforgery", "6.0.0.0" },
156+
{ "Microsoft.AspNetCore.Authentication", "6.0.0.0" },
157+
{ "Microsoft.AspNetCore.Authentication.Abstractions", "6.0.0.0" },
158+
{ "Microsoft.AspNetCore.Authentication.Cookies", "6.0.0.0" },
159+
{ "Microsoft.AspNetCore.Authentication.Core", "6.0.0.0" },
160+
{ "Microsoft.AspNetCore.Authentication.OAuth", "6.0.0.0" },
161+
{ "Microsoft.AspNetCore.Authorization", "6.0.0.0" },
162+
{ "Microsoft.AspNetCore.Authorization.Policy", "6.0.0.0" },
163+
{ "Microsoft.AspNetCore.Components", "6.0.0.0" },
164+
{ "Microsoft.AspNetCore.Components.Authorization", "6.0.0.0" },
165+
{ "Microsoft.AspNetCore.Components.Forms", "6.0.0.0" },
166+
{ "Microsoft.AspNetCore.Components.Server", "6.0.0.0" },
167+
{ "Microsoft.AspNetCore.Components.Web", "6.0.0.0" },
168+
{ "Microsoft.AspNetCore.Connections.Abstractions", "6.0.0.0" },
169+
{ "Microsoft.AspNetCore.CookiePolicy", "6.0.0.0" },
170+
{ "Microsoft.AspNetCore.Cors", "6.0.0.0" },
171+
{ "Microsoft.AspNetCore.Cryptography.Internal", "6.0.0.0" },
172+
{ "Microsoft.AspNetCore.Cryptography.KeyDerivation", "6.0.0.0" },
173+
{ "Microsoft.AspNetCore.DataProtection", "6.0.0.0" },
174+
{ "Microsoft.AspNetCore.DataProtection.Abstractions", "6.0.0.0" },
175+
{ "Microsoft.AspNetCore.DataProtection.Extensions", "6.0.0.0" },
176+
{ "Microsoft.AspNetCore.Diagnostics", "6.0.0.0" },
177+
{ "Microsoft.AspNetCore.Diagnostics.Abstractions", "6.0.0.0" },
178+
{ "Microsoft.AspNetCore.Diagnostics.HealthChecks", "6.0.0.0" },
179+
{ "Microsoft.AspNetCore.HostFiltering", "6.0.0.0" },
180+
{ "Microsoft.AspNetCore.Hosting", "6.0.0.0" },
181+
{ "Microsoft.AspNetCore.Hosting.Abstractions", "6.0.0.0" },
182+
{ "Microsoft.AspNetCore.Hosting.Server.Abstractions", "6.0.0.0" },
183+
{ "Microsoft.AspNetCore.Html.Abstractions", "6.0.0.0" },
184+
{ "Microsoft.AspNetCore.Http", "6.0.0.0" },
185+
{ "Microsoft.AspNetCore.Http.Abstractions", "6.0.0.0" },
186+
{ "Microsoft.AspNetCore.Http.Connections", "6.0.0.0" },
187+
{ "Microsoft.AspNetCore.Http.Connections.Common", "6.0.0.0" },
188+
{ "Microsoft.AspNetCore.Http.Extensions", "6.0.0.0" },
189+
{ "Microsoft.AspNetCore.Http.Features", "6.0.0.0" },
190+
{ "Microsoft.AspNetCore.HttpOverrides", "6.0.0.0" },
191+
{ "Microsoft.AspNetCore.HttpsPolicy", "6.0.0.0" },
192+
{ "Microsoft.AspNetCore.Identity", "6.0.0.0" },
193+
{ "Microsoft.AspNetCore.Localization", "6.0.0.0" },
194+
{ "Microsoft.AspNetCore.Localization.Routing", "6.0.0.0" },
195+
{ "Microsoft.AspNetCore.Metadata", "6.0.0.0" },
196+
{ "Microsoft.AspNetCore.Mvc", "6.0.0.0" },
197+
{ "Microsoft.AspNetCore.Mvc.Abstractions", "6.0.0.0" },
198+
{ "Microsoft.AspNetCore.Mvc.ApiExplorer", "6.0.0.0" },
199+
{ "Microsoft.AspNetCore.Mvc.Core", "6.0.0.0" },
200+
{ "Microsoft.AspNetCore.Mvc.Cors", "6.0.0.0" },
201+
{ "Microsoft.AspNetCore.Mvc.DataAnnotations", "6.0.0.0" },
202+
{ "Microsoft.AspNetCore.Mvc.Formatters.Json", "6.0.0.0" },
203+
{ "Microsoft.AspNetCore.Mvc.Formatters.Xml", "6.0.0.0" },
204+
{ "Microsoft.AspNetCore.Mvc.Localization", "6.0.0.0" },
205+
{ "Microsoft.AspNetCore.Mvc.Razor", "6.0.0.0" },
206+
{ "Microsoft.AspNetCore.Mvc.RazorPages", "6.0.0.0" },
207+
{ "Microsoft.AspNetCore.Mvc.TagHelpers", "6.0.0.0" },
208+
{ "Microsoft.AspNetCore.Mvc.ViewFeatures", "6.0.0.0" },
209+
{ "Microsoft.AspNetCore.Razor", "6.0.0.0" },
210+
{ "Microsoft.AspNetCore.Razor.Runtime", "6.0.0.0" },
211+
{ "Microsoft.AspNetCore.ResponseCaching", "6.0.0.0" },
212+
{ "Microsoft.AspNetCore.ResponseCaching.Abstractions", "6.0.0.0" },
213+
{ "Microsoft.AspNetCore.ResponseCompression", "6.0.0.0" },
214+
{ "Microsoft.AspNetCore.Rewrite", "6.0.0.0" },
215+
{ "Microsoft.AspNetCore.Routing", "6.0.0.0" },
216+
{ "Microsoft.AspNetCore.Routing.Abstractions", "6.0.0.0" },
217+
{ "Microsoft.AspNetCore.Server.HttpSys", "6.0.0.0" },
218+
{ "Microsoft.AspNetCore.Server.IIS", "6.0.0.0" },
219+
{ "Microsoft.AspNetCore.Server.IISIntegration", "6.0.0.0" },
220+
{ "Microsoft.AspNetCore.Server.Kestrel", "6.0.0.0" },
221+
{ "Microsoft.AspNetCore.Server.Kestrel.Core", "6.0.0.0" },
222+
{ "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets", "6.0.0.0" },
223+
{ "Microsoft.AspNetCore.Session", "6.0.0.0" },
224+
{ "Microsoft.AspNetCore.SignalR", "6.0.0.0" },
225+
{ "Microsoft.AspNetCore.SignalR.Common", "6.0.0.0" },
226+
{ "Microsoft.AspNetCore.SignalR.Core", "6.0.0.0" },
227+
{ "Microsoft.AspNetCore.SignalR.Protocols.Json", "6.0.0.0" },
228+
{ "Microsoft.AspNetCore.StaticFiles", "6.0.0.0" },
229+
{ "Microsoft.AspNetCore.WebSockets", "6.0.0.0" },
230+
{ "Microsoft.AspNetCore.WebUtilities", "6.0.0.0" },
231231
{ "Microsoft.Extensions.Caching.Abstractions", "5.0.0.0" },
232232
{ "Microsoft.Extensions.Caching.Memory", "5.0.0.0" },
233233
{ "Microsoft.Extensions.Configuration", "5.0.0.0" },
@@ -238,25 +238,25 @@ static TestData()
238238
{ "Microsoft.Extensions.Configuration.FileExtensions", "5.0.0.0" },
239239
{ "Microsoft.Extensions.Configuration.Ini", "5.0.0.0" },
240240
{ "Microsoft.Extensions.Configuration.Json", "5.0.0.0" },
241-
{ "Microsoft.Extensions.Configuration.KeyPerFile", "5.0.0.0" },
241+
{ "Microsoft.Extensions.Configuration.KeyPerFile", "6.0.0.0" },
242242
{ "Microsoft.Extensions.Configuration.UserSecrets", "5.0.0.0" },
243243
{ "Microsoft.Extensions.Configuration.Xml", "5.0.0.0" },
244244
{ "Microsoft.Extensions.DependencyInjection", "5.0.0.0" },
245245
{ "Microsoft.Extensions.DependencyInjection.Abstractions", "5.0.0.0" },
246-
{ "Microsoft.Extensions.Diagnostics.HealthChecks", "5.0.0.0" },
247-
{ "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions", "5.0.0.0" },
246+
{ "Microsoft.Extensions.Diagnostics.HealthChecks", "6.0.0.0" },
247+
{ "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions", "6.0.0.0" },
248248
{ "Microsoft.Extensions.FileProviders.Abstractions", "5.0.0.0" },
249249
{ "Microsoft.Extensions.FileProviders.Composite", "5.0.0.0" },
250-
{ "Microsoft.Extensions.FileProviders.Embedded", "5.0.0.0" },
250+
{ "Microsoft.Extensions.FileProviders.Embedded", "6.0.0.0" },
251251
{ "Microsoft.Extensions.FileProviders.Physical", "5.0.0.0" },
252252
{ "Microsoft.Extensions.FileSystemGlobbing", "5.0.0.0" },
253253
{ "Microsoft.Extensions.Hosting", "5.0.0.0" },
254254
{ "Microsoft.Extensions.Hosting.Abstractions", "5.0.0.0" },
255255
{ "Microsoft.Extensions.Http", "5.0.0.0" },
256-
{ "Microsoft.Extensions.Identity.Core", "5.0.0.0" },
257-
{ "Microsoft.Extensions.Identity.Stores", "5.0.0.0" },
258-
{ "Microsoft.Extensions.Localization", "5.0.0.0" },
259-
{ "Microsoft.Extensions.Localization.Abstractions", "5.0.0.0" },
256+
{ "Microsoft.Extensions.Identity.Core", "6.0.0.0" },
257+
{ "Microsoft.Extensions.Identity.Stores", "6.0.0.0" },
258+
{ "Microsoft.Extensions.Localization", "6.0.0.0" },
259+
{ "Microsoft.Extensions.Localization.Abstractions", "6.0.0.0" },
260260
{ "Microsoft.Extensions.Logging", "5.0.0.0" },
261261
{ "Microsoft.Extensions.Logging.Abstractions", "5.0.0.0" },
262262
{ "Microsoft.Extensions.Logging.Configuration", "5.0.0.0" },
@@ -265,14 +265,14 @@ static TestData()
265265
{ "Microsoft.Extensions.Logging.EventLog", "5.0.0.0" },
266266
{ "Microsoft.Extensions.Logging.EventSource", "5.0.0.0" },
267267
{ "Microsoft.Extensions.Logging.TraceSource", "5.0.0.0" },
268-
{ "Microsoft.Extensions.ObjectPool", "5.0.0.0" },
268+
{ "Microsoft.Extensions.ObjectPool", "6.0.0.0" },
269269
{ "Microsoft.Extensions.Options", "5.0.0.0" },
270270
{ "Microsoft.Extensions.Options.ConfigurationExtensions", "5.0.0.0" },
271271
{ "Microsoft.Extensions.Options.DataAnnotations", "5.0.0.0" },
272272
{ "Microsoft.Extensions.Primitives", "5.0.0.0" },
273-
{ "Microsoft.Extensions.WebEncoders", "5.0.0.0" },
274-
{ "Microsoft.JSInterop", "5.0.0.0" },
275-
{ "Microsoft.Net.Http.Headers", "5.0.0.0" },
273+
{ "Microsoft.Extensions.WebEncoders", "6.0.0.0" },
274+
{ "Microsoft.JSInterop", "6.0.0.0" },
275+
{ "Microsoft.Net.Http.Headers", "6.0.0.0" },
276276
{ "Microsoft.Win32.Registry", "5.0.0.0" },
277277
{ "System.Diagnostics.EventLog", "5.0.0.0" },
278278
{ "System.IO.Pipelines", "5.0.0.0" },
@@ -292,6 +292,8 @@ static TestData()
292292

293293
public static string GetSharedFxVersion() => GetTestDataValue("SharedFxVersion");
294294

295+
public static string GetDefaultNetCoreTargetFramework() => GetTestDataValue("DefaultNetCoreTargetFramework");
296+
295297
public static string GetMicrosoftNETCoreAppPackageVersion() => GetTestDataValue("MicrosoftNETCoreAppRuntimeVersion");
296298

297299
public static string GetReferencePackSharedFxVersion() => GetTestDataValue("ReferencePackSharedFxVersion");

0 commit comments

Comments
 (0)