huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use $(TargetDir) instead of $(ProjectDir)$(OutputPath)

This commit is contained in:
Nate McMaster 2018-08-06 16:23:54 -07:00
parent 9672c2cff1
commit 22a3fbf861
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.AspNetCore.Blazor.Analyzers/Microsoft.AspNetCore.Blazor.Analyzers.csproj
View File

@ -13,7 +13,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" /> <None Include="$(TargetPath)" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -32,5 +32,5 @@
<ItemGroup> <ItemGroup>
<Compile Include="..\shared\BlazorApi.cs" Link="shared\%(Filename)%(Extension)" /> <Compile Include="..\shared\BlazorApi.cs" Link="shared\%(Filename)%(Extension)" />
</ItemGroup> </ItemGroup>
</Project> </Project>

16
src/Microsoft.AspNetCore.Blazor.Build/targets/Blazor.MonoRuntime.targets
View File

@ -44,7 +44,7 @@
<_BlazorStatisticsReportImportance Condition="'$(BlazorOutputStatistics)' != ''">high</_BlazorStatisticsReportImportance> <_BlazorStatisticsReportImportance Condition="'$(BlazorOutputStatistics)' != ''">high</_BlazorStatisticsReportImportance>
</PropertyGroup> </PropertyGroup>
<Message Importance="high" Text="Blazor Build result -> @(_BlazorStatisticsOutput->Distinct()->Count()) files in $(ProjectDir)$(OutputPath)dist" /> <Message Importance="high" Text="Blazor Build result -> @(_BlazorStatisticsOutput->Distinct()->Count()) files in $(TargetDir)dist" />
<Message Importance="$(_BlazorStatisticsReportImportance)" Text="%(_BlazorStatisticsOutput.Identity)" /> <Message Importance="$(_BlazorStatisticsReportImportance)" Text="%(_BlazorStatisticsOutput.Identity)" />
</Target> </Target>
@ -158,17 +158,17 @@
<ItemGroup Label="Static content to copy to the output folder"> <ItemGroup Label="Static content to copy to the output folder">
<BlazorItemOutput Include="@(MonoAsmjsFile)"> <BlazorItemOutput Include="@(MonoAsmjsFile)">
<TargetOutputPath>$(ProjectDir)$(OutputPath)$(BaseBlazorRuntimeAsmjsOutputPath)%(FileName)%(Extension)</TargetOutputPath> <TargetOutputPath>$(TargetDir)$(BaseBlazorRuntimeAsmjsOutputPath)%(FileName)%(Extension)</TargetOutputPath>
<Type>AsmJs</Type> <Type>AsmJs</Type>
<IsStatic>true</IsStatic> <IsStatic>true</IsStatic>
</BlazorItemOutput> </BlazorItemOutput>
<BlazorItemOutput Include="@(MonoWasmFile)"> <BlazorItemOutput Include="@(MonoWasmFile)">
<TargetOutputPath>$(ProjectDir)$(OutputPath)$(BaseBlazorRuntimeWasmOutputPath)%(FileName)%(Extension)</TargetOutputPath> <TargetOutputPath>$(TargetDir)$(BaseBlazorRuntimeWasmOutputPath)%(FileName)%(Extension)</TargetOutputPath>
<Type>WebAssembly</Type> <Type>WebAssembly</Type>
<IsStatic>true</IsStatic> <IsStatic>true</IsStatic>
</BlazorItemOutput> </BlazorItemOutput>
<BlazorItemOutput Include="@(BlazorJsFile)"> <BlazorItemOutput Include="@(BlazorJsFile)">
<TargetOutputPath>$(ProjectDir)$(OutputPath)$(BaseBlazorJsOutputPath)%(FileName)%(Extension)</TargetOutputPath> <TargetOutputPath>$(TargetDir)$(BaseBlazorJsOutputPath)%(FileName)%(Extension)</TargetOutputPath>
<Type>BlazorRuntime</Type> <Type>BlazorRuntime</Type>
<IsStatic>true</IsStatic> <IsStatic>true</IsStatic>
</BlazorItemOutput> </BlazorItemOutput>
@ -176,7 +176,7 @@
<ItemGroup Label="Static content supplied by NuGet packages"> <ItemGroup Label="Static content supplied by NuGet packages">
<_BlazorPackageContentOutput Include="@(BlazorPackageContentFile)" Condition="%(SourcePackage) != ''"> <_BlazorPackageContentOutput Include="@(BlazorPackageContentFile)" Condition="%(SourcePackage) != ''">
<TargetOutputPath>$(ProjectDir)$(OutputPath)$(BaseBlazorPackageContentOutputPath)%(SourcePackage)\%(RecursiveDir)\%(Filename)%(Extension)</TargetOutputPath> <TargetOutputPath>$(TargetDir)$(BaseBlazorPackageContentOutputPath)%(SourcePackage)\%(RecursiveDir)\%(Filename)%(Extension)</TargetOutputPath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</_BlazorPackageContentOutput> </_BlazorPackageContentOutput>
<BlazorItemOutput Include="@(_BlazorPackageContentOutput)" /> <BlazorItemOutput Include="@(_BlazorPackageContentOutput)" />
@ -243,7 +243,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="Final output paths"> <PropertyGroup Label="Final output paths">
<BlazorRuntimeBinOutputPath>$(ProjectDir)$(OutputPath)$(BaseBlazorRuntimeBinOutputPath)</BlazorRuntimeBinOutputPath> <BlazorRuntimeBinOutputPath>$(TargetDir)$(BaseBlazorRuntimeBinOutputPath)</BlazorRuntimeBinOutputPath>
</PropertyGroup> </PropertyGroup>
<MakeDir Directories="$(BlazorIntermediateOutputPath)" /> <MakeDir Directories="$(BlazorIntermediateOutputPath)" />
@ -638,11 +638,11 @@
<_BlazorBootJson Include="$(BlazorBootJsonIntermediateOutputPath)" /> <_BlazorBootJson Include="$(BlazorBootJsonIntermediateOutputPath)" />
<_BlazorBootJsonEmbeddedContentFile Include="$(BlazorBootJsonIntermediateOutputDir)_content\**\*.*" /> <_BlazorBootJsonEmbeddedContentFile Include="$(BlazorBootJsonIntermediateOutputDir)_content\**\*.*" />
<BlazorItemOutput Include="@(_BlazorBootJson)"> <BlazorItemOutput Include="@(_BlazorBootJson)">
<TargetOutputPath>$(ProjectDir)$(OutputPath)$(BlazorBootJsonOutputPath)</TargetOutputPath> <TargetOutputPath>$(TargetDir)$(BlazorBootJsonOutputPath)</TargetOutputPath>
<Type>BootJson</Type> <Type>BootJson</Type>
</BlazorItemOutput> </BlazorItemOutput>
<BlazorItemOutput Include="@(_BlazorBootJsonEmbeddedContentFile)"> <BlazorItemOutput Include="@(_BlazorBootJsonEmbeddedContentFile)">
<TargetOutputPath>$(ProjectDir)$(OutputPath)dist/_content/%(RecursiveDir)%(FileName)%(Extension)</TargetOutputPath> <TargetOutputPath>$(TargetDir)dist/_content/%(RecursiveDir)%(FileName)%(Extension)</TargetOutputPath>
</BlazorItemOutput> </BlazorItemOutput>
<FileWrites Include="$(BlazorBootJsonIntermediateOutputPath)" /> <FileWrites Include="$(BlazorBootJsonIntermediateOutputPath)" />
<FileWrites Include="@(_BlazorBootJsonEmbeddedContentFile)" /> <FileWrites Include="@(_BlazorBootJsonEmbeddedContentFile)" />

2
test/Microsoft.AspNetCore.Blazor.Build.Test/Microsoft.AspNetCore.Blazor.Build.Test.csproj
View File

@ -36,7 +36,7 @@
<!-- A bit of msbuild magic to support reference resolver tests --> <!-- A bit of msbuild magic to support reference resolver tests -->
<Target Name="CreateReferenceHintPathsList" AfterTargets="Build"> <Target Name="CreateReferenceHintPathsList" AfterTargets="Build">
<WriteLinesToFile Lines="@(ReferencePath)" File="$(ProjectDir)$(OutputPath)referenceHints.txt" WriteOnlyWhenDifferent="true" Overwrite="true" /> <WriteLinesToFile Lines="@(ReferencePath)" File="$(TargetDir)referenceHints.txt" WriteOnlyWhenDifferent="true" Overwrite="true" />
</Target> </Target>
<ItemGroup> <ItemGroup>