Skip to content

Commit 46abf22

Browse files
mythzmythz
committed
Upgrade RestIntro to v4.0.11
1 parent 50b3aca commit 46abf22

Some content is hidden

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

43 files changed

+23947
-179
lines changed

‎src/RestIntro/RestIntro.IntegrationTests/IntegrationTests.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
using System.Collections.Generic;
22
using NUnit.Framework;
33
using RestIntro.ServiceModel;
4-
using ServiceStack.Service;
5-
using ServiceStack.ServiceClient.Web;
4+
using ServiceStack;
65

76
namespace RestIntro.IntegrationTests
87
{

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

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>RestIntro.IntegrationTests</RootNamespace>
1212
<AssemblyName>RestIntro.IntegrationTests</AssemblyName>
13-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
15+
<TargetFrameworkProfile />
1516
</PropertyGroup>
1617
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1718
<DebugSymbols>true</DebugSymbols>
@@ -21,6 +22,7 @@
2122
<DefineConstants>DEBUG;TRACE</DefineConstants>
2223
<ErrorReport>prompt</ErrorReport>
2324
<WarningLevel>4</WarningLevel>
25+
<Prefer32Bit>false</Prefer32Bit>
2426
</PropertyGroup>
2527
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2628
<DebugType>pdbonly</DebugType>
@@ -29,19 +31,27 @@
2931
<DefineConstants>TRACE</DefineConstants>
3032
<ErrorReport>prompt</ErrorReport>
3133
<WarningLevel>4</WarningLevel>
34+
<Prefer32Bit>false</Prefer32Bit>
3235
</PropertyGroup>
3336
<ItemGroup>
3437
<Reference Include="nunit.framework">
35-
<HintPath>..\..\..\lib\tests\nunit.framework.dll</HintPath>
38+
<HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
39+
</Reference>
40+
<Reference Include="ServiceStack">
41+
<HintPath>..\packages\ServiceStack.4.0.11\lib\net40\ServiceStack.dll</HintPath>
42+
<Private>True</Private>
43+
</Reference>
44+
<Reference Include="ServiceStack.Client">
45+
<HintPath>..\packages\ServiceStack.Client.4.0.11\lib\net40\ServiceStack.Client.dll</HintPath>
3646
</Reference>
3747
<Reference Include="ServiceStack.Common">
38-
<HintPath>..\packages\ServiceStack.Common.3.9.32\lib\net35\ServiceStack.Common.dll</HintPath>
48+
<HintPath>..\packages\ServiceStack.Common.4.0.11\lib\net40\ServiceStack.Common.dll</HintPath>
3949
</Reference>
4050
<Reference Include="ServiceStack.Interfaces">
41-
<HintPath>..\packages\ServiceStack.Common.3.9.32\lib\net35\ServiceStack.Interfaces.dll</HintPath>
51+
<HintPath>..\packages\ServiceStack.Interfaces.4.0.11\lib\net40\ServiceStack.Interfaces.dll</HintPath>
4252
</Reference>
4353
<Reference Include="ServiceStack.Text">
44-
<HintPath>..\packages\ServiceStack.Text.3.9.32\lib\net35\ServiceStack.Text.dll</HintPath>
54+
<HintPath>..\packages\ServiceStack.Text.4.0.11\lib\net40\ServiceStack.Text.dll</HintPath>
4555
</Reference>
4656
<Reference Include="System" />
4757
<Reference Include="System.Core" />

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="NUnit" version="2.6.3" targetFramework="net45" />
4+
<package id="ServiceStack" version="4.0.11" targetFramework="net45" />
5+
<package id="ServiceStack.Client" version="4.0.11" targetFramework="net45" />
6+
<package id="ServiceStack.Common" version="4.0.11" targetFramework="net45" />
7+
<package id="ServiceStack.Interfaces" version="4.0.11" targetFramework="net45" />
8+
<package id="ServiceStack.Text" version="4.0.11" targetFramework="net45" />
9+
</packages>

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
using RestIntro.ServiceModel;
2-
using ServiceStack.Common;
3-
using ServiceStack.Common.Web;
2+
using ServiceStack;
43
using ServiceStack.OrmLite;
5-
using ServiceStack.ServiceInterface;
64

75
namespace RestIntro.ServiceInterface
86
{
@@ -14,17 +12,16 @@ public class CustomerService : Service
1412
public object Get(Customer request)
1513
{
1614
if (request.Id != default(long))
17-
return Db.GetById<Customer>(request.Id);
15+
return Db.SingleById<Customer>(request.Id);
1816

1917
return Db.Select<Customer>();
2018
}
2119

2220
public object Post(Customer customer)
2321
{
2422
Db.Save(customer);
25-
customer.Id = (int)Db.GetLastInsertId();
2623

27-
var pathToNewResource = base.RequestContext.AbsoluteUri.CombineWith(customer.Id.ToString());
24+
var pathToNewResource = base.Request.AbsoluteUri.CombineWith(customer.Id.ToString());
2825
return HttpResult.Status201Created(customer, pathToNewResource);
2926
}
3027

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

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>RestIntro.ServiceInterface</RootNamespace>
1212
<AssemblyName>RestIntro.ServiceInterface</AssemblyName>
13-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
15+
<TargetFrameworkProfile />
1516
</PropertyGroup>
1617
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1718
<DebugSymbols>true</DebugSymbols>
@@ -33,28 +34,23 @@
3334
</PropertyGroup>
3435
<ItemGroup>
3536
<Reference Include="ServiceStack">
36-
<HintPath>..\..\packages\ServiceStack.3.9.63\lib\net35\ServiceStack.dll</HintPath>
37+
<HintPath>..\packages\ServiceStack.4.0.11\lib\net40\ServiceStack.dll</HintPath>
38+
<Private>True</Private>
39+
</Reference>
40+
<Reference Include="ServiceStack.Client">
41+
<HintPath>..\packages\ServiceStack.Client.4.0.11\lib\net40\ServiceStack.Client.dll</HintPath>
3742
</Reference>
3843
<Reference Include="ServiceStack.Common">
39-
<HintPath>..\..\packages\ServiceStack.Common.3.9.63\lib\net35\ServiceStack.Common.dll</HintPath>
44+
<HintPath>..\packages\ServiceStack.Common.4.0.11\lib\net40\ServiceStack.Common.dll</HintPath>
4045
</Reference>
4146
<Reference Include="ServiceStack.Interfaces">
42-
<HintPath>..\..\packages\ServiceStack.Common.3.9.63\lib\net35\ServiceStack.Interfaces.dll</HintPath>
47+
<HintPath>..\packages\ServiceStack.Interfaces.4.0.11\lib\net40\ServiceStack.Interfaces.dll</HintPath>
4348
</Reference>
4449
<Reference Include="ServiceStack.OrmLite">
45-
<HintPath>..\..\packages\ServiceStack.OrmLite.SqlServer.3.9.63\lib\net35\ServiceStack.OrmLite.dll</HintPath>
46-
</Reference>
47-
<Reference Include="ServiceStack.OrmLite.SqlServer">
48-
<HintPath>..\..\packages\ServiceStack.OrmLite.SqlServer.3.9.63\lib\net35\ServiceStack.OrmLite.SqlServer.dll</HintPath>
49-
</Reference>
50-
<Reference Include="ServiceStack.Redis">
51-
<HintPath>..\..\packages\ServiceStack.Redis.3.9.63\lib\net35\ServiceStack.Redis.dll</HintPath>
52-
</Reference>
53-
<Reference Include="ServiceStack.ServiceInterface">
54-
<HintPath>..\..\packages\ServiceStack.3.9.63\lib\net35\ServiceStack.ServiceInterface.dll</HintPath>
50+
<HintPath>..\packages\ServiceStack.OrmLite.4.0.11\lib\net40\ServiceStack.OrmLite.dll</HintPath>
5551
</Reference>
5652
<Reference Include="ServiceStack.Text">
57-
<HintPath>..\..\packages\ServiceStack.Text.3.9.63\lib\net35\ServiceStack.Text.dll</HintPath>
53+
<HintPath>..\packages\ServiceStack.Text.4.0.11\lib\net40\ServiceStack.Text.dll</HintPath>
5854
</Reference>
5955
<Reference Include="System" />
6056
<Reference Include="System.Core" />

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ServiceStack" version="3.9.63" targetFramework="net35" />
4-
<package id="ServiceStack.Common" version="3.9.63" targetFramework="net35" />
5-
<package id="ServiceStack.OrmLite.SqlServer" version="3.9.63" targetFramework="net35" />
6-
<package id="ServiceStack.Redis" version="3.9.63" targetFramework="net35" />
7-
<package id="ServiceStack.Text" version="3.9.63" targetFramework="net35" />
3+
<package id="ServiceStack" version="4.0.11" targetFramework="net40" />
4+
<package id="ServiceStack.Client" version="4.0.11" targetFramework="net40" />
5+
<package id="ServiceStack.Common" version="4.0.11" targetFramework="net40" />
6+
<package id="ServiceStack.Interfaces" version="4.0.11" targetFramework="net40" />
7+
<package id="ServiceStack.OrmLite" version="4.0.11" targetFramework="net40" />
8+
<package id="ServiceStack.Text" version="4.0.11" targetFramework="net40" />
89
</packages>

‎src/RestIntro/RestIntro.ServiceModel/Customer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
using ServiceStack;
12
using ServiceStack.DataAnnotations;
2-
using ServiceStack.ServiceHost;
33

44
namespace RestIntro.ServiceModel
55
{

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

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>RestIntro.ServiceModel</RootNamespace>
1212
<AssemblyName>RestIntro.ServiceModel</AssemblyName>
13-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
15+
<TargetFrameworkProfile />
1516
</PropertyGroup>
1617
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1718
<DebugSymbols>true</DebugSymbols>
@@ -32,17 +33,8 @@
3233
<WarningLevel>4</WarningLevel>
3334
</PropertyGroup>
3435
<ItemGroup>
35-
<Reference Include="ServiceStack.Common, Version=3.9.60.0, Culture=neutral, processorArchitecture=MSIL">
36-
<SpecificVersion>False</SpecificVersion>
37-
<HintPath>..\..\packages\ServiceStack.Common.3.9.63\lib\net35\ServiceStack.Common.dll</HintPath>
38-
</Reference>
39-
<Reference Include="ServiceStack.Interfaces, Version=3.9.60.0, Culture=neutral, processorArchitecture=MSIL">
40-
<SpecificVersion>False</SpecificVersion>
41-
<HintPath>..\..\packages\ServiceStack.Common.3.9.63\lib\net35\ServiceStack.Interfaces.dll</HintPath>
42-
</Reference>
43-
<Reference Include="ServiceStack.Text, Version=3.9.59.0, Culture=neutral, processorArchitecture=MSIL">
44-
<SpecificVersion>False</SpecificVersion>
45-
<HintPath>..\..\packages\ServiceStack.Text.3.9.63\lib\net35\ServiceStack.Text.dll</HintPath>
36+
<Reference Include="ServiceStack.Interfaces">
37+
<HintPath>..\packages\ServiceStack.Interfaces.4.0.11\lib\net40\ServiceStack.Interfaces.dll</HintPath>
4638
</Reference>
4739
<Reference Include="System" />
4840
<Reference Include="System.Core" />

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ServiceStack.Common" version="3.9.63" targetFramework="net35" />
4-
<package id="ServiceStack.Text" version="3.9.63" targetFramework="net35" />
3+
<package id="ServiceStack.Interfaces" version="4.0.11" targetFramework="net40" />
54
</packages>

‎src/RestIntro/RestIntro/Global.asax.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
using Funq;
33
using RestIntro.ServiceInterface;
44
using RestIntro.ServiceModel;
5-
using ServiceStack.Common.Utils;
5+
using ServiceStack;
6+
using ServiceStack.Data;
67
using ServiceStack.OrmLite;
7-
using ServiceStack.OrmLite.Sqlite;
8-
using ServiceStack.WebHost.Endpoints;
98

109
namespace RestIntro
1110
{

‎src/RestIntro/RestIntro/RestIntro.csproj

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<AppDesignerFolder>Properties</AppDesignerFolder>
1414
<RootNamespace>RestIntro</RootNamespace>
1515
<AssemblyName>RestIntro</AssemblyName>
16-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1717
<UseIISExpress>false</UseIISExpress>
1818
<FileUpgradeFlags>
1919
</FileUpgradeFlags>
@@ -24,6 +24,7 @@
2424
<IISExpressAnonymousAuthentication />
2525
<IISExpressWindowsAuthentication />
2626
<IISExpressUseClassicPipelineMode />
27+
<TargetFrameworkProfile />
2728
</PropertyGroup>
2829
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2930
<DebugSymbols>true</DebugSymbols>
@@ -46,44 +47,45 @@
4647
<ItemGroup>
4748
<Reference Include="Mono.Data.Sqlite, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
4849
<SpecificVersion>False</SpecificVersion>
49-
<HintPath>..\..\packages\ServiceStack.OrmLite.Sqlite.Mono.3.9.63\lib\net35\Mono.Data.Sqlite.dll</HintPath>
50+
<HintPath>..\packages\ServiceStack.OrmLite.Sqlite.Mono.4.0.11\lib\net40\Mono.Data.Sqlite.dll</HintPath>
5051
</Reference>
51-
<Reference Include="ServiceStack">
52-
<HintPath>..\..\packages\ServiceStack.3.9.63\lib\net35\ServiceStack.dll</HintPath>
53-
</Reference>
54-
<Reference Include="ServiceStack.Common, Version=3.9.60.0, Culture=neutral, processorArchitecture=MSIL">
52+
<Reference Include="ServiceStack, Version=4.0.11.0, Culture=neutral, processorArchitecture=MSIL">
5553
<SpecificVersion>False</SpecificVersion>
56-
<HintPath>..\..\packages\ServiceStack.Common.3.9.63\lib\net35\ServiceStack.Common.dll</HintPath>
54+
<HintPath>..\packages\ServiceStack.4.0.11\lib\net40\ServiceStack.dll</HintPath>
5755
</Reference>
58-
<Reference Include="ServiceStack.Interfaces, Version=3.9.60.0, Culture=neutral, processorArchitecture=MSIL">
59-
<SpecificVersion>False</SpecificVersion>
60-
<HintPath>..\..\packages\ServiceStack.Common.3.9.63\lib\net35\ServiceStack.Interfaces.dll</HintPath>
56+
<Reference Include="ServiceStack.Client">
57+
<HintPath>..\packages\ServiceStack.Client.4.0.11\lib\net40\ServiceStack.Client.dll</HintPath>
6158
</Reference>
62-
<Reference Include="ServiceStack.OrmLite, Version=3.9.60.0, Culture=neutral, processorArchitecture=MSIL">
59+
<Reference Include="ServiceStack.Common, Version=4.0.11.0, Culture=neutral, processorArchitecture=MSIL">
6360
<SpecificVersion>False</SpecificVersion>
64-
<HintPath>..\..\packages\ServiceStack.OrmLite.Sqlite.Mono.3.9.63\lib\net35\ServiceStack.OrmLite.dll</HintPath>
65-
</Reference>
66-
<Reference Include="ServiceStack.OrmLite.Sqlite">
67-
<HintPath>..\..\packages\ServiceStack.OrmLite.Sqlite.Mono.3.9.63\lib\net35\ServiceStack.OrmLite.Sqlite.dll</HintPath>
61+
<HintPath>..\packages\ServiceStack.Common.4.0.11\lib\net40\ServiceStack.Common.dll</HintPath>
6862
</Reference>
69-
<Reference Include="ServiceStack.OrmLite.SqlServer">
70-
<HintPath>..\..\packages\ServiceStack.OrmLite.SqlServer.3.9.63\lib\net35\ServiceStack.OrmLite.SqlServer.dll</HintPath>
63+
<Reference Include="ServiceStack.Interfaces, Version=4.0.0.0, Culture=neutral, PublicKeyToken=e06fbc6124f57c43, processorArchitecture=MSIL">
64+
<SpecificVersion>False</SpecificVersion>
65+
<HintPath>..\packages\ServiceStack.Interfaces.4.0.11\lib\net40\ServiceStack.Interfaces.dll</HintPath>
7166
</Reference>
72-
<Reference Include="ServiceStack.Redis">
73-
<HintPath>..\..\packages\ServiceStack.Redis.3.9.63\lib\net35\ServiceStack.Redis.dll</HintPath>
67+
<Reference Include="ServiceStack.OrmLite, Version=4.0.11.0, Culture=neutral, processorArchitecture=MSIL">
68+
<SpecificVersion>False</SpecificVersion>
69+
<HintPath>..\packages\ServiceStack.OrmLite.4.0.11\lib\net40\ServiceStack.OrmLite.dll</HintPath>
7470
</Reference>
75-
<Reference Include="ServiceStack.ServiceInterface">
76-
<HintPath>..\..\packages\ServiceStack.3.9.63\lib\net35\ServiceStack.ServiceInterface.dll</HintPath>
71+
<Reference Include="ServiceStack.OrmLite.Sqlite, Version=4.0.11.0, Culture=neutral, processorArchitecture=x86">
72+
<SpecificVersion>False</SpecificVersion>
73+
<HintPath>..\packages\ServiceStack.OrmLite.Sqlite.Mono.4.0.11\lib\net40\ServiceStack.OrmLite.Sqlite.dll</HintPath>
7774
</Reference>
78-
<Reference Include="ServiceStack.Text, Version=3.9.59.0, Culture=neutral, processorArchitecture=MSIL">
75+
<Reference Include="ServiceStack.Text, Version=4.0.11.0, Culture=neutral, processorArchitecture=MSIL">
7976
<SpecificVersion>False</SpecificVersion>
80-
<HintPath>..\..\packages\ServiceStack.Text.3.9.63\lib\net35\ServiceStack.Text.dll</HintPath>
77+
<HintPath>..\packages\ServiceStack.Text.4.0.11\lib\net40\ServiceStack.Text.dll</HintPath>
8178
</Reference>
8279
<Reference Include="System" />
83-
<Reference Include="System.Core" />
8480
<Reference Include="System.Data" />
81+
<Reference Include="System.Data.DataSetExtensions" />
8582
<Reference Include="System.Web" />
8683
<Reference Include="System.Configuration" />
84+
<Reference Include="System.Web.ApplicationServices" />
85+
<Reference Include="System.Web.DynamicData" />
86+
<Reference Include="System.Web.Entity" />
87+
<Reference Include="System.Web.Extensions" />
88+
<Reference Include="System.Xml.Linq" />
8789
</ItemGroup>
8890
<ItemGroup>
8991
<Content Include="default.htm" />

‎src/RestIntro/RestIntro/RestIntro.sqlite

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)