JavaScriptServices 782 B

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182
  1. commit e657e7d79aa11ced73a0a2e0f4d3fbbb609ca507
  2. Author: Nate McMaster <[email protected]>
  3. Date: Fri Nov 16 16:02:57 2018 -0800
  4. Upgrade projects and packages to netcoreapp3.0 (aspnet/JavaScriptServices#1793)
  5. diff --git a/Directory.Build.targets b/Directory.Build.targets
  6. index 9e749579e23..7e3f8df92e4 100644
  7. --- a/Directory.Build.targets
  8. +++ b/Directory.Build.targets
  9. @@ -1,9 +1,6 @@
  10. <Project>
  11. <PropertyGroup>
  12. - <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
  13. - <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreApp30PackageVersion)</RuntimeFrameworkVersion>
  14. + <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion>
  15. <NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
  16. - <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
  17. - <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
  18. </PropertyGroup>
  19. </Project>
  20. diff --git a/build/dependencies.props b/build/dependencies.props
  21. index 7093dc0e7d4..40e13eba012 100644
  22. --- a/build/dependencies.props
  23. +++ b/build/dependencies.props
  24. @@ -3,25 +3,24 @@
  25. <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
  26. </PropertyGroup>
  27. <PropertyGroup Label="Package Versions">
  28. - <InternalAspNetCoreSdkPackageVersion>3.0.0-alpha1-20181031.6</InternalAspNetCoreSdkPackageVersion>
  29. - <MicrosoftAspNetCoreDiagnosticsPackageVersion>3.0.0-alpha1-10670</MicrosoftAspNetCoreDiagnosticsPackageVersion>
  30. - <MicrosoftAspNetCoreHostingAbstractionsPackageVersion>3.0.0-alpha1-10670</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
  31. - <MicrosoftAspNetCoreHostingPackageVersion>3.0.0-alpha1-10670</MicrosoftAspNetCoreHostingPackageVersion>
  32. - <MicrosoftAspNetCoreMvcPackageVersion>3.0.0-a-alpha1-react-razor-design-19157</MicrosoftAspNetCoreMvcPackageVersion>
  33. - <MicrosoftAspNetCoreMvcTagHelpersPackageVersion>3.0.0-a-alpha1-react-razor-design-19157</MicrosoftAspNetCoreMvcTagHelpersPackageVersion>
  34. - <MicrosoftAspNetCoreMvcViewFeaturesPackageVersion>3.0.0-a-alpha1-react-razor-design-19157</MicrosoftAspNetCoreMvcViewFeaturesPackageVersion>
  35. - <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.2.0-rtm-10670</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
  36. - <MicrosoftAspNetCoreServerKestrelPackageVersion>3.0.0-alpha1-10670</MicrosoftAspNetCoreServerKestrelPackageVersion>
  37. - <MicrosoftAspNetCoreStaticFilesPackageVersion>3.0.0-alpha1-10670</MicrosoftAspNetCoreStaticFilesPackageVersion>
  38. - <MicrosoftAspNetCoreWebSocketsPackageVersion>3.0.0-alpha1-10670</MicrosoftAspNetCoreWebSocketsPackageVersion>
  39. - <MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-alpha1-10670</MicrosoftExtensionsDependencyInjectionPackageVersion>
  40. - <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>3.0.0-alpha1-10670</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
  41. - <MicrosoftExtensionsLoggingAbstractionsPackageVersion>3.0.0-alpha1-10670</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
  42. - <MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-alpha1-10670</MicrosoftExtensionsLoggingConsolePackageVersion>
  43. - <MicrosoftExtensionsLoggingDebugPackageVersion>3.0.0-alpha1-10670</MicrosoftExtensionsLoggingDebugPackageVersion>
  44. - <MicrosoftNETCoreApp20PackageVersion>2.0.9</MicrosoftNETCoreApp20PackageVersion>
  45. - <MicrosoftNETCoreApp30PackageVersion>3.0.0-preview1-26907-05</MicrosoftNETCoreApp30PackageVersion>
  46. - <MicrosoftNETSdkRazorPackageVersion>3.0.0-a-alpha1-sdk-31823</MicrosoftNETSdkRazorPackageVersion>
  47. + <InternalAspNetCoreSdkPackageVersion>3.0.0-build-20181114.5</InternalAspNetCoreSdkPackageVersion>
  48. + <MicrosoftAspNetCoreDiagnosticsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreDiagnosticsPackageVersion>
  49. + <MicrosoftAspNetCoreHostingAbstractionsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
  50. + <MicrosoftAspNetCoreHostingPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHostingPackageVersion>
  51. + <MicrosoftAspNetCoreMvcPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreMvcPackageVersion>
  52. + <MicrosoftAspNetCoreMvcTagHelpersPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreMvcTagHelpersPackageVersion>
  53. + <MicrosoftAspNetCoreMvcViewFeaturesPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreMvcViewFeaturesPackageVersion>
  54. + <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
  55. + <MicrosoftAspNetCoreServerKestrelPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreServerKestrelPackageVersion>
  56. + <MicrosoftAspNetCoreStaticFilesPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreStaticFilesPackageVersion>
  57. + <MicrosoftAspNetCoreWebSocketsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreWebSocketsPackageVersion>
  58. + <MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsDependencyInjectionPackageVersion>
  59. + <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
  60. + <MicrosoftExtensionsLoggingAbstractionsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
  61. + <MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingConsolePackageVersion>
  62. + <MicrosoftExtensionsLoggingDebugPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingDebugPackageVersion>
  63. + <MicrosoftNETCoreAppPackageVersion>3.0.0-preview1-26907-05</MicrosoftNETCoreAppPackageVersion>
  64. + <MicrosoftNETSdkRazorPackageVersion>3.0.0-alpha1-10742</MicrosoftNETSdkRazorPackageVersion>
  65. <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
  66. <NewtonsoftJsonPackageVersion>11.0.2</NewtonsoftJsonPackageVersion>
  67. <SystemThreadingTasksDataflowPackageVersion>4.10.0-preview1-26907-04</SystemThreadingTasksDataflowPackageVersion>
  68. diff --git a/build/repo.props b/build/repo.props
  69. index 875ebde9913..4402da1d0d7 100644
  70. --- a/build/repo.props
  71. +++ b/build/repo.props
  72. @@ -8,7 +8,6 @@
  73. </PropertyGroup>
  74. <ItemGroup>
  75. - <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" />
  76. - <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp22PackageVersion)" />
  77. + <DotNetCoreRuntime Include="$(MicrosoftNETCoreAppPackageVersion)" />
  78. </ItemGroup>
  79. </Project>
  80. diff --git a/korebuild-lock.txt b/korebuild-lock.txt
  81. index 7b667dcfe33..73613543d0a 100644
  82. --- a/korebuild-lock.txt
  83. +++ b/korebuild-lock.txt
  84. @@ -1,2 +1,2 @@
  85. -version:3.0.0-alpha1-20181031.6
  86. -commithash:dc9e2ae2d294184c7c7da383e62c7c400099d1d0
  87. +version:3.0.0-build-20181114.5
  88. +commithash:880e9a204d4ee4a18dfd83c9fb05a192a28bca60
  89. diff --git a/samples/misc/LatencyTest/LatencyTest.csproj b/samples/misc/LatencyTest/LatencyTest.csproj
  90. index 596cecbe9d9..c146eb6a084 100644
  91. --- a/samples/misc/LatencyTest/LatencyTest.csproj
  92. +++ b/samples/misc/LatencyTest/LatencyTest.csproj
  93. @@ -1,7 +1,7 @@
  94. <Project Sdk="Microsoft.NET.Sdk">
  95. <PropertyGroup>
  96. - <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
  97. + <TargetFramework>netcoreapp3.0</TargetFramework>
  98. <IsPackable>false</IsPackable>
  99. <OutputType>exe</OutputType>
  100. </PropertyGroup>
  101. diff --git a/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj b/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj
  102. index 0bf244e3188..874807b97bc 100644
  103. --- a/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj
  104. +++ b/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj
  105. @@ -1,7 +1,7 @@
  106. <Project Sdk="Microsoft.NET.Sdk.Web">
  107. <PropertyGroup>
  108. - <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
  109. + <TargetFramework>netcoreapp3.0</TargetFramework>
  110. <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
  111. <IsPackable>false</IsPackable>
  112. </PropertyGroup>
  113. diff --git a/samples/misc/Webpack/Webpack.csproj b/samples/misc/Webpack/Webpack.csproj
  114. index 0bf244e3188..874807b97bc 100644
  115. --- a/samples/misc/Webpack/Webpack.csproj
  116. +++ b/samples/misc/Webpack/Webpack.csproj
  117. @@ -1,7 +1,7 @@
  118. <Project Sdk="Microsoft.NET.Sdk.Web">
  119. <PropertyGroup>
  120. - <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
  121. + <TargetFramework>netcoreapp3.0</TargetFramework>
  122. <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
  123. <IsPackable>false</IsPackable>
  124. </PropertyGroup>
  125. diff --git a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj
  126. index 9dab54a95d7..453eb629b24 100644
  127. --- a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj
  128. +++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj
  129. @@ -2,7 +2,7 @@
  130. <PropertyGroup>
  131. <Description>Socket-based RPC for Microsoft.AspNetCore.NodeServices.</Description>
  132. - <TargetFramework>netstandard2.0</TargetFramework>
  133. + <TargetFramework>netcoreapp3.0</TargetFramework>
  134. </PropertyGroup>
  135. <ItemGroup>
  136. diff --git a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj
  137. index 2f46dee3cac..742aa3faa43 100644
  138. --- a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj
  139. +++ b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj
  140. @@ -2,7 +2,7 @@
  141. <PropertyGroup>
  142. <Description>Invoke Node.js modules at runtime in ASP.NET Core applications.</Description>
  143. - <TargetFramework>netstandard2.0</TargetFramework>
  144. + <TargetFramework>netcoreapp3.0</TargetFramework>
  145. </PropertyGroup>
  146. <ItemGroup>
  147. diff --git a/src/Microsoft.AspNetCore.SpaServices.Extensions/Microsoft.AspNetCore.SpaServices.Extensions.csproj b/src/Microsoft.AspNetCore.SpaServices.Extensions/Microsoft.AspNetCore.SpaServices.Extensions.csproj
  148. index 4472217f8ff..e263efb93e6 100644
  149. --- a/src/Microsoft.AspNetCore.SpaServices.Extensions/Microsoft.AspNetCore.SpaServices.Extensions.csproj
  150. +++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/Microsoft.AspNetCore.SpaServices.Extensions.csproj
  151. @@ -2,7 +2,7 @@
  152. <PropertyGroup>
  153. <Description>Helpers for building single-page applications on ASP.NET MVC Core.</Description>
  154. - <TargetFramework>netstandard2.0</TargetFramework>
  155. + <TargetFramework>netcoreapp3.0</TargetFramework>
  156. </PropertyGroup>
  157. <ItemGroup>
  158. diff --git a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj
  159. index 15cf81290ea..0b0cfe2f3ac 100644
  160. --- a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj
  161. +++ b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj
  162. @@ -2,7 +2,7 @@
  163. <PropertyGroup>
  164. <Description>Helpers for building single-page applications on ASP.NET MVC Core.</Description>
  165. - <TargetFramework>netstandard2.0</TargetFramework>
  166. + <TargetFramework>netcoreapp3.0</TargetFramework>
  167. </PropertyGroup>
  168. <ItemGroup>