Skip to content

Commit 9b191ab

Browse files
pranavkmpranavkm
committed
Update samples and tests to netcoreapp2.1
1 parent 43ea84c commit 9b191ab

File tree

9 files changed

+45
-20
lines changed

9 files changed

+45
-20
lines changed

‎build/dependencies.props‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@
33
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
44
</PropertyGroup>
55
<PropertyGroup Label="Package Versions">
6-
<AspNetIntegrationTestingVersion>0.5.0-preview1-27534</AspNetIntegrationTestingVersion>
7-
<InternalAspNetCoreSdkPackageVersion>2.1.0-preview1-15559</InternalAspNetCoreSdkPackageVersion>
8-
<MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>2.1.0-preview1-27645</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>
9-
<MicrosoftAspNetCoreHostingPackageVersion>2.1.0-preview1-27645</MicrosoftAspNetCoreHostingPackageVersion>
10-
<MicrosoftAspNetCoreMvcPackageVersion>2.1.0-preview1-27645</MicrosoftAspNetCoreMvcPackageVersion>
11-
<MicrosoftAspNetCoreMvcTestingPackageVersion>2.1.0-preview1-27645</MicrosoftAspNetCoreMvcTestingPackageVersion>
12-
<MicrosoftAspNetCorePackageVersion>2.1.0-preview1-27645</MicrosoftAspNetCorePackageVersion>
13-
<MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.5.0-preview1-27645</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>
14-
<MicrosoftAspNetCoreStaticFilesPackageVersion>2.1.0-preview1-27645</MicrosoftAspNetCoreStaticFilesPackageVersion>
15-
<MicrosoftAspNetCoreTestHostPackageVersion>2.1.0-preview1-27645</MicrosoftAspNetCoreTestHostPackageVersion>
16-
<MicrosoftAspNetCoreTestingPackageVersion>2.1.0-preview1-27645</MicrosoftAspNetCoreTestingPackageVersion>
6+
<InternalAspNetCoreSdkPackageVersion>2.1.0-preview1-15576</InternalAspNetCoreSdkPackageVersion>
7+
<MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>2.1.0-preview1-27644</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>
8+
<MicrosoftAspNetCoreHostingPackageVersion>2.1.0-preview1-27644</MicrosoftAspNetCoreHostingPackageVersion>
9+
<MicrosoftAspNetCoreMvcPackageVersion>2.1.0-preview1-27644</MicrosoftAspNetCoreMvcPackageVersion>
10+
<MicrosoftAspNetCoreMvcTestingPackageVersion>2.1.0-preview1-27644</MicrosoftAspNetCoreMvcTestingPackageVersion>
11+
<MicrosoftAspNetCorePackageVersion>2.1.0-preview1-27644</MicrosoftAspNetCorePackageVersion>
12+
<MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.5.0-preview1-27644</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>
13+
<MicrosoftAspNetCoreStaticFilesPackageVersion>2.1.0-preview1-27644</MicrosoftAspNetCoreStaticFilesPackageVersion>
14+
<MicrosoftAspNetCoreTestHostPackageVersion>2.1.0-preview1-27644</MicrosoftAspNetCoreTestHostPackageVersion>
15+
<MicrosoftAspNetCoreTestingPackageVersion>2.1.0-preview1-27644</MicrosoftAspNetCoreTestingPackageVersion>
16+
<MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
17+
<MicrosoftNETCoreApp21PackageVersion>2.1.0-preview1-25907-02</MicrosoftNETCoreApp21PackageVersion>
1718
<MicrosoftNETTestSdkPackageVersion>15.3.0</MicrosoftNETTestSdkPackageVersion>
1819
<XunitPackageVersion>2.3.0</XunitPackageVersion>
1920
<XunitRunnerVisualStudioPackageVersion>2.3.0</XunitRunnerVisualStudioPackageVersion>

‎build/repo.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<PropertyGroup>
33
<!-- These properties are use by the automation that updates dependencies.props -->
44
<LineupPackageId>Internal.AspNetCore.Universe.Lineup</LineupPackageId>
5-
<LineupPackageRestoreSource>https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json</LineupPackageRestoreSource>
5+
<LineupPackageRestoreSource>https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json</LineupPackageRestoreSource>
66
</PropertyGroup>
77
</Project>

‎build/sources.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<RestoreSources>$(DotNetRestoreSources)</RestoreSources>
66
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
77
$(RestoreSources);
8-
https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json;
8+
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
99
https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
1010
</RestoreSources>
1111
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">

‎korebuild-lock.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version:2.1.0-preview1-15559
2-
commithash:2c59937fbbe6f2ae5ceb6c5ff5a3bd35577d96ca
1+
version:2.1.0-preview1-15576
2+
commithash:2f3856d2ba4f659fcb9253215b83946a06794a27

‎samples/ClaimsTransformation/ClaimsTransformation.csproj‎

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

33
<PropertyGroup>
44
<IsPackable>false</IsPackable>
5-
<TargetFramework>netcoreapp2.0</TargetFramework>
5+
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0</TargetFrameworks>
66
</PropertyGroup>
77

88
<ItemGroup>

‎samples/Cookies/Cookies.csproj‎

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

33
<PropertyGroup>
44
<IsPackable>false</IsPackable>
5-
<TargetFramework>netcoreapp2.0</TargetFramework>
5+
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0</TargetFrameworks>
66
</PropertyGroup>
77

88
<ItemGroup>

‎test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,23 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
4+
<TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
55
</PropertyGroup>
66

7+
<!-- Workaround for https://github.com/dotnet/sdk/issues/1729 -->
8+
<Target Name="ResetPlatformTarget" BeforeTargets="CoreCompile" Condition="'$(TargetFramework)'=='netcoreapp2.1'">
9+
<PropertyGroup>
10+
<PlatformTarget>AnyCPU</PlatformTarget>
11+
</PropertyGroup>
12+
</Target>
13+
714
<ItemGroup>
815
<ProjectReference Include="..\..\samples\Cookies\Cookies.csproj" />
916
<ProjectReference Include="..\..\samples\ClaimsTransformation\ClaimsTransformation.csproj" />
1017

1118
<PackageReference Include="Microsoft.AspNetCore" Version="$(MicrosoftAspNetCorePackageVersion)" />
1219
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
13-
<PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting" Version="$(AspNetIntegrationTestingVersion)" />
20+
<PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting" Version="$(MicrosoftAspNetCoreServerIntegrationTestingPackageVersion)" />
1421
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftAspNetCoreTestHostPackageVersion)" />
1522
<PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
1623
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(MicrosoftAspNetCoreMvcTestingPackageVersion)" />

‎test/AuthSamples.FunctionalTests/TestServices.cs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,21 @@ public static async Task RunSiteTest(
4343
Func<HttpClient, ILogger, CancellationToken, Task> validator)
4444
{
4545
var logger = loggerFactory.CreateLogger(siteName);
46+
var targetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" :
47+
#if NETCOREAPP2_0
48+
"netcoreapp2.0";
49+
#elif NETCOREAPP2_1
50+
"netcoreapp2.1";
51+
#else
52+
#error Target frameworks need to be updated.
53+
#endif
4654

4755
var deploymentParameters = new DeploymentParameters(GetApplicationDirectory(siteName), serverType, runtimeFlavor, architecture)
4856
{
4957
SiteName = "HttpTestSite",
5058
ServerConfigTemplateContent = serverType == ServerType.Nginx ? File.ReadAllText(Path.Combine(WorkingDirectory, "nginx.conf")) : string.Empty,
5159
PublishApplicationBeforeDeployment = true,
52-
TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.0",
60+
TargetFramework = targetFramework,
5361
ApplicationType = applicationType
5462
};
5563

‎test/Directory.Build.props‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Project>
2+
<Import Project="..\Directory.Build.props" />
3+
4+
<PropertyGroup>
5+
<DeveloperBuildTestTfms>netcoreapp2.1</DeveloperBuildTestTfms>
6+
<StandardTestTfms>$(DeveloperBuildTestTfms)</StandardTestTfms>
7+
<StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' ">$(StandardTestTfms);netcoreapp2.0</StandardTestTfms>
8+
</PropertyGroup>
9+
</Project>

0 commit comments

Comments
 (0)