| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116 |
- commit abbdfb72ef54a77623c01d517c85eb8b28c70bc0
- Author: Nate McMaster <[email protected]>
- Date: Mon Nov 19 09:55:23 2018 -0800
- Upgrade projects and packages to netcoreapp3.0
- diff --git a/Directory.Build.targets b/Directory.Build.targets
- index 1f3d7b62bed..7e3f8df92e4 100644
- --- a/Directory.Build.targets
- +++ b/Directory.Build.targets
- @@ -1,6 +1,6 @@
- <Project>
- <PropertyGroup>
- - <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreApp30PackageVersion)</RuntimeFrameworkVersion>
- + <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion>
- <NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
- </PropertyGroup>
- </Project>
- diff --git a/build/dependencies.props b/build/dependencies.props
- index 926fa2f0049..777db422442 100644
- --- a/build/dependencies.props
- +++ b/build/dependencies.props
- @@ -3,22 +3,22 @@
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
- <PropertyGroup Label="Package Versions">
- - <InternalAspNetCoreSdkPackageVersion>3.0.0-alpha1-20181105.4</InternalAspNetCoreSdkPackageVersion>
- - <MicrosoftAspNetCoreDataProtectionPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreDataProtectionPackageVersion>
- - <MicrosoftAspNetCoreHttpAbstractionsPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreHttpAbstractionsPackageVersion>
- - <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
- - <MicrosoftAspNetCoreServerKestrelPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreServerKestrelPackageVersion>
- - <MicrosoftAspNetCoreTestHostPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreTestHostPackageVersion>
- - <MicrosoftExtensionsCachingAbstractionsPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsCachingAbstractionsPackageVersion>
- - <MicrosoftExtensionsCachingMemoryPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsCachingMemoryPackageVersion>
- - <MicrosoftExtensionsCachingSqlServerPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsCachingSqlServerPackageVersion>
- - <MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>
- - <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
- - <MicrosoftExtensionsLoggingAbstractionsPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
- - <MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsLoggingConsolePackageVersion>
- - <MicrosoftExtensionsLoggingTestingPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsLoggingTestingPackageVersion>
- - <MicrosoftExtensionsOptionsPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsOptionsPackageVersion>
- - <MicrosoftNETCoreApp30PackageVersion>3.0.0-preview1-26907-05</MicrosoftNETCoreApp30PackageVersion>
- + <InternalAspNetCoreSdkPackageVersion>3.0.0-build-20181116.1</InternalAspNetCoreSdkPackageVersion>
- + <MicrosoftAspNetCoreDataProtectionPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreDataProtectionPackageVersion>
- + <MicrosoftAspNetCoreHttpAbstractionsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHttpAbstractionsPackageVersion>
- + <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
- + <MicrosoftAspNetCoreServerKestrelPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreServerKestrelPackageVersion>
- + <MicrosoftAspNetCoreTestHostPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreTestHostPackageVersion>
- + <MicrosoftExtensionsCachingAbstractionsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsCachingAbstractionsPackageVersion>
- + <MicrosoftExtensionsCachingMemoryPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsCachingMemoryPackageVersion>
- + <MicrosoftExtensionsCachingSqlServerPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsCachingSqlServerPackageVersion>
- + <MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>
- + <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
- + <MicrosoftExtensionsLoggingAbstractionsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
- + <MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingConsolePackageVersion>
- + <MicrosoftExtensionsLoggingTestingPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingTestingPackageVersion>
- + <MicrosoftExtensionsOptionsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsOptionsPackageVersion>
- + <MicrosoftNETCoreAppPackageVersion>3.0.0-preview1-26907-05</MicrosoftNETCoreAppPackageVersion>
- <MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
- <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
- <XunitPackageVersion>2.3.1</XunitPackageVersion>
- diff --git a/korebuild-lock.txt b/korebuild-lock.txt
- index 649e2056731..c9da94b6c90 100644
- --- a/korebuild-lock.txt
- +++ b/korebuild-lock.txt
- @@ -1,2 +1,2 @@
- -version:3.0.0-alpha1-20181105.4
- -commithash:de32928719981f10bc9ef49b5dbc1c239f134b28
- +version:3.0.0-build-20181116.1
- +commithash:9be7d79a8f7e0668f66e584aca1e962f45975511
- diff --git a/src/Microsoft.AspNetCore.Session/Microsoft.AspNetCore.Session.csproj b/src/Microsoft.AspNetCore.Session/Microsoft.AspNetCore.Session.csproj
- index 3da00b90320..38f676a8d84 100644
- --- a/src/Microsoft.AspNetCore.Session/Microsoft.AspNetCore.Session.csproj
- +++ b/src/Microsoft.AspNetCore.Session/Microsoft.AspNetCore.Session.csproj
- @@ -2,7 +2,7 @@
-
- <PropertyGroup>
- <Description>ASP.NET Core session state middleware.</Description>
- - <TargetFramework>netstandard2.0</TargetFramework>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- <NoWarn>$(NoWarn);CS1591</NoWarn>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <GenerateDocumentationFile>true</GenerateDocumentationFile>
- diff --git a/test/Directory.Build.props b/test/Directory.Build.props
- index 1164d315356..4b89a431e7f 100644
- --- a/test/Directory.Build.props
- +++ b/test/Directory.Build.props
- @@ -1,13 +1,6 @@
- <Project>
- <Import Project="..\Directory.Build.props" />
-
- - <PropertyGroup>
- - <DeveloperBuildTestTfms>netcoreapp3.0</DeveloperBuildTestTfms>
- - <StandardTestTfms>$(DeveloperBuildTestTfms)</StandardTestTfms>
- -
- - <StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(StandardTestTfms);net461</StandardTestTfms>
- - </PropertyGroup>
- -
- <ItemGroup>
- <PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
- </ItemGroup>
- diff --git a/test/Microsoft.AspNetCore.Session.Tests/Microsoft.AspNetCore.Session.Tests.csproj b/test/Microsoft.AspNetCore.Session.Tests/Microsoft.AspNetCore.Session.Tests.csproj
- index 9dc11b9d2fa..2b2ee051196 100644
- --- a/test/Microsoft.AspNetCore.Session.Tests/Microsoft.AspNetCore.Session.Tests.csproj
- +++ b/test/Microsoft.AspNetCore.Session.Tests/Microsoft.AspNetCore.Session.Tests.csproj
- @@ -1,9 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- - <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
- - <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
- - <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- </PropertyGroup>
-
- <ItemGroup>
|