Skip to content

Commit 4827135

Browse files
mythzmythz
committed
Upgrade RedisStackOverflow to v4.0.11
1 parent 5e8e742 commit 4827135

39 files changed

+12530
-181
lines changed

‎src/RedisStackOverflow/RedisStackOverflow.ServiceInterface/AnswersService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using RedisStackOverflow.ServiceModel;
2-
using ServiceStack.ServiceInterface;
2+
using ServiceStack;
33

44
namespace RedisStackOverflow.ServiceInterface
55
{

‎src/RedisStackOverflow/RedisStackOverflow.ServiceInterface/IRepository.cs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
using System.Collections.Generic;
33
using System.Linq;
44
using RedisStackOverflow.ServiceModel;
5-
using ServiceStack.Common.Utils;
5+
using ServiceStack;
66
using ServiceStack.Redis;
7-
using ServiceStack.Common.Extensions;
87

98
namespace RedisStackOverflow.ServiceInterface
109
{
@@ -172,10 +171,10 @@ public List<QuestionResult> GetQuestionsTaggedWith(string tagName)
172171

173172
private List<QuestionResult> ToQuestionResults(IEnumerable<Question> questions)
174173
{
175-
var uniqueUserIds = questions.ConvertAll(x => x.UserId).ToHashSet();
174+
var uniqueUserIds = questions.Map(x => x.UserId).ToHashSet();
176175
var usersMap = GetUsersByIds(uniqueUserIds).ToDictionary(x => x.Id);
177176

178-
var results = questions.ConvertAll(x => new QuestionResult { Question = x });
177+
var results = questions.Map(x => new QuestionResult { Question = x });
179178
var resultsMap = results.ToDictionary(q => q.Question.Id);
180179

181180
results.ForEach(x => x.User = usersMap[x.Question.UserId]);
@@ -399,7 +398,7 @@ public List<Tag> GetTagsByPopularity(int skip, int take)
399398
using (var redis = RedisManager.GetReadOnlyClient())
400399
{
401400
var tagEntries = redis.GetRangeWithScoresFromSortedSetDesc(TagIndex.All, skip, take);
402-
var tags = tagEntries.ConvertAll(kvp => new Tag { Name = kvp.Key, Score = (int)kvp.Value });
401+
var tags = tagEntries.Map(kvp => new Tag { Name = kvp.Key, Score = (int)kvp.Value });
403402
return tags;
404403
}
405404
}

‎src/RedisStackOverflow/RedisStackOverflow.ServiceInterface/QuestionsService.cs‎

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

54
namespace RedisStackOverflow.ServiceInterface
65
{

‎src/RedisStackOverflow/RedisStackOverflow.ServiceInterface/RedisStackOverflow.ServiceInterface.csproj‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>RedisStackOverflow.ServiceInterface</RootNamespace>
1212
<AssemblyName>RedisStackOverflow.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,22 @@
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>
66+
<HintPath>..\packages\ServiceStack.Interfaces.4.0.11\lib\net40\ServiceStack.Interfaces.dll</HintPath>
6967
</Reference>
7068
<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>
69+
<HintPath>..\packages\ServiceStack.Redis.4.0.11\lib\net40\ServiceStack.Redis.dll</HintPath>
7570
</Reference>
7671
<Reference Include="ServiceStack.Text">
77-
<HintPath>..\..\packages\ServiceStack.Text.3.9.63\lib\net35\ServiceStack.Text.dll</HintPath>
72+
<HintPath>..\packages\ServiceStack.Text.4.0.11\lib\net40\ServiceStack.Text.dll</HintPath>
7873
</Reference>
7974
<Reference Include="System" />
8075
<Reference Include="System.Core">

‎src/RedisStackOverflow/RedisStackOverflow.ServiceInterface/ResetService.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
using System.Collections.Generic;
22
using RedisStackOverflow.ServiceModel;
3-
using ServiceStack.Common.Extensions;
3+
using ServiceStack;
44
using ServiceStack.Redis;
5-
using ServiceStack.ServiceInterface;
65

76
namespace RedisStackOverflow.ServiceInterface
87
{
@@ -54,8 +53,8 @@ public object Get(Reset request)
5453
JavascriptQuestions.ForEach(questionsd.Add);
5554

5655
var questions = new List<Question>();
57-
questions.AddRange(RestQuestions.ConvertAll(kvp => ToQuestion(kvp.Key, kvp.Value, new List<string> { "rest", "http" })));
58-
questions.AddRange(JavascriptQuestions.ConvertAll(kvp => ToQuestion(kvp.Key, kvp.Value, new List<string> { "javascript", "jquery" })));
56+
questions.AddRange(RestQuestions.Map(kvp => ToQuestion(kvp.Key, kvp.Value, new List<string> { "rest", "http" })));
57+
questions.AddRange(JavascriptQuestions.Map(kvp => ToQuestion(kvp.Key, kvp.Value, new List<string> { "javascript", "jquery" })));
5958

6059

6160
RedisManager.Exec(r => r.FlushAll());

‎src/RedisStackOverflow/RedisStackOverflow.ServiceInterface/StatsService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using RedisStackOverflow.ServiceModel;
2-
using ServiceStack.ServiceInterface;
2+
using ServiceStack;
33

44
namespace RedisStackOverflow.ServiceInterface
55
{

‎src/RedisStackOverflow/RedisStackOverflow.ServiceInterface/UserService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using RedisStackOverflow.ServiceModel;
2-
using ServiceStack.ServiceInterface;
2+
using ServiceStack;
33

44
namespace RedisStackOverflow.ServiceInterface
55
{

‎src/RedisStackOverflow/RedisStackOverflow.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.Redis" version="4.0.11" targetFramework="net40" />
8+
<package id="ServiceStack.Text" version="4.0.11" targetFramework="net40" />
89
</packages>

‎src/RedisStackOverflow/RedisStackOverflow.ServiceModel/Answers.cs‎

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

44
namespace RedisStackOverflow.ServiceModel
55
{

‎src/RedisStackOverflow/RedisStackOverflow.ServiceModel/Questions.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3-
using ServiceStack.ServiceHost;
4-
using ServiceStack.ServiceInterface.ServiceModel;
3+
using ServiceStack;
54

65
namespace RedisStackOverflow.ServiceModel
76
{

0 commit comments

Comments
 (0)