| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182 |
- commit e657e7d79aa11ced73a0a2e0f4d3fbbb609ca507
- Author: Nate McMaster <[email protected]>
- Date: Fri Nov 16 16:02:57 2018 -0800
- Upgrade projects and packages to netcoreapp3.0 (aspnet/JavaScriptServices#1793)
- diff --git a/Directory.Build.targets b/Directory.Build.targets
- index 9e749579e23..7e3f8df92e4 100644
- --- a/Directory.Build.targets
- +++ b/Directory.Build.targets
- @@ -1,9 +1,6 @@
- <Project>
- <PropertyGroup>
- - <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
- - <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreApp30PackageVersion)</RuntimeFrameworkVersion>
- + <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreAppPackageVersion)</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 7093dc0e7d4..40e13eba012 100644
- --- a/build/dependencies.props
- +++ b/build/dependencies.props
- @@ -3,25 +3,24 @@
- <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
- </PropertyGroup>
- <PropertyGroup Label="Package Versions">
- - <InternalAspNetCoreSdkPackageVersion>3.0.0-alpha1-20181031.6</InternalAspNetCoreSdkPackageVersion>
- - <MicrosoftAspNetCoreDiagnosticsPackageVersion>3.0.0-alpha1-10670</MicrosoftAspNetCoreDiagnosticsPackageVersion>
- - <MicrosoftAspNetCoreHostingAbstractionsPackageVersion>3.0.0-alpha1-10670</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
- - <MicrosoftAspNetCoreHostingPackageVersion>3.0.0-alpha1-10670</MicrosoftAspNetCoreHostingPackageVersion>
- - <MicrosoftAspNetCoreMvcPackageVersion>3.0.0-a-alpha1-react-razor-design-19157</MicrosoftAspNetCoreMvcPackageVersion>
- - <MicrosoftAspNetCoreMvcTagHelpersPackageVersion>3.0.0-a-alpha1-react-razor-design-19157</MicrosoftAspNetCoreMvcTagHelpersPackageVersion>
- - <MicrosoftAspNetCoreMvcViewFeaturesPackageVersion>3.0.0-a-alpha1-react-razor-design-19157</MicrosoftAspNetCoreMvcViewFeaturesPackageVersion>
- - <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.2.0-rtm-10670</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
- - <MicrosoftAspNetCoreServerKestrelPackageVersion>3.0.0-alpha1-10670</MicrosoftAspNetCoreServerKestrelPackageVersion>
- - <MicrosoftAspNetCoreStaticFilesPackageVersion>3.0.0-alpha1-10670</MicrosoftAspNetCoreStaticFilesPackageVersion>
- - <MicrosoftAspNetCoreWebSocketsPackageVersion>3.0.0-alpha1-10670</MicrosoftAspNetCoreWebSocketsPackageVersion>
- - <MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-alpha1-10670</MicrosoftExtensionsDependencyInjectionPackageVersion>
- - <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>3.0.0-alpha1-10670</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
- - <MicrosoftExtensionsLoggingAbstractionsPackageVersion>3.0.0-alpha1-10670</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
- - <MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-alpha1-10670</MicrosoftExtensionsLoggingConsolePackageVersion>
- - <MicrosoftExtensionsLoggingDebugPackageVersion>3.0.0-alpha1-10670</MicrosoftExtensionsLoggingDebugPackageVersion>
- - <MicrosoftNETCoreApp20PackageVersion>2.0.9</MicrosoftNETCoreApp20PackageVersion>
- - <MicrosoftNETCoreApp30PackageVersion>3.0.0-preview1-26907-05</MicrosoftNETCoreApp30PackageVersion>
- - <MicrosoftNETSdkRazorPackageVersion>3.0.0-a-alpha1-sdk-31823</MicrosoftNETSdkRazorPackageVersion>
- + <InternalAspNetCoreSdkPackageVersion>3.0.0-build-20181114.5</InternalAspNetCoreSdkPackageVersion>
- + <MicrosoftAspNetCoreDiagnosticsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreDiagnosticsPackageVersion>
- + <MicrosoftAspNetCoreHostingAbstractionsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
- + <MicrosoftAspNetCoreHostingPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHostingPackageVersion>
- + <MicrosoftAspNetCoreMvcPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreMvcPackageVersion>
- + <MicrosoftAspNetCoreMvcTagHelpersPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreMvcTagHelpersPackageVersion>
- + <MicrosoftAspNetCoreMvcViewFeaturesPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreMvcViewFeaturesPackageVersion>
- + <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
- + <MicrosoftAspNetCoreServerKestrelPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreServerKestrelPackageVersion>
- + <MicrosoftAspNetCoreStaticFilesPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreStaticFilesPackageVersion>
- + <MicrosoftAspNetCoreWebSocketsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreWebSocketsPackageVersion>
- + <MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsDependencyInjectionPackageVersion>
- + <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
- + <MicrosoftExtensionsLoggingAbstractionsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
- + <MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingConsolePackageVersion>
- + <MicrosoftExtensionsLoggingDebugPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingDebugPackageVersion>
- + <MicrosoftNETCoreAppPackageVersion>3.0.0-preview1-26907-05</MicrosoftNETCoreAppPackageVersion>
- + <MicrosoftNETSdkRazorPackageVersion>3.0.0-alpha1-10742</MicrosoftNETSdkRazorPackageVersion>
- <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
- <NewtonsoftJsonPackageVersion>11.0.2</NewtonsoftJsonPackageVersion>
- <SystemThreadingTasksDataflowPackageVersion>4.10.0-preview1-26907-04</SystemThreadingTasksDataflowPackageVersion>
- diff --git a/build/repo.props b/build/repo.props
- index 875ebde9913..4402da1d0d7 100644
- --- a/build/repo.props
- +++ b/build/repo.props
- @@ -8,7 +8,6 @@
- </PropertyGroup>
-
- <ItemGroup>
- - <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" />
- - <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp22PackageVersion)" />
- + <DotNetCoreRuntime Include="$(MicrosoftNETCoreAppPackageVersion)" />
- </ItemGroup>
- </Project>
- diff --git a/korebuild-lock.txt b/korebuild-lock.txt
- index 7b667dcfe33..73613543d0a 100644
- --- a/korebuild-lock.txt
- +++ b/korebuild-lock.txt
- @@ -1,2 +1,2 @@
- -version:3.0.0-alpha1-20181031.6
- -commithash:dc9e2ae2d294184c7c7da383e62c7c400099d1d0
- +version:3.0.0-build-20181114.5
- +commithash:880e9a204d4ee4a18dfd83c9fb05a192a28bca60
- diff --git a/samples/misc/LatencyTest/LatencyTest.csproj b/samples/misc/LatencyTest/LatencyTest.csproj
- index 596cecbe9d9..c146eb6a084 100644
- --- a/samples/misc/LatencyTest/LatencyTest.csproj
- +++ b/samples/misc/LatencyTest/LatencyTest.csproj
- @@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- - <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- <IsPackable>false</IsPackable>
- <OutputType>exe</OutputType>
- </PropertyGroup>
- diff --git a/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj b/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj
- index 0bf244e3188..874807b97bc 100644
- --- a/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj
- +++ b/samples/misc/NodeServicesExamples/NodeServicesExamples.csproj
- @@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk.Web">
-
- <PropertyGroup>
- - <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
- <IsPackable>false</IsPackable>
- </PropertyGroup>
- diff --git a/samples/misc/Webpack/Webpack.csproj b/samples/misc/Webpack/Webpack.csproj
- index 0bf244e3188..874807b97bc 100644
- --- a/samples/misc/Webpack/Webpack.csproj
- +++ b/samples/misc/Webpack/Webpack.csproj
- @@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk.Web">
-
- <PropertyGroup>
- - <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
- <IsPackable>false</IsPackable>
- </PropertyGroup>
- diff --git a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj
- index 9dab54a95d7..453eb629b24 100644
- --- a/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj
- +++ b/src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj
- @@ -2,7 +2,7 @@
-
- <PropertyGroup>
- <Description>Socket-based RPC for Microsoft.AspNetCore.NodeServices.</Description>
- - <TargetFramework>netstandard2.0</TargetFramework>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- </PropertyGroup>
-
- <ItemGroup>
- diff --git a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj
- index 2f46dee3cac..742aa3faa43 100644
- --- a/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj
- +++ b/src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj
- @@ -2,7 +2,7 @@
-
- <PropertyGroup>
- <Description>Invoke Node.js modules at runtime in ASP.NET Core applications.</Description>
- - <TargetFramework>netstandard2.0</TargetFramework>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- </PropertyGroup>
-
- <ItemGroup>
- diff --git a/src/Microsoft.AspNetCore.SpaServices.Extensions/Microsoft.AspNetCore.SpaServices.Extensions.csproj b/src/Microsoft.AspNetCore.SpaServices.Extensions/Microsoft.AspNetCore.SpaServices.Extensions.csproj
- index 4472217f8ff..e263efb93e6 100644
- --- a/src/Microsoft.AspNetCore.SpaServices.Extensions/Microsoft.AspNetCore.SpaServices.Extensions.csproj
- +++ b/src/Microsoft.AspNetCore.SpaServices.Extensions/Microsoft.AspNetCore.SpaServices.Extensions.csproj
- @@ -2,7 +2,7 @@
-
- <PropertyGroup>
- <Description>Helpers for building single-page applications on ASP.NET MVC Core.</Description>
- - <TargetFramework>netstandard2.0</TargetFramework>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- </PropertyGroup>
-
- <ItemGroup>
- diff --git a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj
- index 15cf81290ea..0b0cfe2f3ac 100644
- --- a/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj
- +++ b/src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj
- @@ -2,7 +2,7 @@
-
- <PropertyGroup>
- <Description>Helpers for building single-page applications on ASP.NET MVC Core.</Description>
- - <TargetFramework>netstandard2.0</TargetFramework>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- </PropertyGroup>
-
- <ItemGroup>
|