Skip to content
This repository was archived by the owner on Nov 22, 2018. It is now read-only.

Commit c39d85f

Browse files
natemcmasternatemcmaster
authored
Upgrade package and projects to target netcoreapp3.0 (#203)
1 parent e790a9b commit c39d85f

File tree

13 files changed

+1012
-1042
lines changed

13 files changed

+1012
-1042
lines changed

‎Directory.Build.targets

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

‎build/dependencies.props

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,22 @@
33
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
44
</PropertyGroup>
55
<PropertyGroup Label="Package Versions">
6-
<InternalAspNetCoreSdkPackageVersion>3.0.0-alpha1-20181011.11</InternalAspNetCoreSdkPackageVersion>
7-
<MicrosoftAspNetCoreHttpExtensionsPackageVersion>3.0.0-alpha1-10617</MicrosoftAspNetCoreHttpExtensionsPackageVersion>
8-
<MicrosoftAspNetCoreServerIISIntegrationPackageVersion>3.0.0-alpha1-10617</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
9-
<MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.7.0-alpha1-10617</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>
10-
<MicrosoftAspNetCoreServerKestrelPackageVersion>3.0.0-alpha1-10617</MicrosoftAspNetCoreServerKestrelPackageVersion>
11-
<MicrosoftAspNetCoreStaticFilesPackageVersion>3.0.0-alpha1-10617</MicrosoftAspNetCoreStaticFilesPackageVersion>
12-
<MicrosoftAspNetCoreTestHostPackageVersion>3.0.0-alpha1-10617</MicrosoftAspNetCoreTestHostPackageVersion>
13-
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>3.0.0-alpha1-10617</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
14-
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>3.0.0-alpha1-10617</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
15-
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>3.0.0-alpha1-10617</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
16-
<MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-alpha1-10617</MicrosoftExtensionsLoggingConsolePackageVersion>
17-
<MicrosoftExtensionsLoggingTestingPackageVersion>3.0.0-alpha1-10617</MicrosoftExtensionsLoggingTestingPackageVersion>
18-
<MicrosoftExtensionsOptionsPackageVersion>3.0.0-alpha1-10617</MicrosoftExtensionsOptionsPackageVersion>
19-
<MicrosoftNETCoreApp20PackageVersion>2.0.9</MicrosoftNETCoreApp20PackageVersion>
20-
<MicrosoftNETCoreApp21PackageVersion>2.1.3</MicrosoftNETCoreApp21PackageVersion>
21-
<MicrosoftNETCoreApp22PackageVersion>2.2.0-preview2-26905-02</MicrosoftNETCoreApp22PackageVersion>
6+
<InternalAspNetCoreSdkPackageVersion>3.0.0-build-20181116.1</InternalAspNetCoreSdkPackageVersion>
7+
<MicrosoftAspNetCoreHttpExtensionsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHttpExtensionsPackageVersion>
8+
<MicrosoftAspNetCoreServerIISIntegrationPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
9+
<MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.7.0-alpha1-10742</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>
10+
<MicrosoftAspNetCoreServerKestrelPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreServerKestrelPackageVersion>
11+
<MicrosoftAspNetCoreStaticFilesPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreStaticFilesPackageVersion>
12+
<MicrosoftAspNetCoreTestHostPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreTestHostPackageVersion>
13+
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
14+
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
15+
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
16+
<MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingConsolePackageVersion>
17+
<MicrosoftExtensionsLoggingTestingPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingTestingPackageVersion>
18+
<MicrosoftExtensionsOptionsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsOptionsPackageVersion>
19+
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview1-26907-05</MicrosoftNETCoreAppPackageVersion>
2220
<MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
2321
<MoqPackageVersion>4.10.0</MoqPackageVersion>
24-
<NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
2522
<XunitAnalyzersPackageVersion>0.10.0</XunitAnalyzersPackageVersion>
2623
<XunitPackageVersion>2.3.1</XunitPackageVersion>
2724
<XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>

‎build/repo.props

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

1010
<ItemGroup>
11-
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" />
12-
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)" />
13-
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp22PackageVersion)" />
11+
<DotNetCoreRuntime Include="$(MicrosoftNETCoreAppPackageVersion)" />
1412
</ItemGroup>
1513
</Project>

‎korebuild-lock.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version:3.0.0-alpha1-20181011.11
2-
commithash:f57aa8ddda0abdd74ada55853587bedb4f364065
1+
version:3.0.0-build-20181116.1
2+
commithash:9be7d79a8f7e0668f66e584aca1e962f45975511

‎samples/SampleDestination/SampleDestination.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.Web">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
4+
<TargetFramework>netcoreapp3.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

‎samples/SampleOrigin/SampleOrigin.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.Web">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
4+
<TargetFramework>netcoreapp3.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

‎src/Microsoft.AspNetCore.Cors/Microsoft.AspNetCore.Cors.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Commonly used types:
66
Microsoft.AspNetCore.Cors.DisableCorsAttribute
77
Microsoft.AspNetCore.Cors.EnableCorsAttribute</Description>
8-
<TargetFramework>netstandard2.0</TargetFramework>
8+
<TargetFramework>netcoreapp3.0</TargetFramework>
99
<NoWarn>$(NoWarn);CS1591</NoWarn>
1010
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1111
<PackageTags>aspnetcore;cors</PackageTags>

‎test/Directory.Build.props

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
<Project>
22
<Import Project="..\Directory.Build.props" />
33

4-
<PropertyGroup>
5-
<DeveloperBuildTestTfms>netcoreapp2.2</DeveloperBuildTestTfms>
6-
<StandardTestTfms>$(DeveloperBuildTestTfms)</StandardTestTfms>
7-
<StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' ">$(StandardTestTfms)</StandardTestTfms>
8-
<StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(StandardTestTfms);net461</StandardTestTfms>
9-
</PropertyGroup>
10-
114
<ItemGroup>
125
<PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
136
</ItemGroup>

‎test/FunctionalTests/CorsMiddlewareFunctionalTest.cs

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,6 @@ public async Task RunClientTests()
6161
private static async Task<SamplesDeploymentResult> CreateDeployments(ILoggerFactory loggerFactory)
6262
{
6363
var solutionPath = TestPathUtilities.GetSolutionRootDirectory("CORS");
64-
65-
var runtimeFlavor = GetRuntimeFlavor();
66-
var applicationType = runtimeFlavor == RuntimeFlavor.Clr ? ApplicationType.Standalone : ApplicationType.Portable;
67-
6864
var configuration =
6965
#if RELEASE
7066
"Release";
@@ -74,11 +70,12 @@ private static async Task<SamplesDeploymentResult> CreateDeployments(ILoggerFact
7470

7571
var destinationParameters = new DeploymentParameters
7672
{
77-
RuntimeFlavor = runtimeFlavor,
73+
TargetFramework = "netcoreapp3.0",
74+
RuntimeFlavor = RuntimeFlavor.CoreClr,
7875
ServerType = ServerType.Kestrel,
7976
ApplicationPath = Path.Combine(solutionPath, "samples", "SampleDestination"),
8077
PublishApplicationBeforeDeployment = false,
81-
ApplicationType = applicationType,
78+
ApplicationType = ApplicationType.Portable,
8279
Configuration = configuration,
8380
};
8481

@@ -87,11 +84,12 @@ private static async Task<SamplesDeploymentResult> CreateDeployments(ILoggerFact
8784

8885
var originParameters = new DeploymentParameters
8986
{
90-
RuntimeFlavor = runtimeFlavor,
87+
TargetFramework = "netcoreapp3.0",
88+
RuntimeFlavor = RuntimeFlavor.CoreClr,
9189
ServerType = ServerType.Kestrel,
9290
ApplicationPath = Path.Combine(solutionPath, "samples", "SampleOrigin"),
9391
PublishApplicationBeforeDeployment = false,
94-
ApplicationType = applicationType,
92+
ApplicationType = ApplicationType.Portable,
9593
Configuration = configuration,
9694
};
9795

@@ -101,17 +99,6 @@ private static async Task<SamplesDeploymentResult> CreateDeployments(ILoggerFact
10199
return new SamplesDeploymentResult(originFactory, originDeployment, destinationFactory, destinationDeployment);
102100
}
103101

104-
private static RuntimeFlavor GetRuntimeFlavor()
105-
{
106-
#if NET461
107-
return RuntimeFlavor.Clr;
108-
#elif NETCOREAPP2_2
109-
return RuntimeFlavor.CoreClr;
110-
#else
111-
#error Target frameworks need to be updated
112-
#endif
113-
}
114-
115102
private readonly struct SamplesDeploymentResult : IDisposable
116103
{
117104
public SamplesDeploymentResult(

‎test/FunctionalTests/FunctionalTests.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>$(StandardTestTfms)</TargetFrameworks>
4+
<TargetFramework>netcoreapp3.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

0 commit comments

Comments
 (0)