Skip to content

Commit fe0d80c

Browse files
mythzmythz
committed
Updated RestIntro into new API and latest NuGets
1 parent 57db205 commit fe0d80c

59 files changed

Lines changed: 13221 additions & 77 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/RestIntro/RestIntro.IntegrationTests/RestIntro.IntegrationTests.csproj‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,13 @@
3535
<HintPath>..\..\..\lib\tests\nunit.framework.dll</HintPath>
3636
</Reference>
3737
<Reference Include="ServiceStack.Common">
38-
<HintPath>..\..\..\lib\ServiceStack.Common.dll</HintPath>
38+
<HintPath>..\packages\ServiceStack.Common.3.9.32\lib\net35\ServiceStack.Common.dll</HintPath>
3939
</Reference>
4040
<Reference Include="ServiceStack.Interfaces">
41-
<HintPath>..\..\..\lib\ServiceStack.Interfaces.dll</HintPath>
41+
<HintPath>..\packages\ServiceStack.Common.3.9.32\lib\net35\ServiceStack.Interfaces.dll</HintPath>
42+
</Reference>
43+
<Reference Include="ServiceStack.Text">
44+
<HintPath>..\packages\ServiceStack.Text.3.9.32\lib\net35\ServiceStack.Text.dll</HintPath>
4245
</Reference>
4346
<Reference Include="System" />
4447
<Reference Include="System.Core" />
@@ -57,6 +60,9 @@
5760
<Name>RestIntro.ServiceModel</Name>
5861
</ProjectReference>
5962
</ItemGroup>
63+
<ItemGroup>
64+
<None Include="packages.config" />
65+
</ItemGroup>
6066
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6167
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
6268
Other similar extension points exist, see Microsoft.Common.targets.

‎src/RestIntro/RestIntro.IntegrationTests/packages.config‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="ServiceStack.Common" version="3.9.32" targetFramework="net35" />
4+
<package id="ServiceStack.Text" version="3.9.32" targetFramework="net35" />
5+
</packages>

‎src/RestIntro/RestIntro.ServiceInterface/CustomerService.cs‎

Lines changed: 14 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,42 @@
1-
using System.Net;
21
using RestIntro.ServiceModel;
2+
using ServiceStack.Common;
33
using ServiceStack.Common.Web;
44
using ServiceStack.OrmLite;
55
using ServiceStack.ServiceInterface;
6-
using ServiceStack.Text;
76

87
namespace RestIntro.ServiceInterface
98
{
109
/// <summary>
1110
/// Create your ServiceStack rest-ful web service implementation.
1211
/// </summary>
13-
public class CustomerService : RestServiceBase<Customer>
12+
public class CustomerService : Service
1413
{
15-
/// <summary>
16-
/// Gets or sets the database factory. The built-in IoC used with ServiceStack autowires this property.
17-
/// </summary>
18-
public IDbConnectionFactory DbFactory { get; set; }
19-
20-
public override object OnGet(Customer request)
14+
public object Get(Customer request)
2115
{
2216
if (request.Id != default(long))
23-
return DbFactory.Run(dbCmd => dbCmd.GetById<Customer>(request.Id));
17+
return Db.GetById<Customer>(request.Id);
2418

25-
return DbFactory.Run(dbCmd => dbCmd.Select<Customer>());
19+
return Db.Select<Customer>();
2620
}
2721

28-
public override object OnPost(Customer customer)
22+
public object Post(Customer customer)
2923
{
30-
DbFactory.Run(dbCmd =>
31-
{
32-
dbCmd.Save(customer);
33-
customer.Id = (int)dbCmd.GetLastInsertId();
34-
});
24+
Db.Save(customer);
25+
customer.Id = (int)Db.GetLastInsertId();
3526

36-
var pathToNewResource = base.RequestContext.AbsoluteUri.WithTrailingSlash() + customer.Id;
37-
return new HttpResult(customer) {
38-
StatusCode = HttpStatusCode.Created,
39-
Headers = {
40-
{ HttpHeaders.Location, pathToNewResource },
41-
}
42-
};
27+
var pathToNewResource = base.RequestContext.AbsoluteUri.CombineWith(customer.Id.ToString());
28+
return HttpResult.Status201Created(customer, pathToNewResource);
4329
}
4430

45-
public override object OnPut(Customer customer)
31+
public Customer Put(Customer customer)
4632
{
47-
DbFactory.Run(dbCmd => dbCmd.Save(customer));
33+
Db.Save(customer);
4834
return customer;
4935
}
5036

51-
public override object OnDelete(Customer request)
37+
public void Delete(Customer request)
5238
{
53-
DbFactory.Run(dbCmd => dbCmd.DeleteById<Customer>(request.Id));
54-
return null;
39+
Db.DeleteById<Customer>(request.Id);
5540
}
5641
}
5742
}

‎src/RestIntro/RestIntro.ServiceInterface/RestIntro.ServiceInterface.csproj‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,31 +33,28 @@
3333
</PropertyGroup>
3434
<ItemGroup>
3535
<Reference Include="ServiceStack">
36-
<HintPath>..\..\packages\ServiceStack.3.9.11\lib\net35\ServiceStack.dll</HintPath>
36+
<HintPath>..\packages\ServiceStack.3.9.32\lib\net35\ServiceStack.dll</HintPath>
3737
</Reference>
3838
<Reference Include="ServiceStack.Common">
39-
<HintPath>..\..\packages\ServiceStack.Common.3.9.11\lib\net35\ServiceStack.Common.dll</HintPath>
39+
<HintPath>..\packages\ServiceStack.Common.3.9.32\lib\net35\ServiceStack.Common.dll</HintPath>
4040
</Reference>
4141
<Reference Include="ServiceStack.Interfaces">
42-
<HintPath>..\..\packages\ServiceStack.Common.3.9.11\lib\net35\ServiceStack.Interfaces.dll</HintPath>
42+
<HintPath>..\packages\ServiceStack.Common.3.9.32\lib\net35\ServiceStack.Interfaces.dll</HintPath>
4343
</Reference>
4444
<Reference Include="ServiceStack.OrmLite">
45-
<HintPath>..\..\packages\ServiceStack.OrmLite.SqlServer.3.9.9\lib\ServiceStack.OrmLite.dll</HintPath>
46-
</Reference>
47-
<Reference Include="ServiceStack.OrmLite.SqliteNET">
48-
<HintPath>..\..\packages\ServiceStack.OrmLite.Sqlite32.3.9.9\lib\net35\ServiceStack.OrmLite.SqliteNET.dll</HintPath>
45+
<HintPath>..\packages\ServiceStack.OrmLite.SqlServer.3.9.32\lib\ServiceStack.OrmLite.dll</HintPath>
4946
</Reference>
5047
<Reference Include="ServiceStack.OrmLite.SqlServer">
51-
<HintPath>..\..\packages\ServiceStack.OrmLite.SqlServer.3.9.9\lib\ServiceStack.OrmLite.SqlServer.dll</HintPath>
48+
<HintPath>..\packages\ServiceStack.OrmLite.SqlServer.3.9.32\lib\ServiceStack.OrmLite.SqlServer.dll</HintPath>
5249
</Reference>
5350
<Reference Include="ServiceStack.Redis">
54-
<HintPath>..\..\packages\ServiceStack.Redis.3.9.11\lib\net35\ServiceStack.Redis.dll</HintPath>
51+
<HintPath>..\packages\ServiceStack.Redis.3.9.32\lib\net35\ServiceStack.Redis.dll</HintPath>
5552
</Reference>
5653
<Reference Include="ServiceStack.ServiceInterface">
57-
<HintPath>..\..\packages\ServiceStack.3.9.11\lib\net35\ServiceStack.ServiceInterface.dll</HintPath>
54+
<HintPath>..\packages\ServiceStack.3.9.32\lib\net35\ServiceStack.ServiceInterface.dll</HintPath>
5855
</Reference>
5956
<Reference Include="ServiceStack.Text">
60-
<HintPath>..\..\packages\ServiceStack.Text.3.9.11\lib\net35\ServiceStack.Text.dll</HintPath>
57+
<HintPath>..\packages\ServiceStack.Text.3.9.32\lib\net35\ServiceStack.Text.dll</HintPath>
6158
</Reference>
6259
<Reference Include="System" />
6360
<Reference Include="System.Core" />

‎src/RestIntro/RestIntro.ServiceInterface/packages.config‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="ServiceStack" version="3.9.11" targetFramework="net35" />
4+
<package id="ServiceStack" version="3.9.32" targetFramework="net35" />
45
<package id="ServiceStack.Common" version="3.9.11" targetFramework="net35" />
6+
<package id="ServiceStack.Common" version="3.9.32" targetFramework="net35" />
57
<package id="ServiceStack.OrmLite.Sqlite32" version="3.9.9" targetFramework="net35" />
68
<package id="ServiceStack.OrmLite.SqlServer" version="3.9.9" targetFramework="net35" />
9+
<package id="ServiceStack.OrmLite.SqlServer" version="3.9.32" targetFramework="net35" />
710
<package id="ServiceStack.Redis" version="3.9.11" targetFramework="net35" />
11+
<package id="ServiceStack.Redis" version="3.9.32" targetFramework="net35" />
812
<package id="ServiceStack.Text" version="3.9.11" targetFramework="net35" />
13+
<package id="ServiceStack.Text" version="3.9.32" targetFramework="net35" />
914
</packages>

‎src/RestIntro/RestIntro.ServiceModel/RestIntro.ServiceModel.csproj‎

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -32,32 +32,14 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="ServiceStack">
36-
<HintPath>..\..\packages\ServiceStack.3.9.11\lib\net35\ServiceStack.dll</HintPath>
37-
</Reference>
3835
<Reference Include="ServiceStack.Common">
39-
<HintPath>..\..\packages\ServiceStack.Common.3.9.11\lib\net35\ServiceStack.Common.dll</HintPath>
40-
</Reference>
41-
<Reference Include="ServiceStack.Interfaces, Version=3.9.9.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\..\packages\ServiceStack.Common.3.9.11\lib\net35\ServiceStack.Interfaces.dll</HintPath>
43-
</Reference>
44-
<Reference Include="ServiceStack.OrmLite">
45-
<HintPath>..\..\packages\ServiceStack.OrmLite.SqlServer.3.9.9\lib\ServiceStack.OrmLite.dll</HintPath>
46-
</Reference>
47-
<Reference Include="ServiceStack.OrmLite.SqliteNET">
48-
<HintPath>..\..\packages\ServiceStack.OrmLite.Sqlite32.3.9.9\lib\net35\ServiceStack.OrmLite.SqliteNET.dll</HintPath>
49-
</Reference>
50-
<Reference Include="ServiceStack.OrmLite.SqlServer">
51-
<HintPath>..\..\packages\ServiceStack.OrmLite.SqlServer.3.9.9\lib\ServiceStack.OrmLite.SqlServer.dll</HintPath>
52-
</Reference>
53-
<Reference Include="ServiceStack.Redis">
54-
<HintPath>..\..\packages\ServiceStack.Redis.3.9.11\lib\net35\ServiceStack.Redis.dll</HintPath>
36+
<HintPath>..\packages\ServiceStack.Common.3.9.32\lib\net35\ServiceStack.Common.dll</HintPath>
5537
</Reference>
56-
<Reference Include="ServiceStack.ServiceInterface">
57-
<HintPath>..\..\packages\ServiceStack.3.9.11\lib\net35\ServiceStack.ServiceInterface.dll</HintPath>
38+
<Reference Include="ServiceStack.Interfaces">
39+
<HintPath>..\packages\ServiceStack.Common.3.9.32\lib\net35\ServiceStack.Interfaces.dll</HintPath>
5840
</Reference>
5941
<Reference Include="ServiceStack.Text">
60-
<HintPath>..\..\packages\ServiceStack.Text.3.9.11\lib\net35\ServiceStack.Text.dll</HintPath>
42+
<HintPath>..\packages\ServiceStack.Text.3.9.32\lib\net35\ServiceStack.Text.dll</HintPath>
6143
</Reference>
6244
<Reference Include="System" />
6345
<Reference Include="System.Core" />

‎src/RestIntro/RestIntro.ServiceModel/packages.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
<packages>
33
<package id="ServiceStack" version="3.9.11" targetFramework="net35" />
44
<package id="ServiceStack.Common" version="3.9.11" targetFramework="net35" />
5+
<package id="ServiceStack.Common" version="3.9.32" targetFramework="net35" />
56
<package id="ServiceStack.OrmLite.Sqlite32" version="3.9.9" targetFramework="net35" />
67
<package id="ServiceStack.OrmLite.SqlServer" version="3.9.9" targetFramework="net35" />
78
<package id="ServiceStack.Redis" version="3.9.11" targetFramework="net35" />
89
<package id="ServiceStack.Text" version="3.9.11" targetFramework="net35" />
10+
<package id="ServiceStack.Text" version="3.9.32" targetFramework="net35" />
911
</packages>

‎src/RestIntro/RestIntro/RestIntro.csproj‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<RootNamespace>RestIntro</RootNamespace>
1414
<AssemblyName>RestIntro</AssemblyName>
1515
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
16+
<UseIISExpress>false</UseIISExpress>
1617
</PropertyGroup>
1718
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1819
<DebugSymbols>true</DebugSymbols>
@@ -34,38 +35,38 @@
3435
</PropertyGroup>
3536
<ItemGroup>
3637
<Reference Include="Mono.Data.Sqlite">
37-
<HintPath>..\..\..\lib\Mono.Data.Sqlite.dll</HintPath>
38+
<HintPath>..\packages\ServiceStack.OrmLite.Sqlite.Mono.3.9.32\lib\net35\Mono.Data.Sqlite.dll</HintPath>
3839
</Reference>
3940
<Reference Include="ServiceStack">
40-
<HintPath>..\..\packages\ServiceStack.3.9.11\lib\net35\ServiceStack.dll</HintPath>
41+
<HintPath>..\packages\ServiceStack.3.9.32\lib\net35\ServiceStack.dll</HintPath>
4142
</Reference>
4243
<Reference Include="ServiceStack.Common">
43-
<HintPath>..\..\packages\ServiceStack.Common.3.9.11\lib\net35\ServiceStack.Common.dll</HintPath>
44+
<HintPath>..\packages\ServiceStack.Common.3.9.32\lib\net35\ServiceStack.Common.dll</HintPath>
4445
</Reference>
4546
<Reference Include="ServiceStack.Interfaces">
46-
<HintPath>..\..\packages\ServiceStack.Common.3.9.11\lib\net35\ServiceStack.Interfaces.dll</HintPath>
47+
<HintPath>..\packages\ServiceStack.Common.3.9.32\lib\net35\ServiceStack.Interfaces.dll</HintPath>
4748
</Reference>
4849
<Reference Include="ServiceStack.OrmLite">
49-
<HintPath>..\..\packages\ServiceStack.OrmLite.Sqlite32.3.9.9\lib\net35\ServiceStack.OrmLite.dll</HintPath>
50+
<HintPath>..\packages\ServiceStack.OrmLite.Sqlite.Mono.3.9.32\lib\net35\ServiceStack.OrmLite.dll</HintPath>
5051
</Reference>
51-
<Reference Include="ServiceStack.OrmLite.SqliteNET">
52-
<HintPath>..\..\packages\ServiceStack.OrmLite.Sqlite32.3.9.9\lib\net35\ServiceStack.OrmLite.SqliteNET.dll</HintPath>
52+
<Reference Include="ServiceStack.OrmLite.Sqlite">
53+
<HintPath>..\packages\ServiceStack.OrmLite.Sqlite.Mono.3.9.32\lib\net35\ServiceStack.OrmLite.Sqlite.dll</HintPath>
54+
</Reference>
55+
<Reference Include="ServiceStack.OrmLite.SqlServer">
56+
<HintPath>..\packages\ServiceStack.OrmLite.SqlServer.3.9.32\lib\ServiceStack.OrmLite.SqlServer.dll</HintPath>
5357
</Reference>
5458
<Reference Include="ServiceStack.Redis">
55-
<HintPath>..\..\packages\ServiceStack.Redis.3.9.11\lib\net35\ServiceStack.Redis.dll</HintPath>
59+
<HintPath>..\packages\ServiceStack.Redis.3.9.32\lib\net35\ServiceStack.Redis.dll</HintPath>
5660
</Reference>
5761
<Reference Include="ServiceStack.ServiceInterface">
58-
<HintPath>..\..\packages\ServiceStack.3.9.11\lib\net35\ServiceStack.ServiceInterface.dll</HintPath>
62+
<HintPath>..\packages\ServiceStack.3.9.32\lib\net35\ServiceStack.ServiceInterface.dll</HintPath>
5963
</Reference>
6064
<Reference Include="ServiceStack.Text">
61-
<HintPath>..\..\packages\ServiceStack.Text.3.9.11\lib\net35\ServiceStack.Text.dll</HintPath>
65+
<HintPath>..\packages\ServiceStack.Text.3.9.32\lib\net35\ServiceStack.Text.dll</HintPath>
6266
</Reference>
6367
<Reference Include="System" />
6468
<Reference Include="System.Core" />
6569
<Reference Include="System.Data" />
66-
<Reference Include="System.Data.SQLite">
67-
<HintPath>..\..\packages\ServiceStack.OrmLite.Sqlite32.3.9.9\lib\net35\System.Data.SQLite.dll</HintPath>
68-
</Reference>
6970
<Reference Include="System.Web" />
7071
<Reference Include="System.Configuration" />
7172
</ItemGroup>
@@ -76,6 +77,9 @@
7677
</Content>
7778
<Content Include="default.htm" />
7879
<Content Include="Global.asax" />
80+
<Content Include="sqlite\x64\sqlite3.dll" />
81+
<Content Include="sqlite\x86\sqlite3.dll" />
82+
<Content Include="sqlite\x86\sqlite3.exe" />
7983
<Content Include="Web.config" />
8084
</ItemGroup>
8185
<ItemGroup>

‎src/RestIntro/RestIntro/RestIntro.sqlite‎

0 Bytes
Binary file not shown.

‎src/RestIntro/RestIntro/packages.config‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="ServiceStack" version="3.9.11" targetFramework="net35" />
4+
<package id="ServiceStack" version="3.9.32" targetFramework="net35" />
45
<package id="ServiceStack.Common" version="3.9.11" targetFramework="net35" />
6+
<package id="ServiceStack.Common" version="3.9.32" targetFramework="net35" />
7+
<package id="ServiceStack.OrmLite.Sqlite.Mono" version="3.9.32" targetFramework="net35" />
58
<package id="ServiceStack.OrmLite.Sqlite32" version="3.9.9" targetFramework="net35" />
69
<package id="ServiceStack.OrmLite.SqlServer" version="3.9.9" targetFramework="net35" />
10+
<package id="ServiceStack.OrmLite.SqlServer" version="3.9.32" targetFramework="net35" />
711
<package id="ServiceStack.Redis" version="3.9.11" targetFramework="net35" />
12+
<package id="ServiceStack.Redis" version="3.9.32" targetFramework="net35" />
813
<package id="ServiceStack.Text" version="3.9.11" targetFramework="net35" />
14+
<package id="ServiceStack.Text" version="3.9.32" targetFramework="net35" />
915
</packages>

0 commit comments

Comments
 (0)