From 355137f9823ccc8ef03a7570a1cb9ab3e45a0c76 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 19 Nov 2013 15:12:47 +0100
Subject: [PATCH] U4-3469 Umbraco 7 + MVC 4 + nuget, web.config error

---
 build/Build.bat                               |  5 +-
 build/NuSpecs/UmbracoCms.nuspec               |  2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      | 12 +++-
 src/Umbraco.Web.UI/Views/Web.config           | 10 ++--
 src/Umbraco.Web.UI/Views/Web.config.transform | 55 -------------------
 5 files changed, 19 insertions(+), 65 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI/Views/Web.config.transform

diff --git a/build/Build.bat b/build/Build.bat
index ccbf2cd6ad..f680ebf7b0 100644
--- a/build/Build.bat
+++ b/build/Build.bat
@@ -1,6 +1,6 @@
 @ECHO OFF
 SET release=7.0.0
-SET comment=RC
+SET comment=
 SET version=%release%
 
 IF [%comment%] EQU [] (SET version=%release%) ELSE (SET version=%release%-%comment%)
@@ -20,6 +20,9 @@ echo This file is only here so that the containing folder will be included in th
 echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\Views\Partials\dummy.txt
 echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\Views\MacroPartials\dummy.txt
 
+ren .\_BuildOutput\WebApp\MacroScripts\Web.config Web.config.transform
+ren .\_BuildOutput\WebApp\Views\Web.config Web.config.transform
+
 ..\src\.nuget\NuGet.exe pack NuSpecs\UmbracoCms.Core.nuspec -Version %version%
 ..\src\.nuget\NuGet.exe pack NuSpecs\UmbracoCms.nuspec -Version %version%
 
diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index 858407f80a..f93d2fdc6b 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -23,7 +23,7 @@
 	<file src="..\_BuildOutput\WebApp\bin\x86\**" target="Content\bin\x86" />
 	<file src="..\_BuildOutput\Configs\**" target="Content\config" exclude="..\_BuildOutput\Configs\Web.config.transform" />
 	<file src="..\_BuildOutput\WebApp\css\**" target="Content\css" />
-	<file src="..\_BuildOutput\WebApp\macroScripts\**" target="Content\macroScripts" />
+	<file src="..\_BuildOutput\WebApp\macroScripts\**" target="Content\macroScripts" exclude="..\_BuildOutput\WebApp\macroScripts\Web.config" />
 	<file src="..\_BuildOutput\WebApp\masterpages\**" target="Content\masterpages" />
 	<file src="..\_BuildOutput\WebApp\media\**" target="Content\media" />
 	<file src="..\_BuildOutput\WebApp\scripts\**" target="Content\scripts" />
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 09a3e249b3..74090b00e3 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -656,8 +656,10 @@
     <None Include="Config\404handlers.Release.config">
       <DependentUpon>404handlers.config</DependentUpon>
     </None>
+    <Content Include="Config\appSettings.config" />
     <None Include="Config\appSettings.Release.config">
       <SubType>Designer</SubType>
+      <DependentUpon>appSettings.config</DependentUpon>
     </None>
     <None Include="Config\ClientDependency.Release.config">
       <DependentUpon>ClientDependency.config</DependentUpon>
@@ -669,7 +671,10 @@
     <None Include="Config\BaseRestExtensions.Release.config">
       <DependentUpon>BaseRestExtensions.config</DependentUpon>
     </None>
-    <None Include="Config\connectionStrings.Release.config" />
+    <Content Include="Config\connectionStrings.config" />
+    <None Include="Config\connectionStrings.Release.config">
+      <DependentUpon>connectionStrings.config</DependentUpon>
+    </None>
     <None Include="Config\log4net.Release.config">
       <DependentUpon>log4net.config</DependentUpon>
     </None>
@@ -713,7 +718,9 @@
       <DependentUpon>Dashboard.config</DependentUpon>
       <SubType>Designer</SubType>
     </None>
-    <Content Include="MacroScripts\Web.config" />
+    <Content Include="MacroScripts\Web.config">
+      <SubType>Designer</SubType>
+    </Content>
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
@@ -2193,7 +2200,6 @@
     <Content Include="Web.config">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Views\Web.config.transform" />
     <None Include="Web.Debug.config.transformed" />
     <None Include="web.Template.Debug.config">
       <DependentUpon>Web.Template.config</DependentUpon>
diff --git a/src/Umbraco.Web.UI/Views/Web.config b/src/Umbraco.Web.UI/Views/Web.config
index 8600dce5da..edcc9d4b62 100644
--- a/src/Umbraco.Web.UI/Views/Web.config
+++ b/src/Umbraco.Web.UI/Views/Web.config
@@ -7,7 +7,7 @@
       <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
     </sectionGroup>
   </configSections>
-  
+
   <system.web.webPages.razor>
     <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
     <pages pageBaseType="System.Web.Mvc.WebViewPage">
@@ -16,10 +16,10 @@
         <add namespace="System.Web.Mvc.Ajax" />
         <add namespace="System.Web.Mvc.Html" />
         <add namespace="System.Web.Routing" />
-				<add namespace="Umbraco.Web" />
-				<add namespace="Umbraco.Core" />
-				<add namespace="Umbraco.Core.Models" />
-				<add namespace="Umbraco.Web.Mvc" />
+        <add namespace="Umbraco.Web" />
+        <add namespace="Umbraco.Core" />
+        <add namespace="Umbraco.Core.Models" />
+        <add namespace="Umbraco.Web.Mvc" />
         <add namespace="Microsoft.Web.Helpers" />
         <add namespace="umbraco" />
         <add namespace="Examine" />
diff --git a/src/Umbraco.Web.UI/Views/Web.config.transform b/src/Umbraco.Web.UI/Views/Web.config.transform
deleted file mode 100644
index f8333ed8ea..0000000000
--- a/src/Umbraco.Web.UI/Views/Web.config.transform
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration>
-  <system.web.webPages.razor>
-    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-    <pages pageBaseType="System.Web.Mvc.WebViewPage">
-      <namespaces>
-        <add namespace="System.Web.Mvc" />
-        <add namespace="System.Web.Mvc.Ajax" />
-        <add namespace="System.Web.Mvc.Html" />
-        <add namespace="System.Web.Routing" />
-        <add namespace="Umbraco.Web" />
-        <add namespace="Umbraco.Core" />
-        <add namespace="Umbraco.Core.Models" />
-        <add namespace="Umbraco.Web.Mvc" />
-      </namespaces>
-    </pages>
-  </system.web.webPages.razor>
-
-  <appSettings>
-    <add key="webpages:Enabled" value="false" />
-  </appSettings>
-
-  <system.web>
-    <httpHandlers>
-      <add path="*" verb="*" type="System.Web.HttpNotFoundHandler"/>
-    </httpHandlers>
-
-    <!--
-        Enabling request validation in view pages would cause validation to occur
-        after the input has already been processed by the controller. By default
-        MVC performs request validation before a controller processes the input.
-        To change this behavior apply the ValidateInputAttribute to a
-        controller or action.
-    -->
-    <pages
-        validateRequest="false"
-        pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-        pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
-        userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-      <controls>
-        <add assembly="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />
-      </controls>
-    </pages>
-  </system.web>
-
-  <system.webServer>
-    <validation validateIntegratedModeConfiguration="false" />
-
-    <handlers>
-      <remove name="BlockViewHandler"/>
-      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
-    </handlers>
-  </system.webServer>
-</configuration>