Skip to content
This repository has been archived by the owner on Nov 21, 2018. It is now read-only.

Commit

Permalink
Feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
JunTaoLuo committed Apr 18, 2017
1 parent 097c34b commit 7664b8b
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 16 deletions.
4 changes: 2 additions & 2 deletions src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@
</ItemGroup>

<ItemGroup>
<Content Include="build\**\*.xml" PackagePath="%(Identity)" />
<Content Include="build\**\*.targets" PackagePath="%(Identity)" />
<Content Include="build\**\*.xml" Package="true" />
<Content Include="build\**\*.targets" Package="true" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project>

<PropertyGroup>
<PublishWithAspNetCoreTargetManifest Condition="'$(PublishWithAspNetCoreTargetManifest)'==''">true</PublishWithAspNetCoreTargetManifest>
Expand All @@ -18,19 +18,19 @@ Append the default ASP.NET Core runtime package store manifest during publish

<PropertyGroup>
<ManifestRuntimeIdentifier>$(AspNetCoreTargetManifestRuntimeIdentifier)</ManifestRuntimeIdentifier>
<ManifestRuntimeIdentifier Condition="'$(AspNetCoreTargetManifestRuntimeIdentifier)'==''
and '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))'
</PropertyGroup>

<PropertyGroup Condition="'$(AspNetCoreTargetManifestRuntimeIdentifier)'==''">
<ManifestRuntimeIdentifier
Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))'
and '$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)'=='X64'">win7-x64</ManifestRuntimeIdentifier>
<ManifestRuntimeIdentifier
Condition="'$(AspNetCoreTargetManifestRuntimeIdentifier)'==''
and '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))'
Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))'
and '$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)'=='X86'">win7-x86</ManifestRuntimeIdentifier>
<ManifestRuntimeIdentifier
Condition="'$(AspNetCoreTargetManifestRuntimeIdentifier)'==''
and '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))'">osx.10.12-x64</ManifestRuntimeIdentifier>
Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))'">osx.10.12-x64</ManifestRuntimeIdentifier>
<ManifestRuntimeIdentifier
Condition="'$(AspNetCoreTargetManifestRuntimeIdentifier)'==''
and '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))'">linux-x64</ManifestRuntimeIdentifier>
Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))'">linux-x64</ManifestRuntimeIdentifier>
</PropertyGroup>

<Error
Expand All @@ -39,11 +39,10 @@ Append the default ASP.NET Core runtime package store manifest during publish

<Message
Text="Appending default ASP.NET Core runtime package store manifest for use during publish based for the runtime $(ManifestRuntimeIdentifier)."
Importance="normal"
Condition="'$(ManifestRuntimeIdentifier)'!=''" />
Importance="low" />

<PropertyGroup>
<TargetManifest Condition="'$(ManifestRuntimeIdentifier)'!=''">$(TargetManifest);$(MSBuildThisFileDirectory)manifest.$(ManifestRuntimeIdentifier).xml</TargetManifest>
<TargetManifest>$(TargetManifest);$(MSBuildThisFileDirectory)manifest.$(ManifestRuntimeIdentifier).xml</TargetManifest>
</PropertyGroup>
</Target>
</Project>
</Project>
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project>
<Import Project="$(MSBuildThisFileDirectory)..\PublishWithAspNetCoreTargetManifest.targets" />
</Project>

0 comments on commit 7664b8b

Please sign in to comment.