Permalink
Browse files

updated sstack

  • Loading branch information...
1 parent 8c03a5f commit ff3b4ef0a286f6c2044b024ed1b2e7aa79db67b2 @allenarthurgay committed Aug 28, 2012
Showing with 139 additions and 44 deletions.
  1. +29 −8 Api.Implementations/Api.Implementations.csproj
  2. +1 −1 Api.Implementations/Registration.cs
  3. +5 −0 Api.Implementations/packages.config
  4. +18 −12 Api.RestServiceHost/Api.RestServiceHost.csproj
  5. +5 −5 Api.RestServiceHost/packages.config
  6. +1 −1 Core/DataConnectionProvider.cs
  7. +22 −8 Data/Data.csproj
  8. +3 −5 Data/Registration.cs
  9. +6 −0 Data/packages.config
  10. BIN packages/ServiceStack.3.9.2/ServiceStack.3.9.2.nupkg
  11. BIN packages/ServiceStack.3.9.5/ServiceStack.3.9.5.nupkg
  12. 0 packages/{ServiceStack.3.9.2 → ServiceStack.3.9.5}/lib/net35/ServiceStack.xml
  13. 0 packages/{ServiceStack.3.9.2 → ServiceStack.3.9.5}/lib/net40/ServiceStack.xml
  14. BIN packages/ServiceStack.Common.3.9.0/ServiceStack.Common.3.9.0.nupkg
  15. BIN packages/ServiceStack.Common.3.9.5/ServiceStack.Common.3.9.5.nupkg
  16. 0 packages/{ServiceStack.Common.3.9.0 → ServiceStack.Common.3.9.5}/lib/net35/ServiceStack.Common.xml
  17. 0 ...ges/{ServiceStack.Common.3.9.0 → ServiceStack.Common.3.9.5}/lib/net35/ServiceStack.Interfaces.xml
  18. 0 packages/{ServiceStack.Common.3.9.0 → ServiceStack.Common.3.9.5}/lib/sl4/ServiceStack.Common.xml
  19. 0 packages/{ServiceStack.Common.3.9.0 → ServiceStack.Common.3.9.5}/lib/sl4/ServiceStack.Interfaces.xml
  20. 0 packages/{ServiceStack.Common.3.9.0 → ServiceStack.Common.3.9.5}/lib/sl5/ServiceStack.Common.xml
  21. 0 packages/{ServiceStack.Common.3.9.0 → ServiceStack.Common.3.9.5}/lib/sl5/ServiceStack.Interfaces.xml
  22. BIN packages/ServiceStack.OrmLite.SqlServer.3.9.2/ServiceStack.OrmLite.SqlServer.3.9.2.nupkg
  23. BIN packages/ServiceStack.OrmLite.SqlServer.3.9.5/ServiceStack.OrmLite.SqlServer.3.9.5.nupkg
  24. BIN packages/ServiceStack.Redis.3.9.0/ServiceStack.Redis.3.9.0.nupkg
  25. BIN packages/ServiceStack.Redis.3.9.5/ServiceStack.Redis.3.9.5.nupkg
  26. +8 −4 packages/{ServiceStack.Redis.3.9.0 → ServiceStack.Redis.3.9.5}/lib/net35/ServiceStack.Redis.XML
  27. BIN packages/ServiceStack.Text.3.9.2/ServiceStack.Text.3.9.2.nupkg
  28. BIN packages/ServiceStack.Text.3.9.2/lib/ServiceStack.Text-v3.83.zip
  29. BIN packages/ServiceStack.Text.3.9.5/ServiceStack.Text.3.9.5.nupkg
  30. BIN packages/ServiceStack.Text.3.9.5/lib/ServiceStack.Text-v3.67.zip
  31. +40 −0 packages/{ServiceStack.Text.3.9.2 → ServiceStack.Text.3.9.5}/lib/net35/ServiceStack.Text.XML
  32. 0 ...erviceStack.Text.3.9.2 → ServiceStack.Text.3.9.5}/lib/sl4-windowsphone71/ServiceStack.Text.WP.XML
  33. 0 packages/{ServiceStack.Text.3.9.2 → ServiceStack.Text.3.9.5}/lib/sl4/ServiceStack.Text.xml
  34. 0 packages/{ServiceStack.Text.3.9.2 → ServiceStack.Text.3.9.5}/lib/sl5/ServiceStack.Text.xml
  35. +1 −0 packages/repositories.config
@@ -31,17 +31,38 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="ServiceStack, Version=3.7.3.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="ServiceStack, Version=3.9.4.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\lib\ServiceStack.dll</HintPath>
+ <HintPath>..\packages\ServiceStack.3.9.5\lib\net40\ServiceStack.dll</HintPath>
</Reference>
- <Reference Include="ServiceStack.Common, Version=3.7.3.0, Culture=neutral, processorArchitecture=MSIL" />
- <Reference Include="ServiceStack.Interfaces">
- <HintPath>..\lib\ServiceStack.Interfaces.dll</HintPath>
+ <Reference Include="ServiceStack.Common, Version=3.9.4.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\ServiceStack.Common.3.9.5\lib\net35\ServiceStack.Common.dll</HintPath>
+ </Reference>
+ <Reference Include="ServiceStack.Interfaces, Version=3.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\ServiceStack.Common.3.9.5\lib\net35\ServiceStack.Interfaces.dll</HintPath>
+ </Reference>
+ <Reference Include="ServiceStack.OrmLite, Version=3.9.5.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\ServiceStack.OrmLite.SqlServer.3.9.5\lib\ServiceStack.OrmLite.dll</HintPath>
+ </Reference>
+ <Reference Include="ServiceStack.OrmLite.SqlServer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\ServiceStack.OrmLite.SqlServer.3.9.5\lib\ServiceStack.OrmLite.SqlServer.dll</HintPath>
</Reference>
- <Reference Include="ServiceStack.OrmLite, Version=3.6.9.3574, Culture=neutral, processorArchitecture=MSIL" />
- <Reference Include="ServiceStack.ServiceInterface">
- <HintPath>..\lib\ServiceStack.ServiceInterface.dll</HintPath>
+ <Reference Include="ServiceStack.Razor">
+ <HintPath>..\packages\ServiceStack.3.9.5\lib\net40\ServiceStack.Razor.dll</HintPath>
+ </Reference>
+ <Reference Include="ServiceStack.Redis">
+ <HintPath>..\packages\ServiceStack.Redis.3.9.5\lib\net35\ServiceStack.Redis.dll</HintPath>
+ </Reference>
+ <Reference Include="ServiceStack.ServiceInterface, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\ServiceStack.3.9.5\lib\net40\ServiceStack.ServiceInterface.dll</HintPath>
+ </Reference>
+ <Reference Include="ServiceStack.Text, Version=3.9.5.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\ServiceStack.Text.3.9.5\lib\net35\ServiceStack.Text.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
@@ -10,7 +10,7 @@ namespace Api.Implementations
{
public class Registration : IFunqRegistrationModule
{
- public void RegisterDependencies(Funq.Container container)
+ public void RegisterDependencies(Container container)
{
container.Register<IAuthConsumerService>(c => new AuthConsumerService(c.Resolve<IUserTokenRepository>(),
c.Resolve<IServiceProviderRepository>(),
@@ -4,4 +4,9 @@
<package id="DotNetOpenAuth.Core" version="4.1.0.12182" />
<package id="DotNetOpenAuth.OAuth.Consumer" version="4.1.0.12182" />
<package id="DotNetOpenAuth.OAuth.Core" version="4.1.0.12182" />
+ <package id="ServiceStack" version="3.9.5" targetFramework="net40" />
+ <package id="ServiceStack.Common" version="3.9.5" targetFramework="net40" />
+ <package id="ServiceStack.OrmLite.SqlServer" version="3.9.5" targetFramework="net40" />
+ <package id="ServiceStack.Redis" version="3.9.5" targetFramework="net40" />
+ <package id="ServiceStack.Text" version="3.9.5" targetFramework="net40" />
</packages>
@@ -38,32 +38,38 @@
<Private>True</Private>
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference>
- <Reference Include="ServiceStack, Version=3.9.2.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="ServiceStack, Version=3.9.4.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\ServiceStack.3.9.2\lib\net40\ServiceStack.dll</HintPath>
+ <HintPath>..\packages\ServiceStack.3.9.5\lib\net40\ServiceStack.dll</HintPath>
</Reference>
- <Reference Include="ServiceStack.Common, Version=3.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="ServiceStack.Common, Version=3.9.4.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\ServiceStack.Common.3.9.0\lib\net35\ServiceStack.Common.dll</HintPath>
+ <HintPath>..\packages\ServiceStack.Common.3.9.5\lib\net35\ServiceStack.Common.dll</HintPath>
</Reference>
<Reference Include="ServiceStack.Interfaces, Version=3.9.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\ServiceStack.Common.3.9.0\lib\net35\ServiceStack.Interfaces.dll</HintPath>
+ <HintPath>..\packages\ServiceStack.Common.3.9.5\lib\net35\ServiceStack.Interfaces.dll</HintPath>
</Reference>
- <Reference Include="ServiceStack.OrmLite, Version=3.9.2.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="ServiceStack.OrmLite, Version=3.9.5.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\ServiceStack.OrmLite.SqlServer.3.9.2\lib\ServiceStack.OrmLite.dll</HintPath>
+ <HintPath>..\packages\ServiceStack.OrmLite.SqlServer.3.9.5\lib\ServiceStack.OrmLite.dll</HintPath>
</Reference>
<Reference Include="ServiceStack.OrmLite.SqlServer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\ServiceStack.OrmLite.SqlServer.3.9.2\lib\ServiceStack.OrmLite.SqlServer.dll</HintPath>
+ <HintPath>..\packages\ServiceStack.OrmLite.SqlServer.3.9.5\lib\ServiceStack.OrmLite.SqlServer.dll</HintPath>
+ </Reference>
+ <Reference Include="ServiceStack.Razor">
+ <HintPath>..\packages\ServiceStack.3.9.5\lib\net40\ServiceStack.Razor.dll</HintPath>
+ </Reference>
+ <Reference Include="ServiceStack.Redis">
+ <HintPath>..\packages\ServiceStack.Redis.3.9.5\lib\net35\ServiceStack.Redis.dll</HintPath>
</Reference>
<Reference Include="ServiceStack.ServiceInterface, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\ServiceStack.3.9.2\lib\net40\ServiceStack.ServiceInterface.dll</HintPath>
+ <HintPath>..\packages\ServiceStack.3.9.5\lib\net40\ServiceStack.ServiceInterface.dll</HintPath>
</Reference>
- <Reference Include="ServiceStack.Text, Version=3.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="ServiceStack.Text, Version=3.9.5.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\ServiceStack.Text.3.9.2\lib\net35\ServiceStack.Text.dll</HintPath>
+ <HintPath>..\packages\ServiceStack.Text.3.9.5\lib\net35\ServiceStack.Text.dll</HintPath>
</Reference>
<Reference Include="System.Data.Entity" />
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
@@ -158,7 +164,7 @@
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<UseIIS>False</UseIIS>
- <AutoAssignPort>True</AutoAssignPort>
+ <AutoAssignPort>False</AutoAssignPort>
<DevelopmentServerPort>58371</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>
@@ -7,12 +7,12 @@
<package id="jQuery.vsdoc" version="1.5.1" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" />
<package id="Modernizr" version="1.7" />
- <package id="ServiceStack" version="3.9.2" targetFramework="net40" />
- <package id="ServiceStack.Common" version="3.9.0" targetFramework="net40" />
+ <package id="ServiceStack" version="3.9.5" targetFramework="net40" />
+ <package id="ServiceStack.Common" version="3.9.5" targetFramework="net40" />
<package id="ServiceStack.Host.Mvc" version="3.8.5" />
<package id="ServiceStack.Mvc" version="3.8.5" />
- <package id="ServiceStack.OrmLite.SqlServer" version="3.9.2" targetFramework="net40" />
- <package id="ServiceStack.Redis" version="3.9.0" targetFramework="net40" />
- <package id="ServiceStack.Text" version="3.9.2" targetFramework="net40" />
+ <package id="ServiceStack.OrmLite.SqlServer" version="3.9.5" targetFramework="net40" />
+ <package id="ServiceStack.Redis" version="3.9.5" targetFramework="net40" />
+ <package id="ServiceStack.Text" version="3.9.5" targetFramework="net40" />
<package id="WebActivator" version="1.5.1" />
</packages>
@@ -45,7 +45,7 @@ public void WithCommand(Action<IDbCommand> commandAction)
using (var dbConn = _dbFactory.OpenDbConnection())
using (var dbCmd = dbConn.CreateCommand())
{
- commandAction(dbCmd);
+ commandAction(dbCmd);
}
}
View
@@ -31,17 +31,28 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="ServiceStack">
- <HintPath>..\lib\ServiceStack.dll</HintPath>
+ <Reference Include="ServiceStack, Version=3.9.4.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\ServiceStack.3.9.5\lib\net40\ServiceStack.dll</HintPath>
</Reference>
- <Reference Include="ServiceStack.Interfaces">
- <HintPath>..\lib\ServiceStack.Interfaces.dll</HintPath>
+ <Reference Include="ServiceStack.Common, Version=3.9.4.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\ServiceStack.Common.3.9.5\lib\net35\ServiceStack.Common.dll</HintPath>
</Reference>
- <Reference Include="ServiceStack.OrmLite">
- <HintPath>..\lib\ServiceStack.OrmLite.dll</HintPath>
+ <Reference Include="ServiceStack.Interfaces, Version=3.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\ServiceStack.Common.3.9.5\lib\net35\ServiceStack.Interfaces.dll</HintPath>
</Reference>
- <Reference Include="ServiceStack.OrmLite.SqlServer">
- <HintPath>..\lib\ServiceStack.OrmLite.SqlServer.dll</HintPath>
+ <Reference Include="ServiceStack.OrmLite, Version=3.9.5.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\ServiceStack.OrmLite.SqlServer.3.9.5\lib\ServiceStack.OrmLite.dll</HintPath>
+ </Reference>
+ <Reference Include="ServiceStack.OrmLite.SqlServer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\ServiceStack.OrmLite.SqlServer.3.9.5\lib\ServiceStack.OrmLite.SqlServer.dll</HintPath>
+ </Reference>
+ <Reference Include="ServiceStack.Text, Version=3.9.5.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\ServiceStack.Text.3.9.5\lib\net35\ServiceStack.Text.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
@@ -72,6 +83,9 @@
<Name>Core</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
View
@@ -21,10 +21,9 @@ public void CreateTablesForTypes()
var allIDataItems = GetAllIDataItems();
using (var dbConn = dbFactory.OpenDbConnection())
- using (var dbCmd = dbConn.CreateCommand())
- {
+ {
const bool overwrite = false;
- dbCmd.CreateTables(overwrite, allIDataItems);
+ dbConn.CreateTables(overwrite, allIDataItems);
}
}
@@ -33,9 +32,8 @@ public void DropTables()
{
var dbFactory = OrmLiteConnectionFactory();
using (var dbConn = dbFactory.OpenDbConnection())
- using (var dbCmd = dbConn.CreateCommand())
{
- dbCmd.DropTable<AuthenticationProvider>();
+ dbConn.DropTable<AuthenticationProvider>();
}
}
View
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="ServiceStack.Common" version="3.9.5" targetFramework="net40" />
+ <package id="ServiceStack.OrmLite.SqlServer" version="3.9.5" targetFramework="net40" />
+ <package id="ServiceStack.Text" version="3.9.5" targetFramework="net40" />
+</packages>
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -2,4 +2,5 @@
<repositories>
<repository path="..\Api.Implementations\packages.config" />
<repository path="..\Api.RestServiceHost\packages.config" />
+ <repository path="..\Data\packages.config" />
</repositories>

0 comments on commit ff3b4ef

Please sign in to comment.