Skip to content

Commit

Permalink
Updated NInject.MVC5 - Was still using an old MVC3 version.
Browse files Browse the repository at this point in the history
  • Loading branch information
@maartenba
maartenba committed Jul 16, 2015
1 parent 6befbf5 commit 5761070
Show file tree
Hide file tree
Showing 7 changed files with 55 additions and 28 deletions.
4 changes: 3 additions & 1 deletion src/NuGetGallery.Operations/NuGetGallery.Operations.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,9 @@
<Compile Include="Util.cs" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="app.config">
<SubType>Designer</SubType>
</None>
<None Include="packages.config" />
<None Include="Service References\SqlDac\Microsoft.SqlServer.Management.Dac.Services.wsdl" />
<None Include="Service References\SqlDac\Microsoft.SqlServer.Management.Dac.ServiceTypes.xsd">
Expand Down
1 change: 1 addition & 0 deletions src/NuGetGallery/App_Start/NinjectWebCommon.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// this file exists because the NInject.MVC5 package wants to add it. By having this placeholder in, we can avoid that package from messing up our modules.
26 changes: 17 additions & 9 deletions src/NuGetGallery/NuGetGallery.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,16 +285,17 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Ninject, Version=3.0.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Ninject.3.0.1.10\lib\net45-full\Ninject.dll</HintPath>
<Reference Include="Ninject, Version=3.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
<HintPath>..\..\packages\Ninject.3.2.0.0\lib\net45-full\Ninject.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Ninject.Web.Common">
<HintPath>..\..\packages\Ninject.Web.Common.3.0.0.7\lib\net45-full\Ninject.Web.Common.dll</HintPath>
<Reference Include="Ninject.Web.Common, Version=3.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
<HintPath>..\..\packages\Ninject.Web.Common.3.2.0.0\lib\net45-full\Ninject.Web.Common.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Ninject.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Ninject.MVC3.3.0.0.6\lib\net45-full\Ninject.Web.Mvc.dll</HintPath>
<Reference Include="Ninject.Web.Mvc, Version=3.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
<HintPath>..\..\packages\Ninject.MVC5.3.2.1.0\lib\net45-full\Ninject.Web.Mvc.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NuGet.Core, Version=2.8.60623.89, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\NuGet.Core.2.8.6\lib\net40-Client\NuGet.Core.dll</HintPath>
Expand Down Expand Up @@ -396,6 +397,10 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\WebActivator.1.5\lib\net40\WebActivator.dll</HintPath>
</Reference>
<Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
<HintPath>..\..\packages\WebActivatorEx.2.0\lib\net40\WebActivatorEx.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="WebBackgrounder">
<HintPath>..\..\packages\WebBackgrounder.0.2.0\lib\net40\WebBackgrounder.dll</HintPath>
</Reference>
Expand All @@ -417,6 +422,7 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="App_Start\NinjectWebCommon.cs" />
<Compile Include="Authentication\FeedOnlyModeException.cs" />
<Compile Include="Controllers\NuGetContext.cs" />
<Compile Include="Extensions\DateTimeExtensions.cs" />
Expand Down Expand Up @@ -1336,7 +1342,9 @@
<Content Include="Scripts\knockout-2.2.1.debug.js" />
<Content Include="Scripts\knockout-2.2.1.js" />
<Content Include="Scripts\stats.js" />
<Content Include="Web.config" />
<Content Include="Web.config">
<SubType>Designer</SubType>
</Content>
<Content Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</Content>
Expand Down
8 changes: 5 additions & 3 deletions src/NuGetGallery/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,10 @@
<package id="MvcHaack.Ajax.MVC4" version="2.0.0.0" targetFramework="net45" />
<package id="MvcTreeView" version="1.4" targetFramework="net40" />
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
<package id="Ninject" version="3.0.1.10" targetFramework="net45" />
<package id="Ninject.MVC3" version="3.0.0.6" targetFramework="net45" />
<package id="Ninject.Web.Common" version="3.0.0.7" targetFramework="net45" />
<package id="Ninject" version="3.2.0.0" targetFramework="net45" />
<package id="Ninject.MVC5" version="3.2.1.0" targetFramework="net45" />
<package id="Ninject.Web.Common" version="3.2.0.0" targetFramework="net45" />
<package id="Ninject.Web.Common.WebHost" version="3.2.0.0" targetFramework="net45" />
<package id="NuGet.Core" version="2.8.6" targetFramework="net45" />
<package id="NuGet.Services.Build" version="3.0.8" targetFramework="net45" developmentDependency="true" />
<package id="NuGet.Services.Platform.Client" version="3.0.29-r-master" targetFramework="net45" />
Expand All @@ -71,6 +72,7 @@
<package id="RouteMagic" version="1.1.3" />
<package id="System.Spatial" version="5.6.2" targetFramework="net45" />
<package id="WebActivator" version="1.5" targetFramework="net45" />
<package id="WebActivatorEx" version="2.0" targetFramework="net45" />
<package id="WebBackgrounder" version="0.2.0" targetFramework="net40" />
<package id="WebBackgrounder.EntityFramework" version="0.1" />
<package id="WebGrease" version="1.1.0" targetFramework="net45" />
Expand Down
1 change: 1 addition & 0 deletions tests/NuGetGallery.Facts/App_Start/NinjectWebCommon.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// this file exists because the NInject.MVC5 package wants to add it. By having this placeholder in, we can avoid that package from messing up our modules.
31 changes: 21 additions & 10 deletions tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,19 +121,25 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Ninject, Version=3.0.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Ninject.3.0.1.10\lib\net45-full\Ninject.dll</HintPath>
<Reference Include="Ninject, Version=3.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
<HintPath>..\..\packages\Ninject.3.2.0.0\lib\net45-full\Ninject.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Ninject.MockingKernel">
<HintPath>..\..\packages\Ninject.MockingKernel.3.0.0.5\lib\net45-full\Ninject.MockingKernel.dll</HintPath>
<Reference Include="Ninject.MockingKernel, Version=3.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
<HintPath>..\..\packages\Ninject.MockingKernel.3.2.0.0\lib\net45-full\Ninject.MockingKernel.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Ninject.MockingKernel.Moq">
<HintPath>..\..\packages\Ninject.MockingKernel.Moq.3.0.0.5\lib\net45-full\Ninject.MockingKernel.Moq.dll</HintPath>
<Reference Include="Ninject.MockingKernel.Moq, Version=3.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
<HintPath>..\..\packages\Ninject.MockingKernel.Moq.3.2.0.0\lib\net45-full\Ninject.MockingKernel.Moq.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Ninject.Web.Common, Version=3.0.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Ninject.Web.Common.3.0.0.7\lib\net45-full\Ninject.Web.Common.dll</HintPath>
<Reference Include="Ninject.Web.Common, Version=3.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
<HintPath>..\..\packages\Ninject.Web.Common.3.2.0.0\lib\net45-full\Ninject.Web.Common.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Ninject.Web.Mvc, Version=3.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
<HintPath>..\..\packages\Ninject.MVC5.3.2.1.0\lib\net45-full\Ninject.Web.Mvc.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NuGet.Core, Version=2.8.60623.89, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\NuGet.Core.2.8.6\lib\net40-Client\NuGet.Core.dll</HintPath>
Expand Down Expand Up @@ -205,6 +211,10 @@
<HintPath>..\..\packages\WebActivator.1.5\lib\net40\WebActivator.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
<HintPath>..\..\packages\WebActivatorEx.2.0\lib\net40\WebActivatorEx.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="WebBackgrounder">
<HintPath>..\..\packages\WebBackgrounder.0.2.0\lib\net40\WebBackgrounder.dll</HintPath>
</Reference>
Expand All @@ -223,6 +233,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="AppConfigIsCorrectlyApplied.cs" />
<Compile Include="App_Start\NinjectWebCommon.cs" />
<Compile Include="Authentication\AuthenticatorFacts.cs" />
<Compile Include="Authentication\Providers\ApiKey\ApiKeyAuthenticationHandlerFacts.cs" />
<Compile Include="Authentication\AuthenticationServiceFacts.cs" />
Expand Down
12 changes: 7 additions & 5 deletions tests/NuGetGallery.Facts/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,12 @@
<package id="Moq" version="4.2.1502.0911" targetFramework="net45" />
<package id="MvcHaack.Ajax.MVC4" version="2.0.0.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
<package id="Ninject" version="3.0.1.10" targetFramework="net45" />
<package id="Ninject.MockingKernel" version="3.0.0.5" targetFramework="net45" />
<package id="Ninject.MockingKernel.Moq" version="3.0.0.5" targetFramework="net45" />
<package id="Ninject.MVC3" version="3.0.0.6" targetFramework="net45" />
<package id="Ninject.Web.Common" version="3.0.0.7" targetFramework="net45" />
<package id="Ninject" version="3.2.0.0" targetFramework="net45" />
<package id="Ninject.MockingKernel" version="3.2.0.0" targetFramework="net45" />
<package id="Ninject.MockingKernel.Moq" version="3.2.0.0" targetFramework="net45" />
<package id="Ninject.MVC5" version="3.2.1.0" targetFramework="net45" />
<package id="Ninject.Web.Common" version="3.2.0.0" targetFramework="net45" />
<package id="Ninject.Web.Common.WebHost" version="3.2.0.0" targetFramework="net45" />
<package id="NuGet.Core" version="2.8.6" targetFramework="net45" />
<package id="NuGet.Services.Build" version="3.0.8" targetFramework="net45" developmentDependency="true" />
<package id="Owin" version="1.0" targetFramework="net45" />
Expand All @@ -39,6 +40,7 @@
<package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
<package id="System.Spatial" version="5.6.2" targetFramework="net45" />
<package id="WebActivator" version="1.5" targetFramework="net45" />
<package id="WebActivatorEx" version="2.0" targetFramework="net45" />
<package id="WebBackgrounder" version="0.2.0" targetFramework="net40" />
<package id="WebBackgrounder.EntityFramework" version="0.1" />
<package id="WindowsAzure.Storage" version="4.3.0" targetFramework="net45" />
Expand Down

0 comments on commit 5761070

Please sign in to comment.