Permalink
Browse files

Replace direct reference to the Formatting.Html project to the NuGet …

…package.
  • Loading branch information...
1 parent 64c2382 commit c0066a37b6d3b23a481130a4ad10a30faf864fd9 @panesofglass panesofglass committed Aug 29, 2012
@@ -9,8 +9,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{4C93B8
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApiContrib.RazorViewEngine.Tests", "test\WebApiContrib.Formatting.RazorViewEngine.Tests\WebApiContrib.RazorViewEngine.Tests.csproj", "{960EDBC5-0C46-4CD7-B0B6-B4D5F30B9092}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApiContrib.Formatting.Html", "src\WebApiContrib.Formatting.Html\WebApiContrib.Formatting.Html.csproj", "{1055BCC1-BBB1-45F2-8260-E00959A6AC89}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApiContrib.Formatting.Razor", "src\WebApiContrib.Formatting.Razor\WebApiContrib.Formatting.Razor.csproj", "{8C15B0D3-9108-4EA3-AE19-3C9571266C47}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcWebApiSiteTest", "samples\MvcWebApiSiteTest\MvcWebApiSiteTest.csproj", "{5D90E626-1C40-4B23-887A-DC2527D696CB}"
@@ -25,10 +23,6 @@ Global
{960EDBC5-0C46-4CD7-B0B6-B4D5F30B9092}.Debug|Any CPU.Build.0 = Debug|Any CPU
{960EDBC5-0C46-4CD7-B0B6-B4D5F30B9092}.Release|Any CPU.ActiveCfg = Release|Any CPU
{960EDBC5-0C46-4CD7-B0B6-B4D5F30B9092}.Release|Any CPU.Build.0 = Release|Any CPU
- {1055BCC1-BBB1-45F2-8260-E00959A6AC89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1055BCC1-BBB1-45F2-8260-E00959A6AC89}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1055BCC1-BBB1-45F2-8260-E00959A6AC89}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1055BCC1-BBB1-45F2-8260-E00959A6AC89}.Release|Any CPU.Build.0 = Release|Any CPU
{8C15B0D3-9108-4EA3-AE19-3C9571266C47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8C15B0D3-9108-4EA3-AE19-3C9571266C47}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8C15B0D3-9108-4EA3-AE19-3C9571266C47}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -42,6 +42,9 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
+ <Reference Include="Newtonsoft.Json">
+ <HintPath>..\..\packages\Newtonsoft.Json.4.5.8\lib\net40\Newtonsoft.Json.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Data.Entity" />
@@ -64,9 +67,6 @@
<Private>True</Private>
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference>
- <Reference Include="Newtonsoft.Json">
- <HintPath>..\..\packages\Newtonsoft.Json.4.5.6\lib\net40\Newtonsoft.Json.dll</HintPath>
- </Reference>
<Reference Include="System.Net.Http">
<Private>True</Private>
<HintPath>..\..\packages\Microsoft.Net.Http.2.0.20710.0\lib\net40\System.Net.Http.dll</HintPath>
@@ -114,6 +114,9 @@
<Private>True</Private>
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
</Reference>
+ <Reference Include="WebApiContrib.Formatting.Html">
+ <HintPath>..\..\packages\WebApiContrib.Formatting.Html.0.9.4\lib\net40\WebApiContrib.Formatting.Html.dll</HintPath>
+ </Reference>
<Reference Include="WebGrease">
<Private>True</Private>
<HintPath>..\..\packages\WebGrease.1.1.0\lib\WebGrease.dll</HintPath>
@@ -247,10 +250,6 @@
<Content Include="packages.config" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\src\WebApiContrib.Formatting.Html\WebApiContrib.Formatting.Html.csproj">
- <Project>{1055bcc1-bbb1-45f2-8260-e00959a6ac89}</Project>
- <Name>WebApiContrib.Formatting.Html</Name>
- </ProjectReference>
<ProjectReference Include="..\..\src\WebApiContrib.Formatting.Razor\WebApiContrib.Formatting.Razor.csproj">
<Project>{8c15b0d3-9108-4ea3-ae19-3c9571266c47}</Project>
<Name>WebApiContrib.Formatting.Razor</Name>
@@ -1,91 +1,95 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- For more information on how to configure your ASP.NET application, please visit
- http://go.microsoft.com/fwlink/?LinkId=169433
- -->
-<configuration>
- <configSections>
- <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
- <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=4.4.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
- </configSections>
- <connectionStrings>
- <add name="DefaultConnection" providerName="System.Data.SqlClient" connectionString="Data Source=(LocalDb)\v11.0;Initial Catalog=aspnet-MvcWebApiSiteTest-20120821092832;Integrated Security=SSPI;AttachDBFilename=|DataDirectory|\aspnet-MvcWebApiSiteTest-20120821092832.mdf" />
- </connectionStrings>
- <appSettings>
- <add key="webpages:Version" value="2.0.0.0" />
- <add key="webpages:Enabled" value="false" />
- <add key="PreserveLoginUrl" value="true" />
- <add key="ClientValidationEnabled" value="true" />
- <add key="UnobtrusiveJavaScriptEnabled" value="true" />
- </appSettings>
- <system.web>
- <compilation debug="true" targetFramework="4.0" />
- <authentication mode="None" />
- <pages>
- <namespaces>
- <add namespace="System.Web.Helpers" />
- <add namespace="System.Web.Mvc" />
- <add namespace="System.Web.Mvc.Ajax" />
- <add namespace="System.Web.Mvc.Html" />
- <add namespace="System.Web.Optimization" />
- <add namespace="System.Web.Routing" />
- <add namespace="System.Web.WebPages" />
- </namespaces>
- </pages>
- <profile defaultProvider="DefaultProfileProvider">
- <providers>
- <add name="DefaultProfileProvider" type="System.Web.Providers.DefaultProfileProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" applicationName="/" />
- </providers>
- </profile>
- <membership defaultProvider="DefaultMembershipProvider">
- <providers>
- <add name="DefaultMembershipProvider" type="System.Web.Providers.DefaultMembershipProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="/" />
- </providers>
- </membership>
- <roleManager defaultProvider="DefaultRoleProvider">
- <providers>
- <add name="DefaultRoleProvider" type="System.Web.Providers.DefaultRoleProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" applicationName="/" />
- </providers>
- </roleManager>
- <sessionState mode="InProc" customProvider="DefaultSessionProvider">
- <providers>
- <add name="DefaultSessionProvider" type="System.Web.Providers.DefaultSessionStateProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" />
- </providers>
- </sessionState>
- </system.web>
- <system.webServer>
- <validation validateIntegratedModeConfiguration="false" />
- <modules runAllManagedModulesForAllRequests="true" />
- <handlers>
- <remove name="ExtensionlessUrlHandler-ISAPI-4.0_32bit" />
- <remove name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" />
- <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
- <add name="ExtensionlessUrlHandler-ISAPI-4.0_32bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
- <add name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
- <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
- </handlers>
- </system.webServer>
- <runtime>
- <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
- <dependentAssembly>
- <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
- <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
- <bindingRedirect oldVersion="1.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
- </dependentAssembly>
- <dependentAssembly>
- <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
- <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
- </dependentAssembly>
- </assemblyBinding>
- </runtime>
- <entityFramework>
- <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
- <parameters>
- <parameter value="v11.0" />
- </parameters>
- </defaultConnectionFactory>
- </entityFramework>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ For more information on how to configure your ASP.NET application, please visit
+ http://go.microsoft.com/fwlink/?LinkId=169433
+ -->
+<configuration>
+ <configSections>
+ <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+ <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=4.4.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+ </configSections>
+ <connectionStrings>
+ <add name="DefaultConnection" providerName="System.Data.SqlClient" connectionString="Data Source=(LocalDb)\v11.0;Initial Catalog=aspnet-MvcWebApiSiteTest-20120821092832;Integrated Security=SSPI;AttachDBFilename=|DataDirectory|\aspnet-MvcWebApiSiteTest-20120821092832.mdf" />
+ </connectionStrings>
+ <appSettings>
+ <add key="webpages:Version" value="2.0.0.0" />
+ <add key="webpages:Enabled" value="false" />
+ <add key="PreserveLoginUrl" value="true" />
+ <add key="ClientValidationEnabled" value="true" />
+ <add key="UnobtrusiveJavaScriptEnabled" value="true" />
+ </appSettings>
+ <system.web>
+ <compilation debug="true" targetFramework="4.0" />
+ <authentication mode="None" />
+ <pages>
+ <namespaces>
+ <add namespace="System.Web.Helpers" />
+ <add namespace="System.Web.Mvc" />
+ <add namespace="System.Web.Mvc.Ajax" />
+ <add namespace="System.Web.Mvc.Html" />
+ <add namespace="System.Web.Optimization" />
+ <add namespace="System.Web.Routing" />
+ <add namespace="System.Web.WebPages" />
+ </namespaces>
+ </pages>
+ <profile defaultProvider="DefaultProfileProvider">
+ <providers>
+ <add name="DefaultProfileProvider" type="System.Web.Providers.DefaultProfileProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" applicationName="/" />
+ </providers>
+ </profile>
+ <membership defaultProvider="DefaultMembershipProvider">
+ <providers>
+ <add name="DefaultMembershipProvider" type="System.Web.Providers.DefaultMembershipProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="/" />
+ </providers>
+ </membership>
+ <roleManager defaultProvider="DefaultRoleProvider">
+ <providers>
+ <add name="DefaultRoleProvider" type="System.Web.Providers.DefaultRoleProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" applicationName="/" />
+ </providers>
+ </roleManager>
+ <sessionState mode="InProc" customProvider="DefaultSessionProvider">
+ <providers>
+ <add name="DefaultSessionProvider" type="System.Web.Providers.DefaultSessionStateProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" />
+ </providers>
+ </sessionState>
+ </system.web>
+ <system.webServer>
+ <validation validateIntegratedModeConfiguration="false" />
+ <modules runAllManagedModulesForAllRequests="true" />
+ <handlers>
+ <remove name="ExtensionlessUrlHandler-ISAPI-4.0_32bit" />
+ <remove name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" />
+ <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
+ <add name="ExtensionlessUrlHandler-ISAPI-4.0_32bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
+ <add name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
+ <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
+ </handlers>
+ </system.webServer>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
+ <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
+ <bindingRedirect oldVersion="1.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
+ <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+ <entityFramework>
+ <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
+ <parameters>
+ <parameter value="v11.0" />
+ </parameters>
+ </defaultConnectionFactory>
+ </entityFramework>
</configuration>
@@ -1,25 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="EntityFramework" version="5.0.0" targetFramework="net40" />
- <package id="jQuery" version="1.7.1.1" targetFramework="net40" />
- <package id="jQuery.UI.Combined" version="1.8.20.1" targetFramework="net40" />
- <package id="jQuery.Validation" version="1.9.0.1" targetFramework="net40" />
- <package id="knockoutjs" version="2.1.0" targetFramework="net40" />
- <package id="Microsoft.AspNet.Mvc" version="4.0.20710.0" targetFramework="net40" />
- <package id="Microsoft.AspNet.Providers.Core" version="1.1" targetFramework="net40" />
- <package id="Microsoft.AspNet.Providers.LocalDB" version="1.1" targetFramework="net40" />
- <package id="Microsoft.AspNet.Razor" version="2.0.20710.0" targetFramework="net40" />
- <package id="Microsoft.AspNet.Web.Optimization" version="1.0.0" targetFramework="net40" />
- <package id="Microsoft.AspNet.WebApi" version="4.0.20710.0" targetFramework="net40" />
- <package id="Microsoft.AspNet.WebApi.Client" version="4.0.20710.0" targetFramework="net40" />
- <package id="Microsoft.AspNet.WebApi.Core" version="4.0.20710.0" targetFramework="net40" />
- <package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.20710.0" targetFramework="net40" />
- <package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net40" />
- <package id="Microsoft.jQuery.Unobtrusive.Ajax" version="2.0.20710.0" targetFramework="net40" />
- <package id="Microsoft.jQuery.Unobtrusive.Validation" version="2.0.20710.0" targetFramework="net40" />
- <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40" />
- <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
- <package id="Modernizr" version="2.5.3" targetFramework="net40" />
- <package id="Newtonsoft.Json" version="4.5.6" targetFramework="net40" />
- <package id="WebGrease" version="1.1.0" targetFramework="net40" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="EntityFramework" version="5.0.0" targetFramework="net40" />
+ <package id="jQuery" version="1.7.1.1" targetFramework="net40" />
+ <package id="jQuery.UI.Combined" version="1.8.20.1" targetFramework="net40" />
+ <package id="jQuery.Validation" version="1.9.0.1" targetFramework="net40" />
+ <package id="knockoutjs" version="2.1.0" targetFramework="net40" />
+ <package id="Microsoft.AspNet.Mvc" version="4.0.20710.0" targetFramework="net40" />
+ <package id="Microsoft.AspNet.Providers.Core" version="1.1" targetFramework="net40" />
+ <package id="Microsoft.AspNet.Providers.LocalDB" version="1.1" targetFramework="net40" />
+ <package id="Microsoft.AspNet.Razor" version="2.0.20710.0" targetFramework="net40" />
+ <package id="Microsoft.AspNet.Web.Optimization" version="1.0.0" targetFramework="net40" />
+ <package id="Microsoft.AspNet.WebApi" version="4.0.20710.0" targetFramework="net40" />
+ <package id="Microsoft.AspNet.WebApi.Client" version="4.0.20710.0" targetFramework="net40" />
+ <package id="Microsoft.AspNet.WebApi.Core" version="4.0.20710.0" targetFramework="net40" />
+ <package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.20710.0" targetFramework="net40" />
+ <package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net40" />
+ <package id="Microsoft.jQuery.Unobtrusive.Ajax" version="2.0.20710.0" targetFramework="net40" />
+ <package id="Microsoft.jQuery.Unobtrusive.Validation" version="2.0.20710.0" targetFramework="net40" />
+ <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40" />
+ <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
+ <package id="Modernizr" version="2.5.3" targetFramework="net40" />
+ <package id="Newtonsoft.Json" version="4.5.8" targetFramework="net40" />
+ <package id="WebApiContrib.Formatting.Html" version="0.9.4" targetFramework="net40" />
+ <package id="WebGrease" version="1.1.0" targetFramework="net40" />
</packages>
Oops, something went wrong.

0 comments on commit c0066a3

Please sign in to comment.