From 691c04016c40f1b8147cd5472ca06aaabd75142b Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipke@ideliverable.com>
Date: Wed, 4 Mar 2015 17:36:27 +0100
Subject: [PATCH] Fixed Upgrade module to use proper project type and removed
 unused namespaces.

---
 src/Orchard.Web/Modules/Upgrade/App.config    | 19 ----
 .../Controllers/ContentPickerController.cs    |  1 -
 .../Upgrade/Controllers/MenuController.cs     |  1 -
 .../Upgrade/Controllers/RouteController.cs    |  1 -
 .../Upgrade/Controllers/TaxonomyController.cs |  1 -
 .../Modules/Upgrade/Scripts/Web.config        | 16 ----
 .../Upgrade/Services/UpgradeService.cs        |  2 -
 .../Modules/Upgrade/Upgrade.csproj            | 91 ++++++++++---------
 src/Orchard.Web/Modules/Upgrade/Web.config    | 88 +++++++++++-------
 9 files changed, 100 insertions(+), 120 deletions(-)
 delete mode 100644 src/Orchard.Web/Modules/Upgrade/App.config
 delete mode 100644 src/Orchard.Web/Modules/Upgrade/Scripts/Web.config

diff --git a/src/Orchard.Web/Modules/Upgrade/App.config b/src/Orchard.Web/Modules/Upgrade/App.config
deleted file mode 100644
index 12f187688..000000000
--- a/src/Orchard.Web/Modules/Upgrade/App.config
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <runtime>
-        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-            <dependentAssembly>
-                <assemblyIdentity name="NHibernate" publicKeyToken="AA95F207798DFDB4" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.0.4000" newVersion="4.0.0.4000"/>
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="Iesi.Collections" publicKeyToken="AA95F207798DFDB4" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="Autofac" publicKeyToken="17863AF14B0044DA" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-3.5.0.0" newVersion="3.5.0.0"/>
-            </dependentAssembly>
-        </assemblyBinding>
-    </runtime>
-</configuration>
diff --git a/src/Orchard.Web/Modules/Upgrade/Controllers/ContentPickerController.cs b/src/Orchard.Web/Modules/Upgrade/Controllers/ContentPickerController.cs
index a03884861..859c4bcd0 100644
--- a/src/Orchard.Web/Modules/Upgrade/Controllers/ContentPickerController.cs
+++ b/src/Orchard.Web/Modules/Upgrade/Controllers/ContentPickerController.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Transactions;
 using System.Web.Mvc;
 using Orchard;
 using Orchard.Environment.Features;
diff --git a/src/Orchard.Web/Modules/Upgrade/Controllers/MenuController.cs b/src/Orchard.Web/Modules/Upgrade/Controllers/MenuController.cs
index 56be01d4c..a9fc57865 100644
--- a/src/Orchard.Web/Modules/Upgrade/Controllers/MenuController.cs
+++ b/src/Orchard.Web/Modules/Upgrade/Controllers/MenuController.cs
@@ -8,7 +8,6 @@ using Orchard.Localization;
 using Orchard.Security;
 using Orchard.UI.Admin;
 using Orchard.UI.Notify;
-using Orchard.Widgets.Models;
 using Orchard.Widgets.Services;
 
 namespace Upgrade.Controllers {
diff --git a/src/Orchard.Web/Modules/Upgrade/Controllers/RouteController.cs b/src/Orchard.Web/Modules/Upgrade/Controllers/RouteController.cs
index 0de17db86..655ef2058 100644
--- a/src/Orchard.Web/Modules/Upgrade/Controllers/RouteController.cs
+++ b/src/Orchard.Web/Modules/Upgrade/Controllers/RouteController.cs
@@ -9,7 +9,6 @@ using Orchard.Autoroute.Services;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.MetaData;
 using Orchard.Core.Common.Models;
-using Orchard.Core.Containers.Models;
 using Orchard.Core.Title.Models;
 using Orchard.Data;
 using Orchard.Environment.Configuration;
diff --git a/src/Orchard.Web/Modules/Upgrade/Controllers/TaxonomyController.cs b/src/Orchard.Web/Modules/Upgrade/Controllers/TaxonomyController.cs
index 09c62f5b6..35b81d12e 100644
--- a/src/Orchard.Web/Modules/Upgrade/Controllers/TaxonomyController.cs
+++ b/src/Orchard.Web/Modules/Upgrade/Controllers/TaxonomyController.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Transactions;
 using System.Web.Mvc;
 using Orchard;
 using Orchard.Environment.Features;
diff --git a/src/Orchard.Web/Modules/Upgrade/Scripts/Web.config b/src/Orchard.Web/Modules/Upgrade/Scripts/Web.config
deleted file mode 100644
index 7806fcc84..000000000
--- a/src/Orchard.Web/Modules/Upgrade/Scripts/Web.config
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-  <system.webServer>
-    <staticContent>
-      <clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
-    </staticContent>
-
-    <handlers accessPolicy="Script,Read">
-      <!--
-      iis7 - for any request to a file exists on disk, return it via native http module.
-      accessPolicy 'Script' is to allow for a managed 404 page.
-      -->
-      <add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
-    </handlers>
-  </system.webServer>
-</configuration>
diff --git a/src/Orchard.Web/Modules/Upgrade/Services/UpgradeService.cs b/src/Orchard.Web/Modules/Upgrade/Services/UpgradeService.cs
index 6446fe5aa..5c5fc3621 100644
--- a/src/Orchard.Web/Modules/Upgrade/Services/UpgradeService.cs
+++ b/src/Orchard.Web/Modules/Upgrade/Services/UpgradeService.cs
@@ -3,8 +3,6 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
 using System.Linq;
-using NHibernate.Dialect;
-using NHibernate.Tool.hbm2ddl;
 using Orchard.Data;
 using Orchard.Environment.Configuration;
 using Orchard.Logging;
diff --git a/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj b/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj
index a01e5841f..e133c0f4a 100644
--- a/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj
+++ b/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj
@@ -7,7 +7,7 @@
     <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8A9FDB57-342D-49C2-BAFC-D885AAE5CC7C}</ProjectGuid>
-    <ProjectTypeGuids>{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Upgrade</RootNamespace>
@@ -17,9 +17,13 @@
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>4.0</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
+    <UpgradeBackupLocation />
     <TargetFrameworkProfile />
+    <UseIISExpress>false</UseIISExpress>
+    <IISExpressSSLPort />
+    <IISExpressAnonymousAuthentication />
+    <IISExpressWindowsAuthentication />
+    <IISExpressUseClassicPipelineMode />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -48,7 +52,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\lib\newtonsoft.json\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NHibernate, Version=3.3.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+    <Reference Include="NHibernate, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\lib\nhibernate\NHibernate.dll</HintPath>
     </Reference>
@@ -59,11 +63,16 @@
     </Reference>
     <Reference Include="System.Transactions" />
     <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\lib\aspnetwebapi\System.Web.Http.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="System.Web" />
+    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Web.Abstractions" />
     <Reference Include="System.Web.Routing" />
     <Reference Include="System.Xml" />
@@ -74,14 +83,8 @@
     <Content Include="Styles\images\menu.upgrade.png" />
     <Content Include="Styles\menu.upgrade-admin.css" />
     <Content Include="Web.config" />
-    <Content Include="Scripts\Web.config" />
     <Content Include="Styles\Web.config" />
-    <Compile Include="Controllers\ContentPickerController.cs" />
-    <Compile Include="Controllers\InfosetController.cs" />
-    <Compile Include="Controllers\MessagingController.cs" />
-    <Compile Include="Controllers\TaxonomyController.cs" />
-    <Compile Include="Controllers\MediaController.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Content Include="Properties\AssemblyInfo.cs" />
     <Content Include="Module.txt" />
   </ItemGroup>
   <ItemGroup>
@@ -93,16 +96,12 @@
       <Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
       <Name>Orchard.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Orchard.Alias\Orchard.Alias.csproj">
-      <Project>{475B6C45-B27C-438B-8966-908B9D6D1077}</Project>
-      <Name>Orchard.Alias</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Orchard.Autoroute\Orchard.Autoroute.csproj">
-      <Project>{66FCCD76-2761-47E3-8D11-B45D0001DDAA}</Project>
+      <Project>{66fccd76-2761-47e3-8d11-b45d0001ddaa}</Project>
       <Name>Orchard.Autoroute</Name>
     </ProjectReference>
     <ProjectReference Include="..\Orchard.Email\Orchard.Email.csproj">
-      <Project>{05660F47-D649-48BD-9DED-DF4E01E7CFF9}</Project>
+      <Project>{05660f47-d649-48bd-9ded-df4e01e7cff9}</Project>
       <Name>Orchard.Email</Name>
     </ProjectReference>
     <ProjectReference Include="..\Orchard.MediaLibrary\Orchard.MediaLibrary.csproj">
@@ -110,7 +109,7 @@
       <Name>Orchard.MediaLibrary</Name>
     </ProjectReference>
     <ProjectReference Include="..\Orchard.Widgets\Orchard.Widgets.csproj">
-      <Project>{194D3CCC-1153-474D-8176-FDE8D7D0D0BD}</Project>
+      <Project>{194d3ccc-1153-474d-8176-fde8d7d0d0bd}</Project>
       <Name>Orchard.Widgets</Name>
     </ProjectReference>
     <ProjectReference Include="..\Orchard.Workflows\Orchard.Workflows.csproj">
@@ -120,40 +119,27 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AdminMenu.cs" />
-    <Compile Include="Controllers\MenuController.cs" />
+    <Compile Include="Controllers\ContentPickerController.cs" />
     <Compile Include="Controllers\FieldController.cs" />
+    <Compile Include="Controllers\InfosetController.cs" />
+    <Compile Include="Controllers\MediaController.cs" />
+    <Compile Include="Controllers\MenuController.cs" />
+    <Compile Include="Controllers\MessagingController.cs" />
     <Compile Include="Controllers\RouteController.cs" />
+    <Compile Include="Controllers\TaxonomyController.cs" />
     <Compile Include="Services\IUpgradeService.cs" />
     <Compile Include="Services\UpgradeService.cs" />
     <Compile Include="ViewModels\MigrateViewModel.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Models\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Field\Index.cshtml" />
-    <Content Include="Views\Route\Index.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Menu\Index.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Media\Index.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Taxonomy\Index.cshtml" />
-  </ItemGroup>
   <ItemGroup>
     <Content Include="Views\ContentPicker\Index.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
+    <Content Include="Views\Field\Index.cshtml" />
     <Content Include="Views\Infoset\Index.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
+    <Content Include="Views\Media\Index.cshtml" />
+    <Content Include="Views\Menu\Index.cshtml" />
     <Content Include="Views\Messaging\Index.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
+    <Content Include="Views\Route\Index.cshtml" />
+    <Content Include="Views\Taxonomy\Index.cshtml" />
   </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -181,5 +167,22 @@
   <Target Name="AfterBuildCompiler" Condition="'$(MvcBuildViews)'=='true'">
     <AspNetCompiler VirtualPath="temp" PhysicalPath="$(ProjectDir)\..\$(ProjectName)" />
   </Target>
-  <ProjectExtensions />
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <UseIIS>False</UseIIS>
+          <AutoAssignPort>True</AutoAssignPort>
+          <DevelopmentServerPort>45979</DevelopmentServerPort>
+          <DevelopmentServerVPath>/</DevelopmentServerVPath>
+          <IISUrl>
+          </IISUrl>
+          <NTLMAuthentication>False</NTLMAuthentication>
+          <UseCustomServer>True</UseCustomServer>
+          <CustomServerUrl>http://orchard.codeplex.com</CustomServerUrl>
+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+        </WebProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Upgrade/Web.config b/src/Orchard.Web/Modules/Upgrade/Web.config
index bbe1ba47c..58d1ed1af 100644
--- a/src/Orchard.Web/Modules/Upgrade/Web.config
+++ b/src/Orchard.Web/Modules/Upgrade/Web.config
@@ -1,42 +1,60 @@
 <?xml version="1.0"?>
 <configuration>
 
-  <configSections>
-    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-      <remove name="host" />
-      <remove name="pages" />
-      <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
-    </sectionGroup>
-  </configSections>
+    <configSections>
+        <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+            <remove name="host" />
+            <remove name="pages" />
+            <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
+            <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.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=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-    <pages pageBaseType="Orchard.Mvc.ViewEngines.Razor.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="System.Web.WebPages" />
-        <add namespace="System.Linq"/>
-        <add namespace="System.Collections.Generic"/>
-        <add namespace="Orchard.Mvc.Html"/>
-      </namespaces>
-    </pages>
-  </system.web.webPages.razor>
+    <system.web.webPages.razor>
+        <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+        <pages pageBaseType="Orchard.Mvc.ViewEngines.Razor.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="System.Web.WebPages" />
+                <add namespace="System.Linq"/>
+                <add namespace="System.Collections.Generic"/>
+                <add namespace="Orchard.Mvc.Html"/>
+            </namespaces>
+        </pages>
+    </system.web.webPages.razor>
 
-  <system.web>
-    <compilation targetFramework="4.5">
-      <assemblies>
-        <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
-        <add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
-        <add assembly="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
-        <add assembly="System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-        <add assembly="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
-        <add assembly="System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-      </assemblies>
-    </compilation>
-  </system.web>
+    <system.web>
+        <compilation targetFramework="4.5">
+            <assemblies>
+                <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+                <add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+                <add assembly="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+                <add assembly="System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+                <add assembly="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+                <add assembly="System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+            </assemblies>
+        </compilation>
+    </system.web>
+
+    <runtime>
+        <!-- NOTE: These binding redirects have no runtime effect; they are only here to avoid build warnings. -->
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly>
+                <assemblyIdentity name="NHibernate" publicKeyToken="AA95F207798DFDB4" culture="neutral"/>
+                <bindingRedirect oldVersion="0.0.0.0-4.0.0.4000" newVersion="4.0.0.4000"/>
+            </dependentAssembly>
+            <dependentAssembly>
+                <assemblyIdentity name="Iesi.Collections" publicKeyToken="AA95F207798DFDB4" culture="neutral"/>
+                <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
+            </dependentAssembly>
+            <dependentAssembly>
+                <assemblyIdentity name="Autofac" publicKeyToken="17863AF14B0044DA" culture="neutral"/>
+                <bindingRedirect oldVersion="0.0.0.0-3.5.0.0" newVersion="3.5.0.0"/>
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
 
 </configuration>