From 74343bd46a1db64da3edec4759d4d7859c594114 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Mon, 29 Oct 2018 16:45:32 -0700 Subject: [PATCH] [mono] Add Microsoft.NET.Sdk.Razor missed in the last update (#77) Missed committing the sdk files in 3f830707fb426a3b10db18ee94e5bd07a99871bb ! cli commit: d36e5ce1619640f4516c1e89ef20cf52f1a32878 Microsoft.NET.Sdk.Razor: 2.1.0 Version from: https://github.com/dotnet/cli/blob/d36e5ce1619640f4516c1e89ef20cf52f1a32878/build/DependencyVersions.props (A future fix should guard against this kinda mistake) Fixes https://github.com/mono/mono/issues/11214 . (cherry picked from commit c25860499b19599171cf6fe7b74dc0119b1e5b40) --- sdks/Microsoft.NET.Sdk.Razor/Sdk/Sdk.props | 25 + sdks/Microsoft.NET.Sdk.Razor/Sdk/Sdk.targets | 23 + ...icrosoft.NET.Sdk.Razor.Compilation.targets | 181 ++++++ ...Microsoft.NET.Sdk.Razor.DesignTime.targets | 48 ++ ...NET.Sdk.Razor.GenerateAssemblyInfo.targets | 185 ++++++ .../Microsoft.NET.Sdk.Razor.props | 17 + .../Rules/RazorConfiguration.xaml | 29 + .../netstandard2.0/Rules/RazorExtension.xaml | 37 ++ .../netstandard2.0/Rules/RazorGeneral.xaml | 36 ++ .../Sdk.Razor.CurrentVersion.props | 77 +++ .../Sdk.Razor.CurrentVersion.targets | 608 ++++++++++++++++++ .../Microsoft.NET.Sdk.Razor.props | 17 + ...azor.CurrentVersion.MultiTargeting.targets | 22 + 13 files changed, 1305 insertions(+) create mode 100644 sdks/Microsoft.NET.Sdk.Razor/Sdk/Sdk.props create mode 100644 sdks/Microsoft.NET.Sdk.Razor/Sdk/Sdk.targets create mode 100644 sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets create mode 100644 sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets create mode 100644 sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets create mode 100644 sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.props create mode 100644 sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Rules/RazorConfiguration.xaml create mode 100644 sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Rules/RazorExtension.xaml create mode 100644 sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Rules/RazorGeneral.xaml create mode 100644 sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.props create mode 100644 sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets create mode 100644 sdks/Microsoft.NET.Sdk.Razor/buildMultiTargeting/Microsoft.NET.Sdk.Razor.props create mode 100644 sdks/Microsoft.NET.Sdk.Razor/buildMultiTargeting/Sdk.Razor.CurrentVersion.MultiTargeting.targets diff --git a/sdks/Microsoft.NET.Sdk.Razor/Sdk/Sdk.props b/sdks/Microsoft.NET.Sdk.Razor/Sdk/Sdk.props new file mode 100644 index 00000000000..9102f6c8059 --- /dev/null +++ b/sdks/Microsoft.NET.Sdk.Razor/Sdk/Sdk.props @@ -0,0 +1,25 @@ + + + + + <_RazorSdkImportsMicrosoftNetSdk Condition="'$(UsingMicrosoftNETSdk)' != 'true'">true + + + + + + $(MSBuildThisFileDirectory)..\build\netstandard2.0\Sdk.Razor.CurrentVersion.props + + + + diff --git a/sdks/Microsoft.NET.Sdk.Razor/Sdk/Sdk.targets b/sdks/Microsoft.NET.Sdk.Razor/Sdk/Sdk.targets new file mode 100644 index 00000000000..20b70fd9ab7 --- /dev/null +++ b/sdks/Microsoft.NET.Sdk.Razor/Sdk/Sdk.targets @@ -0,0 +1,23 @@ + + + + + + + $(MSBuildThisFileDirectory)..\buildMultiTargeting\Sdk.Razor.CurrentVersion.MultiTargeting.targets + $(MSBuildThisFileDirectory)..\build\netstandard2.0\Sdk.Razor.CurrentVersion.targets + + + + + diff --git a/sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets b/sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets new file mode 100644 index 00000000000..c8ec7205db3 --- /dev/null +++ b/sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Compilation.targets @@ -0,0 +1,181 @@ + + + + + + + + $(NoWarn);1701;1702 + + + + + $(NoWarn);2008 + + + + + + + + + + + $(AppConfig) + + + + + false + + + + + + + + + + true + + + + + + + + + + + + + diff --git a/sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets b/sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets new file mode 100644 index 00000000000..0b012be77c8 --- /dev/null +++ b/sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.DesignTime.targets @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + File + + + File + + + Project + + + + diff --git a/sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets b/sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets new file mode 100644 index 00000000000..bc46b453cf1 --- /dev/null +++ b/sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets @@ -0,0 +1,185 @@ + + + + + true + + + true + + + $(IntermediateOutputPath)$(MSBuildProjectName).RazorTargetAssemblyInfo.cs + <_RazorTargetAssemblyInfoInputsCacheFile>$(IntermediateOutputPath)$(MSBuildProjectName).RazorTargetAssemblyInfo.cache + + + <_RazorAssemblyInfo>$(IntermediateOutputPath)$(MSBuildProjectName).RazorAssemblyInfo.cs + <_RazorAssemblyInfoInputsCacheFile>$(IntermediateOutputPath)$(MSBuildProjectName).RazorAssemblyInfo.cache + + + + + GetRazorTargetAssemblyAttributes; + _CreateRazorTargetAssemblyInfoInputsCacheFile; + CoreGenerateRazorTargetAssemblyInfo + + + + + + + + + + + + + + + + + + + + + + + + + + $(FileVersion) + $(InformationalVersion) + $(Description) + $(RazorTargetName) + $(AssemblyVersion) + + + + + <_Parameter1>$(Company) + + + <_Parameter1>$(Configuration) + + + <_Parameter1>$(Copyright) + + + <_Parameter1>$(Product) + + + <_Parameter1>$(NeutralLanguage) + + + + <_Parameter1>$(RazorAssemblyDescription) + + + <_Parameter1>$(RazorAssemblyFileVersion) + + + <_Parameter1>$(RazorAssemblyInformationalVersion) + + + <_Parameter1>$(RazorAssemblyTitle) + + + <_Parameter1>$(RazorAssemblyVersion) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(CoreCompileDependsOn);_GenerateRazorAssemblyInfo + + + <_GenerateRazorAssemblyInfoDependsOn>PrepareForBuild;_CoreGenerateRazorAssemblyInfo + + + + + diff --git a/sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.props b/sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.props new file mode 100644 index 00000000000..6fad4d51804 --- /dev/null +++ b/sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.props @@ -0,0 +1,17 @@ + + + + $(MSBuildThisFileDirectory)Sdk.Razor.CurrentVersion.props + $(MSBuildThisFileDirectory)Sdk.Razor.CurrentVersion.targets + + diff --git a/sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Rules/RazorConfiguration.xaml b/sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Rules/RazorConfiguration.xaml new file mode 100644 index 00000000000..55ae9abb42c --- /dev/null +++ b/sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Rules/RazorConfiguration.xaml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Rules/RazorExtension.xaml b/sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Rules/RazorExtension.xaml new file mode 100644 index 00000000000..49589142ee4 --- /dev/null +++ b/sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Rules/RazorExtension.xaml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Rules/RazorGeneral.xaml b/sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Rules/RazorGeneral.xaml new file mode 100644 index 00000000000..9a8785f2062 --- /dev/null +++ b/sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Rules/RazorGeneral.xaml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.props b/sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.props new file mode 100644 index 00000000000..015a7953e81 --- /dev/null +++ b/sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.props @@ -0,0 +1,77 @@ + + + + + + + + true + + + true + + + false + + + false + + + Implicit + + + false + + + .g.cshtml.cs + + true + + + + + $(IncludeRazorContentInPack) + + + + + + diff --git a/sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets new file mode 100644 index 00000000000..7d771e7c0d7 --- /dev/null +++ b/sdks/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets @@ -0,0 +1,608 @@ + + + + + + + + + + + ResolveRazorConfiguration; + ResolveRazorGenerateInputs; + AssignRazorGenerateTargetPaths; + ResolveAssemblyReferenceRazorGenerateInputs; + _CheckForMissingRazorCompiler; + ResolveTagHelperRazorGenerateInputs + + + + PrepareForRazorGenerate; + _CheckForMissingRazorCompiler; + RazorCoreGenerate + + + + RazorGenerate; + ResolveRazorCompileInputs; + GenerateRazorTargetAssemblyInfo + + + + ResolveRazorEmbeddedResources + + + + PrepareForRazorCompile; + RazorCoreCompile + + + + $(BuiltProjectOutputGroupDependsOn); + _RazorAddBuiltProjectOutputGroupOutput + + + + $(DebugSymbolsProjectOutputGroupDependsOn); + _RazorAddDebugSymbolsProjectOutputGroupOutput + + + + $(PrepareForBuildDependsOn); + ResolveRazorGenerateInputs + + + + _RazorPrepareForRun; + $(PrepareForRunDependsOn) + + + + _RazorGetCopyToOutputDirectoryItems; + $(GetCopyToOutputDirectoryItems) + + + + + + + true + + + + + true + + + $(MvcRazorCompileOnPublish) + + + true + + + + + + $(IntermediateOutputPath)Razor\ + + + .Razor + + + $(TargetName)$(RazorTargetNameSuffix) + + + false + true + + false + true + + + $([MSBuild]::EnsureTrailingSlash('$(MvcRazorOutputPath)')) + + + $(MvcRazorEmbedViewSources) + false + + + $(UseSharedCompilation) + true + + + + + <_RazorDebugSymbolsProduced>false + <_RazorDebugSymbolsProduced Condition="'$(DebugSymbols)'=='true'">true + <_RazorDebugSymbolsProduced Condition="'$(DebugType)'=='none'">false + <_RazorDebugSymbolsProduced Condition="'$(DebugType)'=='pdbonly'">true + <_RazorDebugSymbolsProduced Condition="'$(DebugType)'=='full'">true + <_RazorDebugSymbolsProduced Condition="'$(DebugType)'=='portable'">true + <_RazorDebugSymbolsProduced Condition="'$(DebugType)'=='embedded'">false + + + + + + PrecompilationTool + + + RazorSdk + + $(RazorCompileToolset) + $(RazorCompileToolset) + + + PrecompilationTool + + + true + + + + + + + + <_RazorDebugSymbolsIntermediatePath Condition="'$(_RazorDebugSymbolsProduced)'=='true'" Include="$(IntermediateOutputPath)$(RazorTargetName).pdb" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_GenerateRazorAssemblyInfoDependsOn>RazorGetAssemblyAttributes;$(_GenerateRazorAssemblyInfoDependsOn) + + + + + <_RazorAssemblyAttribute Include="Microsoft.AspNetCore.Razor.Hosting.RazorLanguageVersionAttribute"> + <_Parameter1>$(RazorLangVersion) + + <_RazorAssemblyAttribute Include="Microsoft.AspNetCore.Razor.Hosting.RazorConfigurationNameAttribute"> + <_Parameter1>$(RazorDefaultConfiguration) + + <_RazorAssemblyAttribute Include="Microsoft.AspNetCore.Razor.Hosting.RazorExtensionAssemblyNameAttribute" Condition="'%(ResolvedRazorExtension.AssemblyName)'!=''"> + <_Parameter1>%(ResolvedRazorExtension.Identity) + <_Parameter2>%(ResolvedRazorExtension.AssemblyName) + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + $(RazorGenerateIntermediateOutputPath)$([System.IO.Path]::ChangeExtension('%(RazorGenerateWithTargetPath.TargetPath)', '$(RazorGenerateOutputFileExtension)')) + + + + + + + + + + + + + + + + + + + + /$([System.String]::Copy('%(RazorGenerateWithTargetPath.TargetPath)').Replace('\','/')) + Non-Resx + false + + + + <_RazorCoreCompileResourceInputs + Include="@(RazorEmbeddedResource)" + Condition="'%(RazorEmbeddedResource.WithCulture)'=='false' and '%(RazorEmbeddedResource.Type)'=='Non-Resx' " /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + %(Filename)%(Extension) + PreserveNewest + + + %(Filename)%(Extension) + PreserveNewest + + + + + + + + + + + + %(Filename)%(Extension) + PreserveNewest + + + %(Filename)%(Extension) + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @(RazorIntermediateAssembly->'%(Filename)%(Extension)') + + + @(_RazorDebugSymbolsIntermediatePath->'%(Filename)%(Extension)') + + + + + + + + + + + + + + + + + + + + + + + $([MSBuild]::EnsureTrailingSlash('$(OutDir)')) + $([MSBuild]::Escape($([MSBuild]::EnsureTrailingSlash($([System.IO.Path]::GetFullPath('$([System.IO.Path]::Combine('$(MSBuildProjectDirectory)', '$(RazorOutputPath)'))')))))) + + $(RazorTargetDir)$(RazorTargetName).dll + + + + + $(MSBuildExtensionsPath)\Microsoft\VisualStudio\Razor\Microsoft.NET.Sdk.Razor.DesignTime.targets + $(MSBuildThisFileDirectory)Microsoft.NET.Sdk.Razor.DesignTime.targets + + + + + + + + diff --git a/sdks/Microsoft.NET.Sdk.Razor/buildMultiTargeting/Microsoft.NET.Sdk.Razor.props b/sdks/Microsoft.NET.Sdk.Razor/buildMultiTargeting/Microsoft.NET.Sdk.Razor.props new file mode 100644 index 00000000000..35159319283 --- /dev/null +++ b/sdks/Microsoft.NET.Sdk.Razor/buildMultiTargeting/Microsoft.NET.Sdk.Razor.props @@ -0,0 +1,17 @@ + + + + $(MSBuildThisFileDirectory)..\build\netstandard2.0\Sdk.Razor.CurrentVersion.props + $(MSBuildThisFileDirectory)Sdk.Razor.CurrentVersion.MultiTargeting.targets + + diff --git a/sdks/Microsoft.NET.Sdk.Razor/buildMultiTargeting/Sdk.Razor.CurrentVersion.MultiTargeting.targets b/sdks/Microsoft.NET.Sdk.Razor/buildMultiTargeting/Sdk.Razor.CurrentVersion.MultiTargeting.targets new file mode 100644 index 00000000000..a4e070ef574 --- /dev/null +++ b/sdks/Microsoft.NET.Sdk.Razor/buildMultiTargeting/Sdk.Razor.CurrentVersion.MultiTargeting.targets @@ -0,0 +1,22 @@ + + + + + + + + + + + +