Package with csproj and build as AnyCPU

RazorViewCompilation.sln

@@ -23,8 +23,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{87FEE984
 		build\common.props = build\common.props
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation-x86", "tools\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation-x86\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation-x86.csproj", "{9F47A520-7DAB-409D-81C8-AD351562A1A5}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -43,10 +41,6 @@ Global
 		{E0D75B4E-839F-4F80-9B1F-B33F616BCC5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E0D75B4E-839F-4F80-9B1F-B33F616BCC5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E0D75B4E-839F-4F80-9B1F-B33F616BCC5F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9F47A520-7DAB-409D-81C8-AD351562A1A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9F47A520-7DAB-409D-81C8-AD351562A1A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9F47A520-7DAB-409D-81C8-AD351562A1A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9F47A520-7DAB-409D-81C8-AD351562A1A5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -55,6 +49,5 @@ Global
 		{4339FC9B-AEC6-442A-B413-A41555ED76C7} = {02F7AA35-91AF-491E-9F0E-03CFAF86C720}
 		{46C9A4B2-8B1C-451B-B670-C194901D66AC} = {0398AFFF-505E-4283-89DA-BBD9D28B53DB}
 		{E0D75B4E-839F-4F80-9B1F-B33F616BCC5F} = {0398AFFF-505E-4283-89DA-BBD9D28B53DB}
-		{9F47A520-7DAB-409D-81C8-AD351562A1A5} = {02F7AA35-91AF-491E-9F0E-03CFAF86C720}
 	EndGlobalSection
 EndGlobal

src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj

@@ -1,23 +1,57 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
   <Import Project="..\..\build\common.props" />
+
   <PropertyGroup>
     <Description>Build-time references required to enable Razor view compilation as part of building the application.</Description>
     <TargetFrameworks>netcoreapp1.1;net451</TargetFrameworks>
-    <RuntimeIdentifier Condition="!$(TargetFramework.StartsWith('netcoreapp'))">win7-x64</RuntimeIdentifier>
     <PackageTags>cshtml;razor;compilation;precompilation;aspnetcore</PackageTags>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <OutputType>exe</OutputType>
-    <X86ProjectDirectory>..\..\tools\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation-x86\</X86ProjectDirectory>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <AppendRuntimeIdentifierToOutputPath>true</AppendRuntimeIdentifierToOutputPath>
+    <RuntimeIdentifiers Condition="'$(TargetFramework)' == 'net451'">win7-x64;win7-x86</RuntimeIdentifiers>
+    <RuntimeIdentifier Condition="'$(TargetFramework)' == 'net451'">win7-x64</RuntimeIdentifier>
+    <PlatformTarget Condition="'$(RuntimeIdentifier)' == 'win7-x64'">AnyCPU</PlatformTarget>
+    <AssemblyName Condition="'$(RuntimeIdentifier)' == 'win7-x86'">$(MSBuildProjectName)-x86</AssemblyName>
   </PropertyGroup>
+
   <ItemGroup>
-    <None Include="build\**\*" Pack="true" PackagePath="%(Identity)" />
-    <None Include="buildMultiTargeting\*" Pack="true" PackagePath="%(Identity)" />
-    <None Include="$(X86ProjectDirectory)\bin\$(Configuration)\net451\$(MSBuildThisFileName)-x86.exe" Pack="true" PackagePath="lib\net451\$(MSBuildThisFileName)-x86.exe" />
+    <Content Include="build\**\*" PackagePath="%(Identity)" />
+    <Content Include="lib\*\_._" PackagePath="%(Identity)" />
+    <Content Include="buildMultiTargeting\*" PackagePath="%(Identity)" />
   </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor" Version="1.2.0-*" />
     <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.2.0-*" />
-    <ProjectReference Include="$(X86ProjectDirectory)$(MSBuildThisFileName)-x86.csproj" PrivateAssets="true" ReferenceOutputAssembly="false" Condition="'$(TargetFramework)'=='net451'" />
   </ItemGroup>
+
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+
+  <PropertyGroup>
+    <GenerateNuspecDependsOn>PackAssemblyFiles;$(GenerateNuspecDependsOn)</GenerateNuspecDependsOn>
+    <BuildDependsOn Condition="'$(RuntimeIdentifier)' != 'win7-x86' AND '$(TargetFramework)' == 'net451'">$(BuildDependsOn);CompileX86</BuildDependsOn>
+  </PropertyGroup>
+
+  <Target Name="CompileX86">
+    <MSBuild Projects="$(MSBuildProjectFullPath)"
+        Targets="Build"
+        Properties="Configuration=$(Configuration);RuntimeIdentifier=win7-x86;TargetFramework=net451" />
+  </Target>
+
+  <Target Name="PackAssemblyFiles" BeforeTargets="_GenerateNuspec">
+    <ItemGroup>
+      <Content Include="bin\$(Configuration)\net451\win7-x86\$(AssemblyName)-x86.exe"
+               PackagePath="runtimes\win7-x86\lib\net451\" />
+      <Content Include="bin\$(Configuration)\net451\win7-x64\$(AssemblyName).exe"
+               PackagePath="runtimes\win7-x64\lib\net451\" />
+      <Content Include="bin\$(Configuration)\netcoreapp1.1\$(AssemblyName).dll"
+               PackagePath="lib\netcoreapp1.1\" />
+      <Content Include="bin\$(Configuration)\netcoreapp1.1\$(AssemblyName).runtimeconfig.json"
+               PackagePath="lib\netcoreapp1.1\" />
+    </ItemGroup>
+  </Target>
+
 </Project>