| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117 |
- commit 94d78e22c8a568be5813a142d7862139b7e0856e
- Author: Ryan Brandenburg <[email protected]>
- Date: Mon May 7 15:15:03 2018 -0700
- Upgrade to netcoreapp22
- diff --git a/Directory.Build.targets b/Directory.Build.targets
- index 53b3f6e1dab..78626b773ea 100644
- --- a/Directory.Build.targets
- +++ b/Directory.Build.targets
- @@ -1,7 +1,10 @@
- -<Project>
- +<Project>
- <PropertyGroup>
- <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
- <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
- + <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">$(MicrosoftNETCoreApp22PackageVersion)</RuntimeFrameworkVersion>
- <NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
- + <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
- + <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
- </PropertyGroup>
- </Project>
- diff --git a/build/dependencies.props b/build/dependencies.props
- index 0a7c26a0ebb..d8786401044 100644
- --- a/build/dependencies.props
- +++ b/build/dependencies.props
- @@ -1,20 +1,21 @@
- -<Project>
- +<Project>
- <PropertyGroup>
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
- <PropertyGroup Label="Package Versions">
- - <InternalAspNetCoreSdkPackageVersion>2.2.0-preview1-17047</InternalAspNetCoreSdkPackageVersion>
- - <MicrosoftAspNetCoreHttpExtensionsPackageVersion>2.2.0-preview1-34135</MicrosoftAspNetCoreHttpExtensionsPackageVersion>
- - <MicrosoftAspNetCoreHttpPackageVersion>2.2.0-preview1-34135</MicrosoftAspNetCoreHttpPackageVersion>
- - <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.2.0-preview1-34135</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
- - <MicrosoftAspNetCoreServerKestrelPackageVersion>2.2.0-preview1-34135</MicrosoftAspNetCoreServerKestrelPackageVersion>
- - <MicrosoftAspNetCoreTestHostPackageVersion>2.2.0-preview1-34135</MicrosoftAspNetCoreTestHostPackageVersion>
- - <MicrosoftExtensionsCachingMemoryPackageVersion>2.2.0-preview1-34135</MicrosoftExtensionsCachingMemoryPackageVersion>
- - <MicrosoftExtensionsLoggingAbstractionsPackageVersion>2.2.0-preview1-34135</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
- - <MicrosoftExtensionsLoggingTestingPackageVersion>2.2.0-preview1-34135</MicrosoftExtensionsLoggingTestingPackageVersion>
- - <MicrosoftExtensionsPrimitivesPackageVersion>2.2.0-preview1-34135</MicrosoftExtensionsPrimitivesPackageVersion>
- + <InternalAspNetCoreSdkPackageVersion>2.2.0-preview1-17048</InternalAspNetCoreSdkPackageVersion>
- + <MicrosoftAspNetCoreHttpExtensionsPackageVersion>2.2.0-preview1-34140</MicrosoftAspNetCoreHttpExtensionsPackageVersion>
- + <MicrosoftAspNetCoreHttpPackageVersion>2.2.0-preview1-34140</MicrosoftAspNetCoreHttpPackageVersion>
- + <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.2.0-preview1-34140</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
- + <MicrosoftAspNetCoreServerKestrelPackageVersion>2.2.0-preview1-34140</MicrosoftAspNetCoreServerKestrelPackageVersion>
- + <MicrosoftAspNetCoreTestHostPackageVersion>2.2.0-preview1-34140</MicrosoftAspNetCoreTestHostPackageVersion>
- + <MicrosoftExtensionsCachingMemoryPackageVersion>2.2.0-preview1-34140</MicrosoftExtensionsCachingMemoryPackageVersion>
- + <MicrosoftExtensionsLoggingAbstractionsPackageVersion>2.2.0-preview1-34140</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
- + <MicrosoftExtensionsLoggingTestingPackageVersion>2.2.0-preview1-34140</MicrosoftExtensionsLoggingTestingPackageVersion>
- + <MicrosoftExtensionsPrimitivesPackageVersion>2.2.0-preview1-34140</MicrosoftExtensionsPrimitivesPackageVersion>
- <MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
- <MicrosoftNETCoreApp21PackageVersion>2.2.0-preview1-26424-04</MicrosoftNETCoreApp21PackageVersion>
- + <MicrosoftNETCoreApp22PackageVersion>2.2.0-preview1-26502-01</MicrosoftNETCoreApp22PackageVersion>
- <MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
- <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
- <XunitPackageVersion>2.3.1</XunitPackageVersion>
- diff --git a/build/repo.props b/build/repo.props
- index 78b0ce58790..17a98ac7e7d 100644
- --- a/build/repo.props
- +++ b/build/repo.props
- @@ -1,4 +1,4 @@
- -<Project>
- +<Project>
- <Import Project="dependencies.props" />
-
- <PropertyGroup>
- @@ -10,5 +10,6 @@
- <ItemGroup>
- <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" />
- <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)" />
- + <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp22PackageVersion)" />
- </ItemGroup>
- </Project>
- diff --git a/korebuild-lock.txt b/korebuild-lock.txt
- index a16d4b9ee44..2573a039953 100644
- --- a/korebuild-lock.txt
- +++ b/korebuild-lock.txt
- @@ -1,2 +1,2 @@
- -version:2.2.0-preview1-17047
- -commithash:e1957b52ddc8b62bd39c5c400322fccb5364624c
- +version:2.2.0-preview1-17048
- +commithash:de14a0ee5fb48508ee8a29c14280a2928f8dabf8
- diff --git a/samples/ResponseCachingSample/ResponseCachingSample.csproj b/samples/ResponseCachingSample/ResponseCachingSample.csproj
- index 3739141e06d..557625467b2 100644
- --- a/samples/ResponseCachingSample/ResponseCachingSample.csproj
- +++ b/samples/ResponseCachingSample/ResponseCachingSample.csproj
- @@ -1,7 +1,7 @@
- -<Project Sdk="Microsoft.NET.Sdk.Web">
- +<Project Sdk="Microsoft.NET.Sdk.Web">
-
- <PropertyGroup>
- - <TargetFramework>netcoreapp2.1</TargetFramework>
- + <TargetFramework>netcoreapp2.2</TargetFramework>
- </PropertyGroup>
-
- <ItemGroup>
- diff --git a/test/Directory.Build.props b/test/Directory.Build.props
- index 270e1fa2097..3a373e2cb80 100644
- --- a/test/Directory.Build.props
- +++ b/test/Directory.Build.props
- @@ -1,10 +1,10 @@
- -<Project>
- +<Project>
- <Import Project="..\Directory.Build.props" />
-
- <PropertyGroup>
- - <DeveloperBuildTestTfms>netcoreapp2.1</DeveloperBuildTestTfms>
- + <DeveloperBuildTestTfms>netcoreapp2.2</DeveloperBuildTestTfms>
- <StandardTestTfms>$(DeveloperBuildTestTfms)</StandardTestTfms>
- - <StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' ">netcoreapp2.1;netcoreapp2.0</StandardTestTfms>
- +
- <StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(StandardTestTfms);net461</StandardTestTfms>
- </PropertyGroup>
-
|