Skip to content

Commit 9df94ae

Browse files
mythzmythz
committed
Updated RestFiles to lastest API + NuGet dlls
1 parent 02e2529 commit 9df94ae

File tree

58 files changed

+13231
-78
lines changed

Some content is hidden

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

58 files changed

+13231
-78
lines changed

‎src/RestFiles/RestFiles.ServiceInterface/FilesService.cs

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.IO;
33
using System.Net;
44
using RestFiles.ServiceInterface.Support;
5-
using RestFiles.ServiceModel.Operations;
5+
using RestFiles.ServiceModel;
66
using RestFiles.ServiceModel.Types;
77
using ServiceStack.Common.Web;
88
using ServiceStack.ServiceHost;
@@ -14,14 +14,14 @@ namespace RestFiles.ServiceInterface
1414
/// <summary>
1515
/// Define your ServiceStack web service request (i.e. Request DTO).
1616
/// </summary>
17-
public class FilesService : RestServiceBase<Files>
17+
public class FilesService : Service
1818
{
1919
/// <summary>
2020
/// Gets or sets the AppConfig. The built-in IoC used with ServiceStack autowires this property.
2121
/// </summary>
2222
public AppConfig Config { get; set; }
2323

24-
public override object OnGet(Files request)
24+
public object Get(Files request)
2525
{
2626
var targetFile = GetAndValidateExistingPath(request);
2727

@@ -37,7 +37,7 @@ public override object OnGet(Files request)
3737
return response;
3838
}
3939

40-
public override object OnPost(Files request)
40+
public void Post(Files request)
4141
{
4242
var targetDir = GetPath(request);
4343

@@ -56,11 +56,9 @@ public override object OnPost(Files request)
5656
var newFilePath = Path.Combine(targetDir.FullName, uploadedFile.FileName);
5757
uploadedFile.SaveTo(newFilePath);
5858
}
59-
60-
return new FilesResponse();
6159
}
6260

63-
public override object OnPut(Files request)
61+
public void Put(Files request)
6462
{
6563
var targetFile = GetAndValidateExistingPath(request);
6664

@@ -71,17 +69,12 @@ public override object OnPut(Files request)
7169
throw new ArgumentNullException("TextContents");
7270

7371
File.WriteAllText(targetFile.FullName, request.TextContents);
74-
75-
return new FilesResponse();
7672
}
7773

78-
public override object OnDelete(Files request)
74+
public void Delete(Files request)
7975
{
8076
var targetFile = GetAndValidateExistingPath(request);
81-
8277
File.Delete(targetFile.FullName);
83-
84-
return new FilesResponse();
8578
}
8679

8780
private FolderResult GetFolderResult(string targetPath)

‎src/RestFiles/RestFiles.ServiceInterface/RestFiles.ServiceInterface.csproj

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,26 +52,29 @@
5252
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
5353
</PropertyGroup>
5454
<ItemGroup>
55-
<Reference Include="ServiceStack, Version=3.9.11.0, Culture=neutral, processorArchitecture=MSIL">
56-
<HintPath>..\..\packages\ServiceStack.3.9.11\lib\net35\ServiceStack.dll</HintPath>
55+
<Reference Include="ServiceStack">
56+
<HintPath>..\packages\ServiceStack.3.9.32\lib\net35\ServiceStack.dll</HintPath>
5757
</Reference>
58-
<Reference Include="ServiceStack.Common, Version=3.9.9.0, Culture=neutral, processorArchitecture=MSIL">
59-
<HintPath>..\..\packages\ServiceStack.Common.3.9.11\lib\net35\ServiceStack.Common.dll</HintPath>
58+
<Reference Include="ServiceStack.Common">
59+
<HintPath>..\packages\ServiceStack.Common.3.9.32\lib\net35\ServiceStack.Common.dll</HintPath>
6060
</Reference>
61-
<Reference Include="ServiceStack.Interfaces, Version=3.9.9.0, Culture=neutral, processorArchitecture=MSIL">
62-
<HintPath>..\..\packages\ServiceStack.Common.3.9.11\lib\net35\ServiceStack.Interfaces.dll</HintPath>
61+
<Reference Include="ServiceStack.Interfaces">
62+
<HintPath>..\packages\ServiceStack.Common.3.9.32\lib\net35\ServiceStack.Interfaces.dll</HintPath>
63+
</Reference>
64+
<Reference Include="ServiceStack.OrmLite">
65+
<HintPath>..\packages\ServiceStack.OrmLite.SqlServer.3.9.32\lib\ServiceStack.OrmLite.dll</HintPath>
6366
</Reference>
6467
<Reference Include="ServiceStack.OrmLite.SqlServer">
65-
<HintPath>..\..\packages\ServiceStack.OrmLite.SqlServer.3.9.9\lib\ServiceStack.OrmLite.SqlServer.dll</HintPath>
68+
<HintPath>..\packages\ServiceStack.OrmLite.SqlServer.3.9.32\lib\ServiceStack.OrmLite.SqlServer.dll</HintPath>
6669
</Reference>
6770
<Reference Include="ServiceStack.Redis">
68-
<HintPath>..\..\packages\ServiceStack.Redis.3.9.11\lib\net35\ServiceStack.Redis.dll</HintPath>
71+
<HintPath>..\packages\ServiceStack.Redis.3.9.32\lib\net35\ServiceStack.Redis.dll</HintPath>
6972
</Reference>
70-
<Reference Include="ServiceStack.ServiceInterface, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
71-
<HintPath>..\..\packages\ServiceStack.3.9.11\lib\net35\ServiceStack.ServiceInterface.dll</HintPath>
73+
<Reference Include="ServiceStack.ServiceInterface">
74+
<HintPath>..\packages\ServiceStack.3.9.32\lib\net35\ServiceStack.ServiceInterface.dll</HintPath>
7275
</Reference>
7376
<Reference Include="ServiceStack.Text">
74-
<HintPath>..\..\packages\ServiceStack.Text.3.9.11\lib\net35\ServiceStack.Text.dll</HintPath>
77+
<HintPath>..\packages\ServiceStack.Text.3.9.32\lib\net35\ServiceStack.Text.dll</HintPath>
7578
</Reference>
7679
<Reference Include="System" />
7780
<Reference Include="System.Core">

‎src/RestFiles/RestFiles.ServiceInterface/RevertFilesService.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.IO;
22
using System.Linq;
3-
using RestFiles.ServiceModel.Operations;
3+
using RestFiles.ServiceModel;
44
using ServiceStack.Common.Extensions;
55
using ServiceStack.Common.Utils;
66
using ServiceStack.ServiceInterface;
@@ -36,8 +36,8 @@ public override object OnPost(RevertFiles request)
3636

3737
var dtosDir = Path.Combine(rootDir, "dtos");
3838

39-
var opsDtoPath = Path.Combine(dtosDir, "Operations");
40-
CopyFiles(opsDtoPath, "~/../RestFiles.ServiceModel/Operations/".MapHostAbsolutePath());
39+
var opsDtoPath = dtosDir;
40+
CopyFiles(opsDtoPath, "~/../RestFiles.ServiceModel/".MapHostAbsolutePath());
4141

4242
var typesDtoPath = Path.Combine(dtosDir, "Types");
4343
CopyFiles(typesDtoPath, "~/../RestFiles.ServiceModel/Types/".MapHostAbsolutePath());

‎src/RestFiles/RestFiles.ServiceInterface/packages.config

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
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.SqlServer" version="3.9.9" targetFramework="net35" />
8+
<package id="ServiceStack.OrmLite.SqlServer" version="3.9.32" targetFramework="net35" />
69
<package id="ServiceStack.Redis" version="3.9.11" targetFramework="net35" />
10+
<package id="ServiceStack.Redis" version="3.9.32" targetFramework="net35" />
711
<package id="ServiceStack.Text" version="3.9.11" targetFramework="net35" />
12+
<package id="ServiceStack.Text" version="3.9.32" targetFramework="net35" />
813
</packages>

‎src/RestFiles/RestFiles.ServiceModel/Operations/Files.cs renamed to ‎src/RestFiles/RestFiles.ServiceModel/Files.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
using System.ComponentModel;
2-
using System.Runtime.Serialization;
31
using RestFiles.ServiceModel.Types;
42
using ServiceStack.ServiceHost;
53
using ServiceStack.ServiceInterface.ServiceModel;
64

7-
namespace RestFiles.ServiceModel.Operations
5+
namespace RestFiles.ServiceModel
86
{
97
/// <summary>
108
/// Define your ServiceStack web service request (i.e. the Request DTO).
119
/// </summary>
12-
[Description("GET the File or Directory info at {Path}\n"
13-
+ "POST multipart/formdata to upload a new file to any {Path} in the /ReadWrite folder\n"
14-
+ "PUT {TextContents} to replace the contents of a text file in the /ReadWrite folder\n")]
10+
[Api("GET the File or Directory info at {Path}\n"
11+
+ "POST multipart/formdata to upload a new file to any {Path} in the /ReadWrite folder\n"
12+
+ "PUT {TextContents} to replace the contents of a text file in the /ReadWrite folder\n")]
1513
[Route("/files")]
1614
[Route("/files/{Path*}")]
1715
public class Files

‎src/RestFiles/RestFiles.ServiceModel/RestFiles.ServiceModel.csproj

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -52,26 +52,14 @@
5252
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
5353
</PropertyGroup>
5454
<ItemGroup>
55-
<Reference Include="ServiceStack, Version=3.9.11.0, Culture=neutral, processorArchitecture=MSIL">
56-
<HintPath>..\..\packages\ServiceStack.3.9.11\lib\net35\ServiceStack.dll</HintPath>
57-
</Reference>
5855
<Reference Include="ServiceStack.Common">
59-
<HintPath>..\..\packages\ServiceStack.Common.3.9.11\lib\net35\ServiceStack.Common.dll</HintPath>
60-
</Reference>
61-
<Reference Include="ServiceStack.Interfaces, Version=3.9.9.0, Culture=neutral, processorArchitecture=MSIL">
62-
<HintPath>..\..\packages\ServiceStack.Common.3.9.11\lib\net35\ServiceStack.Interfaces.dll</HintPath>
63-
</Reference>
64-
<Reference Include="ServiceStack.OrmLite.SqlServer">
65-
<HintPath>..\..\packages\ServiceStack.OrmLite.SqlServer.3.9.9\lib\ServiceStack.OrmLite.SqlServer.dll</HintPath>
66-
</Reference>
67-
<Reference Include="ServiceStack.Redis">
68-
<HintPath>..\..\packages\ServiceStack.Redis.3.9.11\lib\net35\ServiceStack.Redis.dll</HintPath>
56+
<HintPath>..\packages\ServiceStack.Common.3.9.32\lib\net35\ServiceStack.Common.dll</HintPath>
6957
</Reference>
70-
<Reference Include="ServiceStack.ServiceInterface, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
71-
<HintPath>..\..\packages\ServiceStack.3.9.11\lib\net35\ServiceStack.ServiceInterface.dll</HintPath>
58+
<Reference Include="ServiceStack.Interfaces">
59+
<HintPath>..\packages\ServiceStack.Common.3.9.32\lib\net35\ServiceStack.Interfaces.dll</HintPath>
7260
</Reference>
7361
<Reference Include="ServiceStack.Text">
74-
<HintPath>..\..\packages\ServiceStack.Text.3.9.11\lib\net35\ServiceStack.Text.dll</HintPath>
62+
<HintPath>..\packages\ServiceStack.Text.3.9.32\lib\net35\ServiceStack.Text.dll</HintPath>
7563
</Reference>
7664
<Reference Include="System" />
7765
<Reference Include="System.Core">
@@ -88,12 +76,12 @@
8876
</Reference>
8977
</ItemGroup>
9078
<ItemGroup>
91-
<Compile Include="Operations\RevertFiles.cs" />
79+
<Compile Include="RevertFiles.cs" />
9280
<Compile Include="Types\FileResult.cs" />
9381
<Compile Include="Types\FolderResult.cs" />
9482
<Compile Include="Types\File.cs" />
9583
<Compile Include="Types\Folder.cs" />
96-
<Compile Include="Operations\Files.cs" />
84+
<Compile Include="Files.cs" />
9785
<Compile Include="Properties\AssemblyInfo.cs" />
9886
</ItemGroup>
9987
<ItemGroup>

‎src/RestFiles/RestFiles.ServiceModel/Operations/RevertFiles.cs renamed to ‎src/RestFiles/RestFiles.ServiceModel/RevertFiles.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
using System.Runtime.Serialization;
21
using ServiceStack.ServiceHost;
32
using ServiceStack.ServiceInterface.ServiceModel;
43

5-
namespace RestFiles.ServiceModel.Operations
4+
namespace RestFiles.ServiceModel
65
{
76
/// <summary>
87
/// Define your ServiceStack web service request (i.e. the Request DTO).

‎src/RestFiles/RestFiles.ServiceModel/Types/File.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System;
2-
using System.Runtime.Serialization;
32

43
namespace RestFiles.ServiceModel.Types
54
{

‎src/RestFiles/RestFiles.ServiceModel/packages.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
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.SqlServer" version="3.9.9" targetFramework="net35" />
67
<package id="ServiceStack.Redis" version="3.9.11" targetFramework="net35" />
78
<package id="ServiceStack.Text" version="3.9.11" targetFramework="net35" />
9+
<package id="ServiceStack.Text" version="3.9.32" targetFramework="net35" />
810
</packages>

‎src/RestFiles/RestFiles.Tests/AsyncRestClientTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Net;
44
using System.Threading;
55
using NUnit.Framework;
6-
using RestFiles.ServiceModel.Operations;
6+
using RestFiles.ServiceModel;
77
using ServiceStack.Common.Web;
88
using ServiceStack.Service;
99
using ServiceStack.ServiceClient.Web;

0 commit comments

Comments
 (0)