diff --git a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj index 64a2331..12516fb 100644 --- a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj +++ b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj @@ -148,8 +148,8 @@ - - + + \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.All/build/PublishWithAspNetCoreTargetManifest.targets b/src/Microsoft.AspNetCore.All/build/PublishWithAspNetCoreTargetManifest.targets index 3bd640b..c20d8c0 100644 --- a/src/Microsoft.AspNetCore.All/build/PublishWithAspNetCoreTargetManifest.targets +++ b/src/Microsoft.AspNetCore.All/build/PublishWithAspNetCoreTargetManifest.targets @@ -1,7 +1,5 @@ - - true @@ -19,24 +17,33 @@ Append the default ASP.NET Core runtime package store manifest during publish Condition="'$(PublishWithAspNetCoreTargetManifest)'=='true' and '$(PublishableProject)'=='true'" > - $(AspNetCoreTargetManifestRuntimeIdentifier) - win7-x64 - win7-x86 - osx.10.12-x64 - linux-x64 + $(AspNetCoreTargetManifestRuntimeIdentifier) + win7-x64 + win7-x86 + osx.10.12-x64 + linux-x64 + Condition="'$(ManifestRuntimeIdentifier)'==''" /> + Condition="'$(ManifestRuntimeIdentifier)'!=''" /> - $(TargetManifest);$(MSBuildThisFileDirectory)manifest.$(ResolvedRuntimeIdentifier).xml + $(TargetManifest);$(MSBuildThisFileDirectory)manifest.$(ManifestRuntimeIdentifier).xml \ No newline at end of file