Session 1.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116
  1. commit abbdfb72ef54a77623c01d517c85eb8b28c70bc0
  2. Author: Nate McMaster <[email protected]>
  3. Date: Mon Nov 19 09:55:23 2018 -0800
  4. Upgrade projects and packages to netcoreapp3.0
  5. diff --git a/Directory.Build.targets b/Directory.Build.targets
  6. index 1f3d7b62bed..7e3f8df92e4 100644
  7. --- a/Directory.Build.targets
  8. +++ b/Directory.Build.targets
  9. @@ -1,6 +1,6 @@
  10. <Project>
  11. <PropertyGroup>
  12. - <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreApp30PackageVersion)</RuntimeFrameworkVersion>
  13. + <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion>
  14. <NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
  15. </PropertyGroup>
  16. </Project>
  17. diff --git a/build/dependencies.props b/build/dependencies.props
  18. index 926fa2f0049..777db422442 100644
  19. --- a/build/dependencies.props
  20. +++ b/build/dependencies.props
  21. @@ -3,22 +3,22 @@
  22. <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
  23. </PropertyGroup>
  24. <PropertyGroup Label="Package Versions">
  25. - <InternalAspNetCoreSdkPackageVersion>3.0.0-alpha1-20181105.4</InternalAspNetCoreSdkPackageVersion>
  26. - <MicrosoftAspNetCoreDataProtectionPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreDataProtectionPackageVersion>
  27. - <MicrosoftAspNetCoreHttpAbstractionsPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreHttpAbstractionsPackageVersion>
  28. - <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
  29. - <MicrosoftAspNetCoreServerKestrelPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreServerKestrelPackageVersion>
  30. - <MicrosoftAspNetCoreTestHostPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreTestHostPackageVersion>
  31. - <MicrosoftExtensionsCachingAbstractionsPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsCachingAbstractionsPackageVersion>
  32. - <MicrosoftExtensionsCachingMemoryPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsCachingMemoryPackageVersion>
  33. - <MicrosoftExtensionsCachingSqlServerPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsCachingSqlServerPackageVersion>
  34. - <MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>
  35. - <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
  36. - <MicrosoftExtensionsLoggingAbstractionsPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
  37. - <MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsLoggingConsolePackageVersion>
  38. - <MicrosoftExtensionsLoggingTestingPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsLoggingTestingPackageVersion>
  39. - <MicrosoftExtensionsOptionsPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsOptionsPackageVersion>
  40. - <MicrosoftNETCoreApp30PackageVersion>3.0.0-preview1-26907-05</MicrosoftNETCoreApp30PackageVersion>
  41. + <InternalAspNetCoreSdkPackageVersion>3.0.0-build-20181116.1</InternalAspNetCoreSdkPackageVersion>
  42. + <MicrosoftAspNetCoreDataProtectionPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreDataProtectionPackageVersion>
  43. + <MicrosoftAspNetCoreHttpAbstractionsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHttpAbstractionsPackageVersion>
  44. + <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
  45. + <MicrosoftAspNetCoreServerKestrelPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreServerKestrelPackageVersion>
  46. + <MicrosoftAspNetCoreTestHostPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreTestHostPackageVersion>
  47. + <MicrosoftExtensionsCachingAbstractionsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsCachingAbstractionsPackageVersion>
  48. + <MicrosoftExtensionsCachingMemoryPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsCachingMemoryPackageVersion>
  49. + <MicrosoftExtensionsCachingSqlServerPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsCachingSqlServerPackageVersion>
  50. + <MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>
  51. + <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
  52. + <MicrosoftExtensionsLoggingAbstractionsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
  53. + <MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingConsolePackageVersion>
  54. + <MicrosoftExtensionsLoggingTestingPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingTestingPackageVersion>
  55. + <MicrosoftExtensionsOptionsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsOptionsPackageVersion>
  56. + <MicrosoftNETCoreAppPackageVersion>3.0.0-preview1-26907-05</MicrosoftNETCoreAppPackageVersion>
  57. <MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
  58. <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
  59. <XunitPackageVersion>2.3.1</XunitPackageVersion>
  60. diff --git a/korebuild-lock.txt b/korebuild-lock.txt
  61. index 649e2056731..c9da94b6c90 100644
  62. --- a/korebuild-lock.txt
  63. +++ b/korebuild-lock.txt
  64. @@ -1,2 +1,2 @@
  65. -version:3.0.0-alpha1-20181105.4
  66. -commithash:de32928719981f10bc9ef49b5dbc1c239f134b28
  67. +version:3.0.0-build-20181116.1
  68. +commithash:9be7d79a8f7e0668f66e584aca1e962f45975511
  69. diff --git a/src/Microsoft.AspNetCore.Session/Microsoft.AspNetCore.Session.csproj b/src/Microsoft.AspNetCore.Session/Microsoft.AspNetCore.Session.csproj
  70. index 3da00b90320..38f676a8d84 100644
  71. --- a/src/Microsoft.AspNetCore.Session/Microsoft.AspNetCore.Session.csproj
  72. +++ b/src/Microsoft.AspNetCore.Session/Microsoft.AspNetCore.Session.csproj
  73. @@ -2,7 +2,7 @@
  74. <PropertyGroup>
  75. <Description>ASP.NET Core session state middleware.</Description>
  76. - <TargetFramework>netstandard2.0</TargetFramework>
  77. + <TargetFramework>netcoreapp3.0</TargetFramework>
  78. <NoWarn>$(NoWarn);CS1591</NoWarn>
  79. <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  80. <GenerateDocumentationFile>true</GenerateDocumentationFile>
  81. diff --git a/test/Directory.Build.props b/test/Directory.Build.props
  82. index 1164d315356..4b89a431e7f 100644
  83. --- a/test/Directory.Build.props
  84. +++ b/test/Directory.Build.props
  85. @@ -1,13 +1,6 @@
  86. <Project>
  87. <Import Project="..\Directory.Build.props" />
  88. - <PropertyGroup>
  89. - <DeveloperBuildTestTfms>netcoreapp3.0</DeveloperBuildTestTfms>
  90. - <StandardTestTfms>$(DeveloperBuildTestTfms)</StandardTestTfms>
  91. -
  92. - <StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(StandardTestTfms);net461</StandardTestTfms>
  93. - </PropertyGroup>
  94. -
  95. <ItemGroup>
  96. <PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
  97. </ItemGroup>
  98. diff --git a/test/Microsoft.AspNetCore.Session.Tests/Microsoft.AspNetCore.Session.Tests.csproj b/test/Microsoft.AspNetCore.Session.Tests/Microsoft.AspNetCore.Session.Tests.csproj
  99. index 9dc11b9d2fa..2b2ee051196 100644
  100. --- a/test/Microsoft.AspNetCore.Session.Tests/Microsoft.AspNetCore.Session.Tests.csproj
  101. +++ b/test/Microsoft.AspNetCore.Session.Tests/Microsoft.AspNetCore.Session.Tests.csproj
  102. @@ -1,9 +1,7 @@
  103. <Project Sdk="Microsoft.NET.Sdk">
  104. <PropertyGroup>
  105. - <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
  106. - <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
  107. - <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
  108. + <TargetFramework>netcoreapp3.0</TargetFramework>
  109. </PropertyGroup>
  110. <ItemGroup>