From d6f15759fd63bf73fcf6b14ae9288b31a3c4776d Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 2 May 2018 08:49:03 -0700 Subject: [PATCH] Add property to allow the SDK to disable shared framework trimming (#1130) The MicrosoftNETPlatformLibrary property instructs the .NET Core SDK to treat a particular package as the shared framework platform. This affects how the SDK will trim references and publish output, determines how the runtimeconfig files are generated, and may affect how optimizations are preformed by other tools. In some installations of .NET Core, the ASP.NET Core shared framework is not available. This change adds properties to let the SDK determine on which platforms ASP.NET Core is enabled. --- .../Microsoft.AspNetCore.All.props | 20 ++++++++++++++++--- .../Microsoft.AspNetCore.All.targets | 11 ++++++++++ .../Microsoft.AspNetCore.App.props | 14 ++++++++++--- .../Microsoft.AspNetCore.App.targets | 11 ++++++++++ 4 files changed, 50 insertions(+), 6 deletions(-) diff --git a/src/Microsoft.AspNetCore.All/build/netcoreapp2.1/Microsoft.AspNetCore.All.props b/src/Microsoft.AspNetCore.All/build/netcoreapp2.1/Microsoft.AspNetCore.All.props index 3afa05c31b..0295c8a39f 100644 --- a/src/Microsoft.AspNetCore.All/build/netcoreapp2.1/Microsoft.AspNetCore.All.props +++ b/src/Microsoft.AspNetCore.All/build/netcoreapp2.1/Microsoft.AspNetCore.All.props @@ -1,5 +1,19 @@ - - Microsoft.AspNetCore.All + + + + <_AspNetCoreAppSharedFxIsEnabled>false + + + <_AspNetCoreAllSharedFxIsEnabled>true - \ No newline at end of file + diff --git a/src/Microsoft.AspNetCore.All/build/netcoreapp2.1/Microsoft.AspNetCore.All.targets b/src/Microsoft.AspNetCore.All/build/netcoreapp2.1/Microsoft.AspNetCore.All.targets index abc3cf0fbb..69c476529b 100644 --- a/src/Microsoft.AspNetCore.All/build/netcoreapp2.1/Microsoft.AspNetCore.All.targets +++ b/src/Microsoft.AspNetCore.All/build/netcoreapp2.1/Microsoft.AspNetCore.All.targets @@ -1,4 +1,15 @@ + + + Microsoft.AspNetCore.All + + + - Microsoft.AspNetCore.App + <_AspNetCoreAppSharedFxIsEnabled Condition=" '$(_AspNetCoreAppSharedFxIsEnabled)' == '' ">true + + Microsoft.AspNetCore.App + +