From 54b4ca174a83e9a5c05f9925a0fc3e57c704a78d Mon Sep 17 00:00:00 2001
From: Lombiq <github@lombiq.com>
Date: Mon, 6 Nov 2017 19:19:44 +0100
Subject: [PATCH] Updating codegen to support view compilation (#7713)

---
 .../CodeGenerationTemplates/ModuleCsProj.txt              | 2 +-
 .../Commands/CodeGenerationCommands.cs                    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleCsProj.txt b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleCsProj.txt
index e26dd842d..cb6f809a3 100644
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleCsProj.txt
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleCsProj.txt
@@ -98,7 +98,7 @@
     -->
   </Target>
   <Target Name="AfterBuildCompiler" Condition="'$(MvcBuildViews)'=='true'">
-    <AspNetCompiler VirtualPath="temp" PhysicalPath="$(ProjectDir)\..\$(ProjectName)" />
+    <AspNetCompiler VirtualPath="temp" PhysicalPath="$(ProjectDir)" />
   </Target>
   <ProjectExtensions>
     <VisualStudio>
diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
index 5f5501776..973ed202a 100644
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
@@ -330,22 +330,22 @@ namespace Orchard.CodeGeneration.Commands {
 @"<ProjectReference Include=""..\..\..\Orchard\Orchard.Framework.csproj"">
       <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
       <Name>Orchard.Framework</Name>
-      <Private>false</Private>
+      <Private>$(MvcBuildViews)</Private>
     </ProjectReference>
     <ProjectReference Include=""..\..\Core\Orchard.Core.csproj"">
       <Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
       <Name>Orchard.Core</Name>
-      <Private>false</Private>
+      <Private>$(MvcBuildViews)</Private>
     </ProjectReference>" :
 @"<Reference Include=""Orchard.Core"">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\bin\Orchard.Core.dll</HintPath>
-      <Private>false</Private>
+      <Private>$(MvcBuildViews)</Private>
     </Reference>
     <Reference Include=""Orchard.Framework"">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\bin\Orchard.Framework.dll</HintPath>
-      <Private>false</Private>
+      <Private>$(MvcBuildViews)</Private>
     </Reference>";
         }