Created
February 23, 2012 17:27
-
-
Save chrisortman/1893913 to your computer and use it in GitHub Desktop.
Project file diff upgrading mvc3 to mvc4 beta
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| <Reference Include="System.Core" /> | |
| <Reference Include="System.Data.DataSetExtensions" /> | |
| <Reference Include="System.Web.Extensions" /> | |
| - <Reference Include="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> | |
| - <SpecificVersion>False</SpecificVersion> | |
| - <HintPath>..\..\lib\AspMvc-3.0\System.Web.Helpers.dll</HintPath> | |
| - <Private>False</Private> | |
| + <Reference Include="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">^M | |
| + <Private>True</Private>^M | |
| + <HintPath>..\..\packages\AspNetWebPages.Core.2.0.20126.16343\lib\net40\System.Web.Helpers.dll</HintPath>^M | |
| </Reference> | |
| - <Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> | |
| - <SpecificVersion>False</SpecificVersion> | |
| - <HintPath>..\..\lib\AspMvc-3.0\System.Web.Mvc.dll</HintPath> | |
| - <Private>False</Private> | |
| + <Reference Include="System.Web.Http.Common, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"+ <Private>True</Private>^M | |
| + <HintPath>..\..\packages\System.Web.Http.Common.4.0.20126.16343\lib\net40\System.Web.Http.Common.dll</HintPath>^M | |
| </Reference> | |
| - <Reference Include="System.Web.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> | |
| - <SpecificVersion>False</SpecificVersion> | |
| - <HintPath>..\..\lib\AspMvc-3.0\System.Web.Razor.dll</HintPath> | |
| - <Private>False</Private> | |
| + <Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">^M | |
| + <Private>True</Private>^M | |
| + <HintPath>..\..\packages\AspNetMvc.4.0.20126.16343\lib\net40\System.Web.Mvc.dll</HintPath>^M | |
| + </Reference>^M | |
| + <Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">^M | |
| + <Private>True</Private>^M | |
| + <HintPath>..\..\packages\AspNetRazor.Core.2.0.20126.16343\lib\net40\System.Web.Razor.dll</HintPath>^M | |
| </Reference> | |
| <Reference Include="System.Web.Routing" /> | |
| - <Reference Include="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> | |
| - <HintPath>..\..\..\..\..\..\Program Files (x86)\Microsoft ASP.NET\ASP.NET Web Pages\v1.0\Assemblies\System.Web.WebPages.dll</HintPath> | |
| + <Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">^M+ <Private>True</Private>^M | |
| + <HintPath>..\..\packages\AspNetWebPages.Core.2.0.20126.16343\lib\net40\System.Web.WebPages.dll</HintPath>^M | |
| + </Reference>^M | |
| + <Reference Include="System.Web.WebPages.Deployment, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitectu+ <Private>True</Private>^M | |
| + <HintPath>..\..\packages\AspNetWebPages.Core.2.0.20126.16343\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>^M | |
| + </Reference>^M | |
| + <Reference Include="System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MS+ <Private>True</Private>^M | |
| + <HintPath>..\..\packages\AspNetWebPages.Core.2.0.20126.16343\lib\net40\System.Web.WebPages.Razor.dll</HintPath>^M | |
| </Reference> | |
| <Reference Include="System.Xml.Linq" /> | |
| <Reference Include="System.Drawing" /> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| <!-- MVC SETTINGS-->^M | |
| + <add key="webpages:Version" value="2.0.0.0" />^M | |
| + <add key="webpages:Enabled" value="true" />^M | |
| <add key="ClientValidationEnabled" value="true" /> | |
| <add key="UnobtrusiveJavaScriptEnabled" value="true" /> | |
| + <add key="PreserveLoginUrl" value="true"/> ^M | |
| + ^M | |
| + ^M | |
| <add key="Languages" value="" /> | |
| </appSettings> | |
| <connectionStrings> | |
| @@ -34,10 +41,10 @@ | |
| <compilation debug="true" batch="false" targetFramework="4.0"> | |
| <assemblies> | |
| <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" /> | |
| - <add assembly="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" /> | |
| + <add assembly="System.Web.Helpers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />^M | |
| <add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" /> | |
| - <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" /> | |
| - <add assembly="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" /> | |
| + <add assembly="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />^M | |
| + <add assembly="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />^M | |
| <add assembly="System.ComponentModel.Composition, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> | |
| </assemblies> | |
| </compilation> | |
| @@ -83,10 +90,6 @@ | |
| <runtime> | |
| <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | |
| <dependentAssembly> | |
| - <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" /> | |
| - <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" /> | |
| - </dependentAssembly> | |
| - <dependentAssembly> | |
| <assemblyIdentity name="IS.Security.IO" culture="neutral" /> | |
| <bindingRedirect oldVersion="0.0.0.0-6.3.0.20" newVersion="6.3.0.20" /> | |
| </dependentAssembly> | |
| @@ -106,10 +109,21 @@ | |
| <assemblyIdentity name="EntityFramework" publicKeyToken="b77a5c561934e089" culture="neutral" /> | |
| <bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" /> | |
| </dependentAssembly> | |
| - <dependentAssembly> | |
| - <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" /> | |
| - <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" /> | |
| - </dependentAssembly> | |
| + <dependentAssembly>^M | |
| + <assemblyIdentity name="System.Web.Helpers"^M | |
| + publicKeyToken="31bf3856ad364e35" />^M | |
| + <bindingRedirect oldVersion="1.0.0.0" newVersion="2.0.0.0"/>^M | |
| + </dependentAssembly>^M | |
| + <dependentAssembly>^M | |
| + <assemblyIdentity name="System.Web.Mvc"^M | |
| + publicKeyToken="31bf3856ad364e35" />^M | |
| + <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="4.0.0.0"/>^M | |
| + </dependentAssembly>^M | |
| + <dependentAssembly>^M | |
| + <assemblyIdentity name="System.Web.WebPages"^M | |
| + publicKeyToken="31bf3856ad364e35" />^M | |
| + <bindingRedirect oldVersion="1.0.0.0" newVersion="2.0.0.0"/>^M | |
| + </dependentAssembly>^M | |
| </assemblyBinding> | |
| </runtime> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| <configuration> | |
| <configSections> | |
| - <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Raz+ <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Raz <remove name="host" /> | |
| <remove name="pages" /> | |
| - <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neut- <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=1.0.0.0, Cultu+ <section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neut+ <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=2.0.0.0, Cultu </sectionGroup> | |
| </configSections> | |
| @@ -26,11 +26,11 @@ | |
| controller or action. | |
| --> | |
| <pages validateRequest="false" | |
| - pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD- pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" | |
| - userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35+ pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD+ pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"^M | |
| + userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35 <controls> | |
| - <add assembly="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix+ <add assembly="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix </controls> | |
| <namespaces> | |
| <add namespace="CustomerPortal.Web.Lib" /> | |
| @@ -40,7 +40,7 @@ | |
| </system.web> | |
| <system.web.webPages.razor> | |
| - <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E3+ <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E3 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment