Skip to content
This repository was archived by the owner on May 29, 2019. It is now read-only.

Commit 15b219f

Browse files
pranavkmpranavkm
committed
Update to netcoreapp2.2
1 parent c194c24 commit 15b219f

13 files changed

+55
-66
lines changed

‎Directory.Build.targets

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<Project>
22
<PropertyGroup>
3-
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
4-
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
3+
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">$(MicrosoftNETCoreApp22PackageVersion)</RuntimeFrameworkVersion>
54
<NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
5+
<!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
6+
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
67
</PropertyGroup>
78
</Project>

‎build/dependencies.props

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,40 +3,39 @@
33
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
44
</PropertyGroup>
55
<PropertyGroup Label="Package Versions">
6-
<MicrosoftAspNetCoreAllPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreAllPackageVersion>
7-
<MicrosoftAspNetCoreAspNetCoreModulePackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreAspNetCoreModulePackageVersion>
8-
<MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>
9-
<MicrosoftAspNetCoreAuthenticationCorePackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreAuthenticationCorePackageVersion>
10-
<MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
11-
<MicrosoftAspNetCoreAuthenticationGooglePackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
12-
<MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>
13-
<MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>
14-
<MicrosoftAspNetCoreAuthenticationTwitterPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreAuthenticationTwitterPackageVersion>
15-
<MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>
16-
<MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>
17-
<MicrosoftAspNetCoreIdentityPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreIdentityPackageVersion>
18-
<MicrosoftAspNetCoreMvcPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreMvcPackageVersion>
19-
<MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion>
20-
<MicrosoftAspNetCorePackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCorePackageVersion>
21-
<MicrosoftAspNetCoreServerHttpSysPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreServerHttpSysPackageVersion>
22-
<MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.6.0-preview1-34184</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>
23-
<MicrosoftAspNetCoreSessionPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreSessionPackageVersion>
24-
<MicrosoftAspNetCoreStaticFilesPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreStaticFilesPackageVersion>
25-
<MicrosoftAspNetCoreWebUtilitiesPackageVersion>2.2.0-preview1-34184</MicrosoftAspNetCoreWebUtilitiesPackageVersion>
26-
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>2.2.0-preview1-34184</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
27-
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.2.0-preview1-34184</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
28-
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>2.2.0-preview1-34184</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
29-
<MicrosoftExtensionsConfigurationBinderPackageVersion>2.2.0-preview1-34184</MicrosoftExtensionsConfigurationBinderPackageVersion>
30-
<MicrosoftExtensionsConfigurationCommandLinePackageVersion>2.2.0-preview1-34184</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
31-
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>2.2.0-preview1-34184</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
32-
<MicrosoftExtensionsConfigurationJsonPackageVersion>2.2.0-preview1-34184</MicrosoftExtensionsConfigurationJsonPackageVersion>
33-
<MicrosoftExtensionsConfigurationUserSecretsPackageVersion>2.2.0-preview1-34184</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
34-
<MicrosoftExtensionsLoggingConsolePackageVersion>2.2.0-preview1-34184</MicrosoftExtensionsLoggingConsolePackageVersion>
35-
<MicrosoftExtensionsLoggingPackageVersion>2.2.0-preview1-34184</MicrosoftExtensionsLoggingPackageVersion>
36-
<MicrosoftExtensionsLoggingTestingPackageVersion>2.2.0-preview1-34184</MicrosoftExtensionsLoggingTestingPackageVersion>
37-
<MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
38-
<MicrosoftNETCoreApp21PackageVersion>2.1.0-rc1</MicrosoftNETCoreApp21PackageVersion>
39-
<MicrosoftNETSdkRazorPackageVersion>2.2.0-preview1-34184</MicrosoftNETSdkRazorPackageVersion>
6+
<MicrosoftAspNetCoreAllPackageVersion>2.2.0-preview1-34194</MicrosoftAspNetCoreAllPackageVersion>
7+
<MicrosoftAspNetCoreAspNetCoreModulePackageVersion>2.2.0-preview1-34194</MicrosoftAspNetCoreAspNetCoreModulePackageVersion>
8+
<MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>2.2.0-preview1-34194</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>
9+
<MicrosoftAspNetCoreAuthenticationCorePackageVersion>2.2.0-preview1-34194</MicrosoftAspNetCoreAuthenticationCorePackageVersion>
10+
<MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>2.2.0-preview1-34194</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
11+
<MicrosoftAspNetCoreAuthenticationGooglePackageVersion>2.2.0-preview1-34194</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
12+
<MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>2.2.0-preview1-34194</MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>
13+
<MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>2.2.0-preview1-34194</MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>
14+
<MicrosoftAspNetCoreAuthenticationTwitterPackageVersion>2.2.0-preview1-34194</MicrosoftAspNetCoreAuthenticationTwitterPackageVersion>
15+
<MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>2.2.0-preview1-34194</MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>
16+
<MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>2.2.0-preview1-34194</MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>
17+
<MicrosoftAspNetCoreIdentityPackageVersion>2.2.0-preview1-34194</MicrosoftAspNetCoreIdentityPackageVersion>
18+
<MicrosoftAspNetCoreMvcPackageVersion>2.2.0-preview1-34194</MicrosoftAspNetCoreMvcPackageVersion>
19+
<MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion>2.2.0-preview1-34194</MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion>
20+
<MicrosoftAspNetCorePackageVersion>2.2.0-preview1-34194</MicrosoftAspNetCorePackageVersion>
21+
<MicrosoftAspNetCoreServerHttpSysPackageVersion>2.2.0-preview1-34194</MicrosoftAspNetCoreServerHttpSysPackageVersion>
22+
<MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.6.0-preview1-34194</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>
23+
<MicrosoftAspNetCoreSessionPackageVersion>2.2.0-preview1-34194</MicrosoftAspNetCoreSessionPackageVersion>
24+
<MicrosoftAspNetCoreStaticFilesPackageVersion>2.2.0-preview1-34194</MicrosoftAspNetCoreStaticFilesPackageVersion>
25+
<MicrosoftAspNetCoreWebUtilitiesPackageVersion>2.2.0-preview1-34194</MicrosoftAspNetCoreWebUtilitiesPackageVersion>
26+
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>2.2.0-preview1-34194</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
27+
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.2.0-preview1-34194</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
28+
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>2.2.0-preview1-34194</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
29+
<MicrosoftExtensionsConfigurationBinderPackageVersion>2.2.0-preview1-34194</MicrosoftExtensionsConfigurationBinderPackageVersion>
30+
<MicrosoftExtensionsConfigurationCommandLinePackageVersion>2.2.0-preview1-34194</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
31+
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>2.2.0-preview1-34194</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
32+
<MicrosoftExtensionsConfigurationJsonPackageVersion>2.2.0-preview1-34194</MicrosoftExtensionsConfigurationJsonPackageVersion>
33+
<MicrosoftExtensionsConfigurationUserSecretsPackageVersion>2.2.0-preview1-34194</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
34+
<MicrosoftExtensionsLoggingConsolePackageVersion>2.2.0-preview1-34194</MicrosoftExtensionsLoggingConsolePackageVersion>
35+
<MicrosoftExtensionsLoggingPackageVersion>2.2.0-preview1-34194</MicrosoftExtensionsLoggingPackageVersion>
36+
<MicrosoftExtensionsLoggingTestingPackageVersion>2.2.0-preview1-34194</MicrosoftExtensionsLoggingTestingPackageVersion>
37+
<MicrosoftNETCoreApp22PackageVersion>2.2.0-preview1-26509-06</MicrosoftNETCoreApp22PackageVersion>
38+
<MicrosoftNETSdkRazorPackageVersion>2.2.0-preview1-34194</MicrosoftNETSdkRazorPackageVersion>
4039
<MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
4140
<NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
4241
<SystemDataSqlClientPackageVersion>4.6.0-preview1-26508-04</SystemDataSqlClientPackageVersion>

‎build/repo.props

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" />
12-
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)" />
11+
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp22PackageVersion)" />
1312
</ItemGroup>
1413
</Project>

‎samples/MusicStore/MusicStore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>Music store application on ASP.NET Core</Description>
5-
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net461</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
66
<DefineConstants>$(DefineConstants);DEMO</DefineConstants>
77
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
88
<RuntimeIdentifiers Condition="'$(Configuration)' != 'RuntimeStore'">win7-x86;win7-x64;linux-x64;osx-x64</RuntimeIdentifiers>

‎test/MusicStore.E2ETests/Common/Helpers.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,7 @@ public static string GetTargetFramework(RuntimeFlavor flavor)
4848
}
4949
else if (flavor == RuntimeFlavor.CoreClr)
5050
{
51-
#if NETCOREAPP2_0
52-
return "netcoreapp2.0";
53-
#elif NETCOREAPP2_1
54-
return "netcoreapp2.1";
55-
#else
56-
#error Target Frameworks need to be updated
57-
#endif
51+
return "netcoreapp2.2";
5852
}
5953

6054
throw new ArgumentException($"Unknown runtime flavor '{flavor}.");

‎test/MusicStore.E2ETests/DotnetRunTests_X64.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ public Task DotnetRunTests_X64_Kestrel_CoreClr()
2424
{
2525
return RunTests(ServerType.Kestrel, RuntimeFlavor.CoreClr, ApplicationType.Portable);
2626
}
27-
#if !NETCOREAPP2_0 // Avoid running CLR based tests once on netcoreapp2.0 and netcoreapp2.1 each
27+
2828
[ConditionalFact]
2929
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
3030
public Task DotnetRunTests_X64_Kestrel_Clr()
3131
{
3232
// CLR must be published as standalone to perform rid specific deployment
3333
return RunTests(ServerType.Kestrel, RuntimeFlavor.Clr, ApplicationType.Standalone);
3434
}
35-
#endif
35+
3636
private Task RunTests(ServerType serverType, RuntimeFlavor runtimeFlavor, ApplicationType applicationType)
3737
=> _testRunner.RunTests(serverType, runtimeFlavor, applicationType, RuntimeArchitecture.x64);
3838
}

‎test/MusicStore.E2ETests/MusicStore.E2ETests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp2.2</TargetFrameworks>
55
<UserSecretsId>MusicStore.E2ETests</UserSecretsId>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
77
<ServerGarbageCollection>true</ServerGarbageCollection>

‎test/MusicStore.E2ETests/NtlmAuthentationTest.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ public Task NtlmAuthenticationTest_IISExpress_CoreCLR_Standalone()
4444
return NtlmAuthenticationTest(ServerType.IISExpress, RuntimeFlavor.CoreClr, ApplicationType.Standalone);
4545
}
4646

47-
#if !NETCOREAPP2_0 // Avoid running CLR based tests once on netcoreapp2.0 and netcoreapp2.1 each
4847
[ConditionalFact]
4948
public Task NtlmAuthenticationTest_WebListener_CLR()
5049
{
@@ -56,7 +55,6 @@ public Task NtlmAuthenticationTest_IISExpress_CLR()
5655
{
5756
return NtlmAuthenticationTest(ServerType.IISExpress, RuntimeFlavor.Clr, ApplicationType.Standalone);
5857
}
59-
#endif
6058

6159
private async Task NtlmAuthenticationTest(ServerType serverType, RuntimeFlavor runtimeFlavor, ApplicationType applicationType)
6260
{

‎test/MusicStore.E2ETests/OpenIdConnectTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ public Task OpenIdConnect_Kestrel_CoreCLR_Standalone()
2828
{
2929
return OpenIdConnectTestSuite(ServerType.Kestrel, RuntimeFlavor.CoreClr, ApplicationType.Standalone);
3030
}
31-
#if !NETCOREAPP2_0 // Avoid running CLR based tests once on netcoreapp2.0 and netcoreapp2.1 each
31+
3232
[ConditionalFact]
3333
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
3434
public Task OpenIdConnect_Kestrel_CLR()
3535
{
3636
return OpenIdConnectTestSuite(ServerType.Kestrel, RuntimeFlavor.Clr, ApplicationType.Portable);
3737
}
38-
#endif
38+
3939
private async Task OpenIdConnectTestSuite(ServerType serverType, RuntimeFlavor runtimeFlavor, ApplicationType applicationType)
4040
{
4141
var architecture = RuntimeArchitecture.x64;

‎test/MusicStore.E2ETests/PublishAndRunTests_X64.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ public Task PublishAndRunTests_X64_WebListener_CoreCLR_Standalone()
2929
{
3030
return RunTests(ServerType.WebListener, RuntimeFlavor.CoreClr, ApplicationType.Standalone);
3131
}
32-
#if !NETCOREAPP2_0 // Avoid running CLR based tests once on netcoreapp2.0 and netcoreapp2.1 each
32+
3333
[ConditionalFact]
3434
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
3535
public Task PublishAndRunTests_X64_WebListener_Clr()
3636
{
3737
// CLR must be published as standalone to perform rid specific deployment
3838
return RunTests(ServerType.WebListener, RuntimeFlavor.Clr, ApplicationType.Standalone);
3939
}
40-
#endif
40+
4141
[Fact]
4242
public Task PublishAndRunTests_X64_Kestrel_CoreClr_Portable()
4343
{
@@ -49,15 +49,15 @@ public Task PublishAndRunTests_X64_Kestrel_CoreClr_Standalone()
4949
{
5050
return RunTests(ServerType.Kestrel, RuntimeFlavor.CoreClr, ApplicationType.Standalone);
5151
}
52-
#if !NETCOREAPP2_0 // Avoid running CLR based tests once on netcoreapp2.0 and netcoreapp2.1 each
52+
5353
[ConditionalFact]
5454
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
5555
public Task PublishAndRunTests_X64_Kestrel_Clr()
5656
{
5757
// CLR must be published as standalone to perform rid specific deployment
5858
return RunTests(ServerType.Kestrel, RuntimeFlavor.Clr, ApplicationType.Standalone);
5959
}
60-
#endif
60+
6161
private Task RunTests(ServerType serverType, RuntimeFlavor runtimeFlavor, ApplicationType applicationType)
6262
=> _testRunner.RunTests(serverType, runtimeFlavor, applicationType, RuntimeArchitecture.x64);
6363
}

0 commit comments

Comments
 (0)