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

Commit 1ad03de

Browse files
ryanbrandenburgryanbrandenburg
committed
Upgrade to netcoreapp22
1 parent 816516f commit 1ad03de

File tree

6 files changed

+25
-20
lines changed

6 files changed

+25
-20
lines changed

‎Directory.Build.targets‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
<Project>
1+
<Project>
22
<PropertyGroup>
33
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
44
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
5+
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">$(MicrosoftNETCoreApp22PackageVersion)</RuntimeFrameworkVersion>
56
<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>
69
</PropertyGroup>
710
</Project>

‎build/dependencies.props‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
<Project>
1+
<Project>
22
<PropertyGroup>
33
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
44
</PropertyGroup>
55
<PropertyGroup Label="Package Versions">
6-
<InternalAspNetCoreSdkPackageVersion>2.2.0-preview1-17047</InternalAspNetCoreSdkPackageVersion>
7-
<MicrosoftAspNetCoreTestingPackageVersion>2.2.0-preview1-34135</MicrosoftAspNetCoreTestingPackageVersion>
8-
<MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>2.2.0-preview1-34135</MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>
9-
<MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>2.2.0-preview1-34135</MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>
10-
<MicrosoftExtensionsDependencyInjectionPackageVersion>2.2.0-preview1-34135</MicrosoftExtensionsDependencyInjectionPackageVersion>
11-
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>2.2.0-preview1-34135</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
12-
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>2.2.0-preview1-34135</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
13-
<MicrosoftExtensionsObjectPoolPackageVersion>2.2.0-preview1-34135</MicrosoftExtensionsObjectPoolPackageVersion>
14-
<MicrosoftExtensionsOptionsPackageVersion>2.2.0-preview1-34135</MicrosoftExtensionsOptionsPackageVersion>
15-
<MicrosoftExtensionsPrimitivesPackageVersion>2.2.0-preview1-34135</MicrosoftExtensionsPrimitivesPackageVersion>
16-
<MicrosoftExtensionsWebEncodersSourcesPackageVersion>2.2.0-preview1-34135</MicrosoftExtensionsWebEncodersSourcesPackageVersion>
6+
<InternalAspNetCoreSdkPackageVersion>2.2.0-preview1-17048</InternalAspNetCoreSdkPackageVersion>
7+
<MicrosoftAspNetCoreTestingPackageVersion>2.2.0-preview1-34140</MicrosoftAspNetCoreTestingPackageVersion>
8+
<MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>2.2.0-preview1-34140</MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>
9+
<MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>2.2.0-preview1-34140</MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>
10+
<MicrosoftExtensionsDependencyInjectionPackageVersion>2.2.0-preview1-34140</MicrosoftExtensionsDependencyInjectionPackageVersion>
11+
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>2.2.0-preview1-34140</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
12+
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>2.2.0-preview1-34140</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
13+
<MicrosoftExtensionsObjectPoolPackageVersion>2.2.0-preview1-34140</MicrosoftExtensionsObjectPoolPackageVersion>
14+
<MicrosoftExtensionsOptionsPackageVersion>2.2.0-preview1-34140</MicrosoftExtensionsOptionsPackageVersion>
15+
<MicrosoftExtensionsPrimitivesPackageVersion>2.2.0-preview1-34140</MicrosoftExtensionsPrimitivesPackageVersion>
16+
<MicrosoftExtensionsWebEncodersSourcesPackageVersion>2.2.0-preview1-34140</MicrosoftExtensionsWebEncodersSourcesPackageVersion>
1717
<MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
1818
<MicrosoftNETCoreApp21PackageVersion>2.2.0-preview1-26424-04</MicrosoftNETCoreApp21PackageVersion>
19+
<MicrosoftNETCoreApp22PackageVersion>2.2.0-preview1-26502-01</MicrosoftNETCoreApp22PackageVersion>
1920
<MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
2021
<MoqPackageVersion>4.7.49</MoqPackageVersion>
2122
<NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>

‎build/repo.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project>
1+
<Project>
22
<Import Project="dependencies.props" />
33

44
<PropertyGroup>
@@ -10,5 +10,6 @@
1010
<ItemGroup>
1111
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" />
1212
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)" />
13+
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp22PackageVersion)" />
1314
</ItemGroup>
1415
</Project>

‎korebuild-lock.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version:2.2.0-preview1-17047
2-
commithash:e1957b52ddc8b62bd39c5c400322fccb5364624c
1+
version:2.2.0-preview1-17048
2+
commithash:de14a0ee5fb48508ee8a29c14280a2928f8dabf8

‎samples/SampleApp/SampleApp.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp2.2;net461</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77

‎test/Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<Import Project="..\Directory.Build.props" />
33

44
<PropertyGroup>
5-
<DeveloperBuildTestTfms>netcoreapp2.1</DeveloperBuildTestTfms>
5+
<DeveloperBuildTestTfms>netcoreapp2.2</DeveloperBuildTestTfms>
66
<StandardTestTfms>$(DeveloperBuildTestTfms)</StandardTestTfms>
7-
<StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' ">netcoreapp2.1;netcoreapp2.0</StandardTestTfms>
7+
88
<StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(StandardTestTfms);net461</StandardTestTfms>
99
</PropertyGroup>
1010

0 commit comments

Comments
 (0)