Permalink
Browse files

Upgrading packages

  • Loading branch information...
jchadwick committed Mar 28, 2012
1 parent bad9e24 commit d74da6eb28df8ec34574cb5734a0d0deaf99e2a7
Showing with 15,067 additions and 11,104 deletions.
  1. +11 −3 .gitignore
  2. +6 −0 .nuget/NuGet.Config
  3. BIN .nuget/NuGet.exe
  4. +52 −0 .nuget/NuGet.targets
  5. +14 −0 Core/App.config
  6. +4 −2 Core/Ebuy.Core.csproj
  7. +1 −1 Core/packages.config
  8. +0 −1 CustomExtensions/packages.config
  9. +15 −4 IntegrationTests/App.config
  10. +0 −12 IntegrationTests/App_Start/EntityFramework.SqlServerCompact.cs
  11. +3 −11 IntegrationTests/IntegrationTests.csproj
  12. +2 −4 IntegrationTests/packages.config
  13. +1 −1 UnitTests/App.config
  14. BIN Website/Content/images/ajax-loader.png
  15. BIN Website/Content/images/icon-search-black.png
  16. BIN Website/Content/images/icons-18-black.png
  17. BIN Website/Content/images/icons-18-white.png
  18. BIN Website/Content/images/icons-36-black.png
  19. BIN Website/Content/images/icons-36-white.png
  20. +1,869 −0 Website/Content/jquery.mobile-1.0.1.css
  21. +2 −0 Website/Content/jquery.mobile-1.0.1.min.css
  22. +0 −1,699 Website/Content/jquery.mobile-1.0b3.css
  23. +0 −8 Website/Content/jquery.mobile-1.0b3.min.css
  24. +736 −0 Website/Content/jquery.mobile.structure-1.0.1.css
  25. +2 −0 Website/Content/jquery.mobile.structure-1.0.1.min.css
  26. +0 −566 Website/Content/themes/base/jquery-ui.css
  27. +1 −1 Website/Content/themes/base/jquery.ui.accordion.css
  28. +1 −1 Website/Content/themes/base/jquery.ui.all.css
  29. +2 −2 Website/Content/themes/base/jquery.ui.autocomplete.css
  30. +4 −14 Website/Content/themes/base/jquery.ui.base.css
  31. +2 −2 Website/Content/themes/base/jquery.ui.button.css
  32. +4 −7 Website/Content/themes/base/jquery.ui.core.css
  33. +1 −1 Website/Content/themes/base/jquery.ui.datepicker.css
  34. +1 −1 Website/Content/themes/base/jquery.ui.dialog.css
  35. +2 −2 Website/Content/themes/base/jquery.ui.progressbar.css
  36. +1 −1 Website/Content/themes/base/jquery.ui.resizable.css
  37. +1 −1 Website/Content/themes/base/jquery.ui.selectable.css
  38. +1 −1 Website/Content/themes/base/jquery.ui.slider.css
  39. +1 −1 Website/Content/themes/base/jquery.ui.tabs.css
  40. +1 −1 Website/Content/themes/base/jquery.ui.theme.css
  41. BIN Website/Content/themes/base/minified/images/ui-bg_flat_0_aaaaaa_40x100.png
  42. BIN Website/Content/themes/base/minified/images/ui-bg_flat_75_ffffff_40x100.png
  43. BIN Website/Content/themes/base/minified/images/ui-bg_glass_55_fbf9ee_1x400.png
  44. BIN Website/Content/themes/base/minified/images/ui-bg_glass_65_ffffff_1x400.png
  45. BIN Website/Content/themes/base/minified/images/ui-bg_glass_75_dadada_1x400.png
  46. BIN Website/Content/themes/base/minified/images/ui-bg_glass_75_e6e6e6_1x400.png
  47. BIN Website/Content/themes/base/minified/images/ui-bg_glass_95_fef1ec_1x400.png
  48. BIN Website/Content/themes/base/minified/images/ui-bg_highlight-soft_75_cccccc_1x100.png
  49. BIN Website/Content/themes/base/minified/images/ui-icons_222222_256x240.png
  50. BIN Website/Content/themes/base/minified/images/ui-icons_2e83ff_256x240.png
  51. BIN Website/Content/themes/base/minified/images/ui-icons_454545_256x240.png
  52. BIN Website/Content/themes/base/minified/images/ui-icons_888888_256x240.png
  53. BIN Website/Content/themes/base/minified/images/ui-icons_cd0a0a_256x240.png
  54. +0 −10 Website/Content/themes/base/minified/jquery-ui.min.css
  55. +0 −10 Website/Content/themes/base/minified/jquery.ui.accordion.min.css
  56. +0 −10 Website/Content/themes/base/minified/jquery.ui.all.min.css
  57. +0 −10 Website/Content/themes/base/minified/jquery.ui.autocomplete.min.css
  58. +0 −10 Website/Content/themes/base/minified/jquery.ui.base.min.css
  59. +0 −10 Website/Content/themes/base/minified/jquery.ui.button.min.css
  60. +0 −10 Website/Content/themes/base/minified/jquery.ui.core.min.css
  61. +0 −10 Website/Content/themes/base/minified/jquery.ui.datepicker.min.css
  62. +0 −10 Website/Content/themes/base/minified/jquery.ui.dialog.min.css
  63. +0 −10 Website/Content/themes/base/minified/jquery.ui.progressbar.min.css
  64. +0 −10 Website/Content/themes/base/minified/jquery.ui.resizable.min.css
  65. +0 −10 Website/Content/themes/base/minified/jquery.ui.selectable.min.css
  66. +0 −10 Website/Content/themes/base/minified/jquery.ui.slider.min.css
  67. +0 −10 Website/Content/themes/base/minified/jquery.ui.tabs.min.css
  68. +0 −12 Website/Content/themes/base/minified/jquery.ui.theme.min.css
  69. +18 −41 Website/Ebuy.Website.csproj
  70. +0 −414 Website/Scripts/jquery-ui-1.8.16.min.js
  71. +7,026 −6,991 Website/Scripts/{jquery-ui-1.8.16.js → jquery-ui-1.8.18.js}
  72. +356 −0 Website/Scripts/jquery-ui-1.8.18.min.js
  73. +1,305 −887 Website/Scripts/{jquery.mobile-1.0b3.js → jquery.mobile-1.0.1.js}
  74. +177 −0 Website/Scripts/jquery.mobile-1.0.1.min.js
  75. +0 −169 Website/Scripts/jquery.mobile-1.0b3.min.js
  76. +1 −3 Website/Scripts/jquery.unobtrusive-ajax.js
  77. +31 −10 Website/Scripts/jquery.validate.unobtrusive.js
  78. +1 −1 Website/Scripts/jquery.validate.unobtrusive.min.js
  79. +3,223 −0 Website/Scripts/knockout.debug.js
  80. +97 −0 Website/Scripts/knockout.js
  81. +82 −78 Website/Web.config
  82. +9 −10 Website/packages.config
View
@@ -1,3 +1,11 @@
-TestResults
-Build
-/*.user
+_ReSharper.*
+**.ReSharper
+bin
+obj
+**.user
+**.suo
+TestResults
+_UpgradeReport_Files
+UpgradeLog*.XML
+packages
+Thumbs.db
View
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <solution>
+ <add key="disableSourceControlIntegration" value="true" />
+ </solution>
+</configuration>
View
Binary file not shown.
View
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
+ <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
+ <NuGetExePath>$(NuGetToolsPath)\nuget.exe</NuGetExePath>
+ <PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
+ <PackagesDir>$([System.IO.Path]::Combine($(SolutionDir), "packages"))</PackagesDir>
+ <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
+
+ <!-- Package sources used to restore packages. By default will used the registered sources under %APPDATA%\NuGet\NuGet.Config -->
+ <PackageSources>""</PackageSources>
+
+ <!-- Enable the restore command to run before builds -->
+ <RestorePackages Condition="$(RestorePackages) == ''">false</RestorePackages>
+
+ <!-- Property that enables building a package from a project -->
+ <BuildPackage Condition="$(BuildPackage) == ''">false</BuildPackage>
+
+ <!-- Commands -->
+ <RestoreCommand>"$(NuGetExePath)" install "$(PackagesConfig)" -source $(PackageSources) -o "$(PackagesDir)"</RestoreCommand>
+ <BuildCommand>"$(NuGetExePath)" pack "$(ProjectPath)" -p Configuration=$(Configuration) -o "$(PackageOutputDir)" -symbols</BuildCommand>
+
+ <!-- Make the build depend on restore packages -->
+ <BuildDependsOn Condition="$(RestorePackages) == 'true'">
+ RestorePackages;
+ $(BuildDependsOn);
+ </BuildDependsOn>
+
+ <!-- Make the build depend on restore packages -->
+ <BuildDependsOn Condition="$(BuildPackage) == 'true'">
+ $(BuildDependsOn);
+ BuildPackage;
+ </BuildDependsOn>
+ </PropertyGroup>
+
+ <Target Name="CheckPrerequisites">
+ <!-- Raise an error if we're unable to locate nuget.exe -->
+ <Error Condition="!Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
+ </Target>
+
+ <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
+ <Exec Command="$(RestoreCommand)"
+ LogStandardErrorAsError="true"
+ Condition="Exists('$(PackagesConfig)')" />
+ </Target>
+
+ <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
+ <Exec Command="$(BuildCommand)"
+ LogStandardErrorAsError="true" />
+ </Target>
+</Project>
View
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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.3.1.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ </configSections>
+ <entityFramework>
+ <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework">
+ <parameters>
+ <parameter value="Data Source=.\SQLEXPRESS; Integrated Security=True; MultipleActiveResultSets=True" />
+ </parameters>
+ </defaultConnectionFactory>
+ </entityFramework>
+</configuration>
View
@@ -34,8 +34,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="EntityFramework">
- <HintPath>..\packages\EntityFramework.4.2.0.0\lib\net40\EntityFramework.dll</HintPath>
+ <Reference Include="EntityFramework, Version=4.3.1.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\EntityFramework.4.3.1\lib\net40\EntityFramework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
@@ -71,6 +72,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="DataAccess\DataContext.Initializer.cs" />
+ <None Include="App.config" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
View
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="EntityFramework" version="4.2.0.0" />
+ <package id="EntityFramework" version="4.3.1" />
<package id="NLog" version="2.0.0.2000" />
</packages>
@@ -2,5 +2,4 @@
<packages>
<package id="AspNetMvc" version="4.0.10906.0" />
<package id="AspNetWebPagesCore" version="2.0.10906.0" />
- <package id="MicrosoftWebInfrastructure" version="1.0.0.0" />
</packages>
@@ -1,6 +1,17 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
<configuration>
- <connectionStrings>
- <add name="Ebuy.DataAccess.DataContext" connectionString="Data Source=Database.sdf" providerName="System.Data.SqlServerCe.4.0" />
- </connectionStrings>
+ <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.3.1.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ </configSections>
+ <connectionStrings>
+ <add name="Ebuy.DataAccess.DataContext" connectionString="Data Source=Database.sdf" providerName="System.Data.SqlServerCe.4.0" />
+ </connectionStrings>
+ <entityFramework>
+ <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlCeConnectionFactory, EntityFramework">
+ <parameters>
+ <parameter value="System.Data.SqlServerCe.4.0" />
+ </parameters>
+ </defaultConnectionFactory>
+ </entityFramework>
</configuration>
@@ -1,12 +0,0 @@
-using System.Data.Entity;
-using System.Data.Entity.Infrastructure;
-
-[assembly: WebActivator.PreApplicationStartMethod(typeof(IntegrationTests.App_Start.EntityFramework_SqlServerCompact), "Start")]
-
-namespace IntegrationTests.App_Start {
- public static class EntityFramework_SqlServerCompact {
- public static void Start() {
- Database.DefaultConnectionFactory = new SqlCeConnectionFactory("System.Data.SqlServerCe.4.0");
- }
- }
-}
@@ -33,14 +33,10 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="EntityFramework, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
- <HintPath>..\packages\EntityFramework.4.2.0.0\lib\net40\EntityFramework.dll</HintPath>
+ <Reference Include="EntityFramework">
+ <HintPath>..\packages\EntityFramework.4.3.1\lib\net40\EntityFramework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
- <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <Private>True</Private>
- <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
- </Reference>
<Reference Include="Moq">
<HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
</Reference>
@@ -54,20 +50,16 @@
</Reference>
<Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<Private>True</Private>
- <HintPath>..\packages\EntityFramework.SqlServerCompact.4.1.8482.2\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
+ <HintPath>..\packages\EntityFramework.SqlServerCompact.4.3.2\lib\net40\System.Data.SqlServerCe.Entity.dll</HintPath>
</Reference>
<Reference Include="System.Transactions" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
- <Reference Include="WebActivator">
- <HintPath>..\packages\WebActivator.1.5\lib\net40\WebActivator.dll</HintPath>
- </Reference>
</ItemGroup>
<ItemGroup>
- <Compile Include="App_Start\EntityFramework.SqlServerCompact.cs" />
<Compile Include="AssertException.cs" />
<Compile Include="Core\DataAccess\RepositoryInitializer.cs" />
<Compile Include="Core\DataAccess\AuctionPersistenceTests.cs" />
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="EntityFramework" version="4.2.0.0" />
- <package id="EntityFramework.SqlServerCompact" version="4.1.8482.2" />
- <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" />
+ <package id="EntityFramework" version="4.3.1" />
+ <package id="EntityFramework.SqlServerCompact" version="4.3.2" />
<package id="Moq" version="4.0.10827" />
<package id="SqlServerCompact" version="4.0.8482.1" />
- <package id="WebActivator" version="1.5" />
</packages>
View
@@ -10,7 +10,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="EntityFramework" publicKeyToken="b77a5c561934e089" culture="neutral" />
- <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+ <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Deleted file not rendered
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.

0 comments on commit d74da6e

Please sign in to comment.