Skip to content

Commit 100d796

Browse files
mythzmythz
committed
Convert RestFiles to v4
1 parent 8479de5 commit 100d796

39 files changed

+22447
-451
lines changed

‎src/RestFiles/RestFiles.ServiceInterface/AppConfig.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Collections.Generic;
22
using System.IO;
3-
using ServiceStack.Common.Utils;
3+
using ServiceStack;
44
using ServiceStack.Configuration;
55

66
namespace RestFiles.ServiceInterface
@@ -13,7 +13,7 @@ public AppConfig()
1313
this.ExcludeDirectories = new List<string>();
1414
}
1515

16-
public AppConfig(IResourceManager resources)
16+
public AppConfig(IAppSettings resources)
1717
{
1818
this.RootDirectory = resources.GetString("RootDirectory").MapHostAbsolutePath()
1919
.Replace('\\', Path.DirectorySeparatorChar);

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
using RestFiles.ServiceInterface.Support;
55
using RestFiles.ServiceModel;
66
using RestFiles.ServiceModel.Types;
7-
using ServiceStack.Common.Web;
8-
using ServiceStack.ServiceHost;
9-
using ServiceStack.ServiceInterface;
7+
using ServiceStack;
108
using File = System.IO.File;
119

1210
namespace RestFiles.ServiceInterface
@@ -51,7 +49,7 @@ public void Post(Files request)
5149
if (!Directory.Exists(targetDir.FullName))
5250
Directory.CreateDirectory(targetDir.FullName);
5351

54-
foreach (var uploadedFile in base.RequestContext.Files)
52+
foreach (var uploadedFile in base.Request.Files)
5553
{
5654
var newFilePath = Path.Combine(targetDir.FullName, uploadedFile.FileName);
5755
uploadedFile.SaveTo(newFilePath);

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

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>RestFiles.ServiceInterface</RootNamespace>
1212
<AssemblyName>RestFiles.ServiceInterface</AssemblyName>
13-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<FileUpgradeFlags>
1616
</FileUpgradeFlags>
@@ -31,6 +31,7 @@
3131
<IsWebBootstrapper>false</IsWebBootstrapper>
3232
<UseApplicationTrust>false</UseApplicationTrust>
3333
<BootstrapperEnabled>true</BootstrapperEnabled>
34+
<TargetFrameworkProfile />
3435
</PropertyGroup>
3536
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3637
<DebugSymbols>true</DebugSymbols>
@@ -53,28 +54,19 @@
5354
</PropertyGroup>
5455
<ItemGroup>
5556
<Reference Include="ServiceStack">
56-
<HintPath>..\..\packages\ServiceStack.3.9.63\lib\net35\ServiceStack.dll</HintPath>
57+
<HintPath>..\packages\ServiceStack.4.0.11\lib\net40\ServiceStack.dll</HintPath>
58+
</Reference>
59+
<Reference Include="ServiceStack.Client">
60+
<HintPath>..\packages\ServiceStack.Client.4.0.11\lib\net40\ServiceStack.Client.dll</HintPath>
5761
</Reference>
5862
<Reference Include="ServiceStack.Common">
59-
<HintPath>..\..\packages\ServiceStack.Common.3.9.63\lib\net35\ServiceStack.Common.dll</HintPath>
63+
<HintPath>..\packages\ServiceStack.Common.4.0.11\lib\net40\ServiceStack.Common.dll</HintPath>
6064
</Reference>
6165
<Reference Include="ServiceStack.Interfaces">
62-
<HintPath>..\..\packages\ServiceStack.Common.3.9.63\lib\net35\ServiceStack.Interfaces.dll</HintPath>
63-
</Reference>
64-
<Reference Include="ServiceStack.OrmLite">
65-
<HintPath>..\..\packages\ServiceStack.OrmLite.SqlServer.3.9.63\lib\net35\ServiceStack.OrmLite.dll</HintPath>
66-
</Reference>
67-
<Reference Include="ServiceStack.OrmLite.SqlServer">
68-
<HintPath>..\..\packages\ServiceStack.OrmLite.SqlServer.3.9.63\lib\net35\ServiceStack.OrmLite.SqlServer.dll</HintPath>
69-
</Reference>
70-
<Reference Include="ServiceStack.Redis">
71-
<HintPath>..\..\packages\ServiceStack.Redis.3.9.63\lib\net35\ServiceStack.Redis.dll</HintPath>
72-
</Reference>
73-
<Reference Include="ServiceStack.ServiceInterface">
74-
<HintPath>..\..\packages\ServiceStack.3.9.63\lib\net35\ServiceStack.ServiceInterface.dll</HintPath>
66+
<HintPath>..\packages\ServiceStack.Interfaces.4.0.11\lib\net40\ServiceStack.Interfaces.dll</HintPath>
7567
</Reference>
7668
<Reference Include="ServiceStack.Text">
77-
<HintPath>..\..\packages\ServiceStack.Text.3.9.63\lib\net35\ServiceStack.Text.dll</HintPath>
69+
<HintPath>..\packages\ServiceStack.Text.4.0.11\lib\net40\ServiceStack.Text.dll</HintPath>
7870
</Reference>
7971
<Reference Include="System" />
8072
<Reference Include="System.Core">

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
using System.IO;
22
using System.Linq;
33
using RestFiles.ServiceModel;
4-
using ServiceStack.Common.Extensions;
5-
using ServiceStack.Common.Utils;
6-
using ServiceStack.ServiceInterface;
4+
using ServiceStack;
75

86
namespace RestFiles.ServiceInterface
97
{

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
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.Text" version="4.0.11" targetFramework="net40" />
88
</packages>

‎src/RestFiles/RestFiles.ServiceModel/Files.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using RestFiles.ServiceModel.Types;
2-
using ServiceStack.ServiceHost;
3-
using ServiceStack.ServiceInterface.ServiceModel;
2+
using ServiceStack;
43

54
namespace RestFiles.ServiceModel
65
{

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

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>RestFiles.ServiceModel</RootNamespace>
1212
<AssemblyName>RestFiles.ServiceModel</AssemblyName>
13-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<FileUpgradeFlags>
1616
</FileUpgradeFlags>
@@ -31,6 +31,7 @@
3131
<IsWebBootstrapper>false</IsWebBootstrapper>
3232
<UseApplicationTrust>false</UseApplicationTrust>
3333
<BootstrapperEnabled>true</BootstrapperEnabled>
34+
<TargetFrameworkProfile />
3435
</PropertyGroup>
3536
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3637
<DebugSymbols>true</DebugSymbols>
@@ -52,17 +53,8 @@
5253
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
5354
</PropertyGroup>
5455
<ItemGroup>
55-
<Reference Include="ServiceStack.Common, Version=3.9.60.0, Culture=neutral, processorArchitecture=MSIL">
56-
<SpecificVersion>False</SpecificVersion>
57-
<HintPath>..\..\packages\ServiceStack.Common.3.9.63\lib\net35\ServiceStack.Common.dll</HintPath>
58-
</Reference>
59-
<Reference Include="ServiceStack.Interfaces, Version=3.9.60.0, Culture=neutral, processorArchitecture=MSIL">
60-
<SpecificVersion>False</SpecificVersion>
61-
<HintPath>..\..\packages\ServiceStack.Common.3.9.63\lib\net35\ServiceStack.Interfaces.dll</HintPath>
62-
</Reference>
63-
<Reference Include="ServiceStack.Text, Version=3.9.59.0, Culture=neutral, processorArchitecture=MSIL">
64-
<SpecificVersion>False</SpecificVersion>
65-
<HintPath>..\..\packages\ServiceStack.Text.3.9.63\lib\net35\ServiceStack.Text.dll</HintPath>
56+
<Reference Include="ServiceStack.Interfaces">
57+
<HintPath>..\packages\ServiceStack.Interfaces.4.0.11\lib\net40\ServiceStack.Interfaces.dll</HintPath>
6658
</Reference>
6759
<Reference Include="System" />
6860
<Reference Include="System.Core">

‎src/RestFiles/RestFiles.ServiceModel/RevertFiles.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using ServiceStack.ServiceHost;
2-
using ServiceStack.ServiceInterface.ServiceModel;
1+
using ServiceStack;
32

43
namespace RestFiles.ServiceModel
54
{

‎src/RestFiles/RestFiles.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>

0 commit comments

Comments
 (0)