Rename some things

This commit is contained in:
Ryan Nowak 2018-01-07 20:26:21 -08:00
parent b7415502bf
commit 595d05965a
2 changed files with 24 additions and 24 deletions

View File

@ -22,7 +22,7 @@
<Target <Target
Name="RazorCoreCompile" Name="RazorCoreCompile"
Inputs="$(MSBuildAllProjects); Inputs="$(MSBuildAllProjects);
@(_RazorGenerated); @(RazorCompile);
@(_CoreCompileResourceInputs); @(_CoreCompileResourceInputs);
$(ApplicationIcon); $(ApplicationIcon);
$(AssemblyOriginatorKeyFile); $(AssemblyOriginatorKeyFile);
@ -100,7 +100,7 @@
References="@(RazorReferencePath)" References="@(RazorReferencePath)"
ReportAnalyzer="$(ReportAnalyzer)" ReportAnalyzer="$(ReportAnalyzer)"
ResponseFiles="$(CompilerResponseFile)" ResponseFiles="$(CompilerResponseFile)"
Sources="@(_RazorGenerated)" Sources="@(RazorCompile)"
SubsystemVersion="$(SubsystemVersion)" SubsystemVersion="$(SubsystemVersion)"
TargetType="Library" TargetType="Library"
ToolExe="$(CscToolExe)" ToolExe="$(CscToolExe)"

View File

@ -80,22 +80,19 @@
</Target> </Target>
<Target Name="_RazorResolveSourceFiles"> <Target Name="_ResolveRazorCoreGenerateInputs">
<ItemGroup>
<RazorCompile Include="@(Content)" Condition="'%(Content.Extension)'=='.cshtml'" /> <ItemGroup>
<_RazorGenerated Include="@(RazorCompile->'$(RazorGenerateOutputPath)%(RelativeDir)%(Filename).cs')"> <RazorGenerate Include="@(Content)" Condition="'%(Content.Extension)'=='.cshtml'" />
<Source>%(Identity)</Source> <_RazorGenerateOutput Include="@(RazorGenerate->'$(RazorGenerateOutputPath)%(RelativeDir)%(Filename).cs')" />
</_RazorGenerated> </ItemGroup>
</ItemGroup>
</Target>
<Target Name="_RazorCreateSourceHashFiles" DependsOnTargets="_RazorResolveSourceFiles">
<PropertyGroup> <PropertyGroup>
<_RazorSourcesHashFile>$(IntermediateOutputPath)$(MSBuildProjectName).RazorSourceHash.cache</_RazorSourcesHashFile> <_RazorGenerateHashFile>$(IntermediateOutputPath)$(MSBuildProjectName).RazorCoreGenerate.cache</_RazorGenerateHashFile>
</PropertyGroup> </PropertyGroup>
<Hash ItemsToHash="@(RazorCompile)"> <Hash ItemsToHash="@(RazorGenerate)">
<Output TaskParameter="HashResult" PropertyName="_RazorSourcesHash" /> <Output TaskParameter="HashResult" PropertyName="_RazorGenerateHash" />
</Hash> </Hash>
<MakeDir <MakeDir
@ -103,41 +100,44 @@
Condition="!Exists('$(IntermediateOutputPath)')" /> Condition="!Exists('$(IntermediateOutputPath)')" />
<WriteLinesToFile <WriteLinesToFile
Lines="$(_RazorSourcesHash)" Lines="$(_RazorGenerateHash)"
File="$(_RazorSourcesHashFile)" File="$(_RazorGenerateHashFile)"
Overwrite="True" Overwrite="True"
WriteOnlyWhenDifferent="True" /> WriteOnlyWhenDifferent="True" />
<ItemGroup> <ItemGroup>
<FileWrites Include="$(_RazorSourcesHashFile)" /> <FileWrites Include="$(_RazorGenerateHashFile)" />
</ItemGroup> </ItemGroup>
</Target> </Target>
<Target <Target
Name="RazorCoreGenerate" Name="RazorCoreGenerate"
DependsOnTargets="_RazorResolveSourceFiles;_RazorCreateSourceHashFiles;_RazorResolveTagHelpers" DependsOnTargets="_ResolveRazorCoreGenerateInputs;_RazorResolveTagHelpers"
Inputs="$(MSBuildAllProjects);$(_RazorSourcesHashFile);@(RazorCompile);$(_RazorTagHelperOutputCache)" Inputs="$(MSBuildAllProjects);$(_RazorGenerateHashFile);$(_RazorTagHelperOutputCache);@(RazorGenerate)"
Outputs="@(_RazorGenerated)"> Outputs="@(_RazorGenerateOutput)">
<RemoveDir <RemoveDir
Directories="$(RazorGenerateOutputPath)" Directories="$(RazorGenerateOutputPath)"
Condition = "Exists('$(RazorGenerateOutputPath)')"/> Condition = "Exists('$(RazorGenerateOutputPath)')"/>
<MakeDir <MakeDir
Directories="%(_RazorGenerated.RelativeDir)" Directories="%(_RazorGenerateOutput.RelativeDir)"
Condition="!Exists('%(_RazorGenerated.RelativeDir)')" /> Condition="!Exists('%(_RazorGenerateOutput.RelativeDir)')" />
<RazorGenerate <RazorGenerate
Debug="$(_RazorDebugGenerateCodeTask)" Debug="$(_RazorDebugGenerateCodeTask)"
DebugTool="$(_RazorDebugGenerateCodeTool)" DebugTool="$(_RazorDebugGenerateCodeTool)"
ToolAssembly="$(_RazorGenerateToolAssembly)" ToolAssembly="$(_RazorGenerateToolAssembly)"
Sources="@(RazorCompile)" Sources="@(RazorGenerate)"
ProjectRoot="$(MSBuildProjectDirectory)" ProjectRoot="$(MSBuildProjectDirectory)"
TagHelperManifest="$(_RazorTagHelperOutputCache)" TagHelperManifest="$(_RazorTagHelperOutputCache)"
OutputPath="$(RazorGenerateOutputPath)" /> OutputPath="$(RazorGenerateOutputPath)" />
<ItemGroup> <ItemGroup>
<FileWrites Include="@(_RazorGenerated)" /> <FileWrites Include="@(_RazorGenerateOutput)" />
<!-- These items are used by RazorCoreCompile -->
<RazorCompile Include="@(_RazorGenerateOutput)" />
</ItemGroup> </ItemGroup>
</Target> </Target>
</Project> </Project>