From 969fb9bf48661cc5fc97ab80cd7e627f7fc7b280 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 30 Oct 2018 10:41:24 -0700 Subject: [PATCH] Update projects in src/Framework/ to netcoreapp3.0 --- .../pkg/Microsoft.AspNetCore.All.pkgproj | 3 +-- .../Microsoft.AspNetCore.All.props | 0 .../Microsoft.AspNetCore.All.targets | 4 ++-- .../pkg/lib/{netcoreapp2.2 => netcoreapp3.0}/_._ | 0 .../src/Microsoft.AspNetCore.All.shfxproj | 2 +- .../Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.props | 1 - .../Microsoft.AspNetCore.App.props | 0 .../Microsoft.AspNetCore.App.targets | 4 ++-- .../pkg/lib/{netcoreapp2.2 => netcoreapp3.0}/_._ | 0 .../src/Microsoft.AspNetCore.App.shfxproj | 2 +- 10 files changed, 7 insertions(+), 9 deletions(-) rename src/Framework/Microsoft.AspNetCore.All/pkg/build/{netcoreapp2.2 => netcoreapp3.0}/Microsoft.AspNetCore.All.props (100%) rename src/Framework/Microsoft.AspNetCore.All/pkg/build/{netcoreapp2.2 => netcoreapp3.0}/Microsoft.AspNetCore.All.targets (81%) rename src/Framework/Microsoft.AspNetCore.All/pkg/lib/{netcoreapp2.2 => netcoreapp3.0}/_._ (100%) rename src/Framework/Microsoft.AspNetCore.App/pkg/build/{netcoreapp2.2 => netcoreapp3.0}/Microsoft.AspNetCore.App.props (100%) rename src/Framework/Microsoft.AspNetCore.App/pkg/build/{netcoreapp2.2 => netcoreapp3.0}/Microsoft.AspNetCore.App.targets (81%) rename src/Framework/Microsoft.AspNetCore.App/pkg/lib/{netcoreapp2.2 => netcoreapp3.0}/_._ (100%) diff --git a/src/Framework/Microsoft.AspNetCore.All/pkg/Microsoft.AspNetCore.All.pkgproj b/src/Framework/Microsoft.AspNetCore.All/pkg/Microsoft.AspNetCore.All.pkgproj index 7f4153e2b6..fbf68c27fa 100644 --- a/src/Framework/Microsoft.AspNetCore.All/pkg/Microsoft.AspNetCore.All.pkgproj +++ b/src/Framework/Microsoft.AspNetCore.All/pkg/Microsoft.AspNetCore.All.pkgproj @@ -1,7 +1,7 @@ - netcoreapp2.2 + netcoreapp3.0 aspnetcore Provides a default set of APIs for building an ASP.NET Core application, and also includes API for third-party integrations with ASP.NET Core. @@ -38,7 +38,6 @@ This package requires the ASP.NET Core runtime. This runtime is installed by the - diff --git a/src/Framework/Microsoft.AspNetCore.All/pkg/build/netcoreapp2.2/Microsoft.AspNetCore.All.props b/src/Framework/Microsoft.AspNetCore.All/pkg/build/netcoreapp3.0/Microsoft.AspNetCore.All.props similarity index 100% rename from src/Framework/Microsoft.AspNetCore.All/pkg/build/netcoreapp2.2/Microsoft.AspNetCore.All.props rename to src/Framework/Microsoft.AspNetCore.All/pkg/build/netcoreapp3.0/Microsoft.AspNetCore.All.props diff --git a/src/Framework/Microsoft.AspNetCore.All/pkg/build/netcoreapp2.2/Microsoft.AspNetCore.All.targets b/src/Framework/Microsoft.AspNetCore.All/pkg/build/netcoreapp3.0/Microsoft.AspNetCore.All.targets similarity index 81% rename from src/Framework/Microsoft.AspNetCore.All/pkg/build/netcoreapp2.2/Microsoft.AspNetCore.All.targets rename to src/Framework/Microsoft.AspNetCore.All/pkg/build/netcoreapp3.0/Microsoft.AspNetCore.All.targets index ff8736382c..c4f1f46390 100644 --- a/src/Framework/Microsoft.AspNetCore.All/pkg/build/netcoreapp2.2/Microsoft.AspNetCore.All.targets +++ b/src/Framework/Microsoft.AspNetCore.All/pkg/build/netcoreapp3.0/Microsoft.AspNetCore.All.targets @@ -12,7 +12,7 @@ + Text="This version of Microsoft.AspNetCore.All is only compatible with the netcoreapp3.0 target framework. Please target netcoreapp3.0 or choose a version of Microsoft.AspNetCore.All compatible with $(TargetFramework)." + Condition="'$(TargetFramework)' != 'netcoreapp3.0'"/> diff --git a/src/Framework/Microsoft.AspNetCore.All/pkg/lib/netcoreapp2.2/_._ b/src/Framework/Microsoft.AspNetCore.All/pkg/lib/netcoreapp3.0/_._ similarity index 100% rename from src/Framework/Microsoft.AspNetCore.All/pkg/lib/netcoreapp2.2/_._ rename to src/Framework/Microsoft.AspNetCore.All/pkg/lib/netcoreapp3.0/_._ diff --git a/src/Framework/Microsoft.AspNetCore.All/src/Microsoft.AspNetCore.All.shfxproj b/src/Framework/Microsoft.AspNetCore.All/src/Microsoft.AspNetCore.All.shfxproj index 63dfa9f68a..1912b3f498 100644 --- a/src/Framework/Microsoft.AspNetCore.All/src/Microsoft.AspNetCore.All.shfxproj +++ b/src/Framework/Microsoft.AspNetCore.All/src/Microsoft.AspNetCore.All.shfxproj @@ -1,7 +1,7 @@ - netcoreapp2.2 + netcoreapp3.0 Microsoft.AspNetCore.App $(MicrosoftNETCoreAppPackageVersion) diff --git a/src/Framework/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.props b/src/Framework/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.props index d0dd452557..f943c3db21 100644 --- a/src/Framework/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.props +++ b/src/Framework/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.props @@ -62,7 +62,6 @@ - diff --git a/src/Framework/Microsoft.AspNetCore.App/pkg/build/netcoreapp2.2/Microsoft.AspNetCore.App.props b/src/Framework/Microsoft.AspNetCore.App/pkg/build/netcoreapp3.0/Microsoft.AspNetCore.App.props similarity index 100% rename from src/Framework/Microsoft.AspNetCore.App/pkg/build/netcoreapp2.2/Microsoft.AspNetCore.App.props rename to src/Framework/Microsoft.AspNetCore.App/pkg/build/netcoreapp3.0/Microsoft.AspNetCore.App.props diff --git a/src/Framework/Microsoft.AspNetCore.App/pkg/build/netcoreapp2.2/Microsoft.AspNetCore.App.targets b/src/Framework/Microsoft.AspNetCore.App/pkg/build/netcoreapp3.0/Microsoft.AspNetCore.App.targets similarity index 81% rename from src/Framework/Microsoft.AspNetCore.App/pkg/build/netcoreapp2.2/Microsoft.AspNetCore.App.targets rename to src/Framework/Microsoft.AspNetCore.App/pkg/build/netcoreapp3.0/Microsoft.AspNetCore.App.targets index 2ba815e5da..2e222008cc 100644 --- a/src/Framework/Microsoft.AspNetCore.App/pkg/build/netcoreapp2.2/Microsoft.AspNetCore.App.targets +++ b/src/Framework/Microsoft.AspNetCore.App/pkg/build/netcoreapp3.0/Microsoft.AspNetCore.App.targets @@ -12,7 +12,7 @@ + Text="This version of Microsoft.AspNetCore.App is only compatible with the netcoreapp3.0 target framework. Please target netcoreapp3.0 or choose a version of Microsoft.AspNetCore.App compatible with $(TargetFramework)." + Condition="'$(TargetFramework)' != 'netcoreapp3.0'"/> diff --git a/src/Framework/Microsoft.AspNetCore.App/pkg/lib/netcoreapp2.2/_._ b/src/Framework/Microsoft.AspNetCore.App/pkg/lib/netcoreapp3.0/_._ similarity index 100% rename from src/Framework/Microsoft.AspNetCore.App/pkg/lib/netcoreapp2.2/_._ rename to src/Framework/Microsoft.AspNetCore.App/pkg/lib/netcoreapp3.0/_._ diff --git a/src/Framework/Microsoft.AspNetCore.App/src/Microsoft.AspNetCore.App.shfxproj b/src/Framework/Microsoft.AspNetCore.App/src/Microsoft.AspNetCore.App.shfxproj index f0e2af18d9..e590cce6ce 100644 --- a/src/Framework/Microsoft.AspNetCore.App/src/Microsoft.AspNetCore.App.shfxproj +++ b/src/Framework/Microsoft.AspNetCore.App/src/Microsoft.AspNetCore.App.shfxproj @@ -1,7 +1,7 @@ - netcoreapp2.2 + netcoreapp3.0 Microsoft.NETCore.App $(MicrosoftNETCoreAppPackageVersion)