ResponseCaching 254 B

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117
  1. commit 94d78e22c8a568be5813a142d7862139b7e0856e
  2. Author: Ryan Brandenburg <[email protected]>
  3. Date: Mon May 7 15:15:03 2018 -0700
  4. Upgrade to netcoreapp22
  5. diff --git a/Directory.Build.targets b/Directory.Build.targets
  6. index 53b3f6e1dab..78626b773ea 100644
  7. --- a/Directory.Build.targets
  8. +++ b/Directory.Build.targets
  9. @@ -1,7 +1,10 @@
  10. -<Project>
  11. +<Project>
  12. <PropertyGroup>
  13. <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
  14. <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
  15. + <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">$(MicrosoftNETCoreApp22PackageVersion)</RuntimeFrameworkVersion>
  16. <NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
  17. + <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
  18. + <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
  19. </PropertyGroup>
  20. </Project>
  21. diff --git a/build/dependencies.props b/build/dependencies.props
  22. index 0a7c26a0ebb..d8786401044 100644
  23. --- a/build/dependencies.props
  24. +++ b/build/dependencies.props
  25. @@ -1,20 +1,21 @@
  26. -<Project>
  27. +<Project>
  28. <PropertyGroup>
  29. <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
  30. </PropertyGroup>
  31. <PropertyGroup Label="Package Versions">
  32. - <InternalAspNetCoreSdkPackageVersion>2.2.0-preview1-17047</InternalAspNetCoreSdkPackageVersion>
  33. - <MicrosoftAspNetCoreHttpExtensionsPackageVersion>2.2.0-preview1-34135</MicrosoftAspNetCoreHttpExtensionsPackageVersion>
  34. - <MicrosoftAspNetCoreHttpPackageVersion>2.2.0-preview1-34135</MicrosoftAspNetCoreHttpPackageVersion>
  35. - <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.2.0-preview1-34135</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
  36. - <MicrosoftAspNetCoreServerKestrelPackageVersion>2.2.0-preview1-34135</MicrosoftAspNetCoreServerKestrelPackageVersion>
  37. - <MicrosoftAspNetCoreTestHostPackageVersion>2.2.0-preview1-34135</MicrosoftAspNetCoreTestHostPackageVersion>
  38. - <MicrosoftExtensionsCachingMemoryPackageVersion>2.2.0-preview1-34135</MicrosoftExtensionsCachingMemoryPackageVersion>
  39. - <MicrosoftExtensionsLoggingAbstractionsPackageVersion>2.2.0-preview1-34135</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
  40. - <MicrosoftExtensionsLoggingTestingPackageVersion>2.2.0-preview1-34135</MicrosoftExtensionsLoggingTestingPackageVersion>
  41. - <MicrosoftExtensionsPrimitivesPackageVersion>2.2.0-preview1-34135</MicrosoftExtensionsPrimitivesPackageVersion>
  42. + <InternalAspNetCoreSdkPackageVersion>2.2.0-preview1-17048</InternalAspNetCoreSdkPackageVersion>
  43. + <MicrosoftAspNetCoreHttpExtensionsPackageVersion>2.2.0-preview1-34140</MicrosoftAspNetCoreHttpExtensionsPackageVersion>
  44. + <MicrosoftAspNetCoreHttpPackageVersion>2.2.0-preview1-34140</MicrosoftAspNetCoreHttpPackageVersion>
  45. + <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.2.0-preview1-34140</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
  46. + <MicrosoftAspNetCoreServerKestrelPackageVersion>2.2.0-preview1-34140</MicrosoftAspNetCoreServerKestrelPackageVersion>
  47. + <MicrosoftAspNetCoreTestHostPackageVersion>2.2.0-preview1-34140</MicrosoftAspNetCoreTestHostPackageVersion>
  48. + <MicrosoftExtensionsCachingMemoryPackageVersion>2.2.0-preview1-34140</MicrosoftExtensionsCachingMemoryPackageVersion>
  49. + <MicrosoftExtensionsLoggingAbstractionsPackageVersion>2.2.0-preview1-34140</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
  50. + <MicrosoftExtensionsLoggingTestingPackageVersion>2.2.0-preview1-34140</MicrosoftExtensionsLoggingTestingPackageVersion>
  51. + <MicrosoftExtensionsPrimitivesPackageVersion>2.2.0-preview1-34140</MicrosoftExtensionsPrimitivesPackageVersion>
  52. <MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
  53. <MicrosoftNETCoreApp21PackageVersion>2.2.0-preview1-26424-04</MicrosoftNETCoreApp21PackageVersion>
  54. + <MicrosoftNETCoreApp22PackageVersion>2.2.0-preview1-26502-01</MicrosoftNETCoreApp22PackageVersion>
  55. <MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
  56. <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
  57. <XunitPackageVersion>2.3.1</XunitPackageVersion>
  58. diff --git a/build/repo.props b/build/repo.props
  59. index 78b0ce58790..17a98ac7e7d 100644
  60. --- a/build/repo.props
  61. +++ b/build/repo.props
  62. @@ -1,4 +1,4 @@
  63. -<Project>
  64. +<Project>
  65. <Import Project="dependencies.props" />
  66. <PropertyGroup>
  67. @@ -10,5 +10,6 @@
  68. <ItemGroup>
  69. <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" />
  70. <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)" />
  71. + <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp22PackageVersion)" />
  72. </ItemGroup>
  73. </Project>
  74. diff --git a/korebuild-lock.txt b/korebuild-lock.txt
  75. index a16d4b9ee44..2573a039953 100644
  76. --- a/korebuild-lock.txt
  77. +++ b/korebuild-lock.txt
  78. @@ -1,2 +1,2 @@
  79. -version:2.2.0-preview1-17047
  80. -commithash:e1957b52ddc8b62bd39c5c400322fccb5364624c
  81. +version:2.2.0-preview1-17048
  82. +commithash:de14a0ee5fb48508ee8a29c14280a2928f8dabf8
  83. diff --git a/samples/ResponseCachingSample/ResponseCachingSample.csproj b/samples/ResponseCachingSample/ResponseCachingSample.csproj
  84. index 3739141e06d..557625467b2 100644
  85. --- a/samples/ResponseCachingSample/ResponseCachingSample.csproj
  86. +++ b/samples/ResponseCachingSample/ResponseCachingSample.csproj
  87. @@ -1,7 +1,7 @@
  88. -<Project Sdk="Microsoft.NET.Sdk.Web">
  89. +<Project Sdk="Microsoft.NET.Sdk.Web">
  90. <PropertyGroup>
  91. - <TargetFramework>netcoreapp2.1</TargetFramework>
  92. + <TargetFramework>netcoreapp2.2</TargetFramework>
  93. </PropertyGroup>
  94. <ItemGroup>
  95. diff --git a/test/Directory.Build.props b/test/Directory.Build.props
  96. index 270e1fa2097..3a373e2cb80 100644
  97. --- a/test/Directory.Build.props
  98. +++ b/test/Directory.Build.props
  99. @@ -1,10 +1,10 @@
  100. -<Project>
  101. +<Project>
  102. <Import Project="..\Directory.Build.props" />
  103. <PropertyGroup>
  104. - <DeveloperBuildTestTfms>netcoreapp2.1</DeveloperBuildTestTfms>
  105. + <DeveloperBuildTestTfms>netcoreapp2.2</DeveloperBuildTestTfms>
  106. <StandardTestTfms>$(DeveloperBuildTestTfms)</StandardTestTfms>
  107. - <StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' ">netcoreapp2.1;netcoreapp2.0</StandardTestTfms>
  108. +
  109. <StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(StandardTestTfms);net461</StandardTestTfms>
  110. </PropertyGroup>