Skip to content

Commit 1955694

Browse files
mythzmythz
committed
Upgrade Docs to v4.0.11
1 parent 4827135 commit 1955694

Some content is hidden

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

41 files changed

+11283
-153
lines changed

‎src/Docs/Docs.Logic/CategoryService.cs‎

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

54
namespace Docs.Logic
65
{

‎src/Docs/Docs.Logic/Docs.Logic.csproj‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>Docs.Logic</RootNamespace>
1212
<AssemblyName>Docs.Logic</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,28 +33,19 @@
3233
</PropertyGroup>
3334
<ItemGroup>
3435
<Reference Include="ServiceStack">
35-
<HintPath>..\..\packages\ServiceStack.3.9.63\lib\net35\ServiceStack.dll</HintPath>
36+
<HintPath>..\packages\ServiceStack.4.0.11\lib\net40\ServiceStack.dll</HintPath>
37+
</Reference>
38+
<Reference Include="ServiceStack.Client">
39+
<HintPath>..\packages\ServiceStack.Client.4.0.11\lib\net40\ServiceStack.Client.dll</HintPath>
3640
</Reference>
3741
<Reference Include="ServiceStack.Common">
38-
<HintPath>..\..\packages\ServiceStack.Common.3.9.63\lib\net35\ServiceStack.Common.dll</HintPath>
42+
<HintPath>..\packages\ServiceStack.Common.4.0.11\lib\net40\ServiceStack.Common.dll</HintPath>
3943
</Reference>
4044
<Reference Include="ServiceStack.Interfaces">
41-
<HintPath>..\..\packages\ServiceStack.Common.3.9.63\lib\net35\ServiceStack.Interfaces.dll</HintPath>
42-
</Reference>
43-
<Reference Include="ServiceStack.OrmLite">
44-
<HintPath>..\..\packages\ServiceStack.OrmLite.SqlServer.3.9.63\lib\net35\ServiceStack.OrmLite.dll</HintPath>
45-
</Reference>
46-
<Reference Include="ServiceStack.OrmLite.SqlServer">
47-
<HintPath>..\..\packages\ServiceStack.OrmLite.SqlServer.3.9.63\lib\net35\ServiceStack.OrmLite.SqlServer.dll</HintPath>
48-
</Reference>
49-
<Reference Include="ServiceStack.Redis">
50-
<HintPath>..\..\packages\ServiceStack.Redis.3.9.63\lib\net35\ServiceStack.Redis.dll</HintPath>
51-
</Reference>
52-
<Reference Include="ServiceStack.ServiceInterface">
53-
<HintPath>..\..\packages\ServiceStack.3.9.63\lib\net35\ServiceStack.ServiceInterface.dll</HintPath>
45+
<HintPath>..\packages\ServiceStack.Interfaces.4.0.11\lib\net40\ServiceStack.Interfaces.dll</HintPath>
5446
</Reference>
5547
<Reference Include="ServiceStack.Text">
56-
<HintPath>..\..\packages\ServiceStack.Text.3.9.63\lib\net35\ServiceStack.Text.dll</HintPath>
48+
<HintPath>..\packages\ServiceStack.Text.4.0.11\lib\net40\ServiceStack.Text.dll</HintPath>
5749
</Reference>
5850
<Reference Include="System" />
5951
<Reference Include="System.Core" />

‎src/Docs/Docs.Logic/Extensions.cs‎

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

44
namespace Docs.Logic
55
{

‎src/Docs/Docs.Logic/PageManager.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
using System.Collections.Generic;
33
using System.IO;
44
using System.Linq;
5-
using ServiceStack.Common.Extensions;
6-
using ServiceStack.ServiceHost;
7-
using ServiceStack.Text;
5+
using ServiceStack;
86

97
namespace Docs.Logic
108
{
@@ -36,7 +34,7 @@ public void Init(string filePath, string baseUrl)
3634
}
3735

3836
this.PageMap = new Dictionary<string, Page>(StringComparer.CurrentCultureIgnoreCase);
39-
Pages.Where(x => !x.FilePath.IsNullOrEmpty()).ForEach(x => PageMap[x.FilePath] = x);
37+
Pages.Where(x => !x.FilePath.IsNullOrEmpty()).Each(x => PageMap[x.FilePath] = x);
4038

4139
CategoriesMap = new Dictionary<string, List<Page>>(StringComparer.CurrentCultureIgnoreCase);
4240
foreach (var page in Pages)

‎src/Docs/Docs.Logic/PageService.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
using System.Collections.Generic;
33
using System.IO;
44
using System.Linq;
5-
using ServiceStack.ServiceClient.Web;
6-
using ServiceStack.ServiceInterface;
7-
using ServiceStack.Text;
5+
using ServiceStack;
86

97
namespace Docs.Logic
108
{

‎src/Docs/Docs.Logic/SearchService.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3-
using ServiceStack.ServiceInterface;
4-
using ServiceStack.ServiceInterface.ServiceModel;
5-
using ServiceStack.Text;
3+
using ServiceStack;
64

75
namespace Docs.Logic
86
{

‎src/Docs/Docs.Logic/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/Docs/Docs.csproj‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<AppDesignerFolder>Properties</AppDesignerFolder>
1414
<RootNamespace>Docs</RootNamespace>
1515
<AssemblyName>Docs</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>
@@ -43,42 +44,41 @@
4344
<WarningLevel>4</WarningLevel>
4445
</PropertyGroup>
4546
<ItemGroup>
46-
<Reference Include="ServiceStack">
47-
<HintPath>..\packages\ServiceStack.3.9.63\lib\net35\ServiceStack.dll</HintPath>
47+
<Reference Include="ServiceStack, Version=4.0.11.0, Culture=neutral, processorArchitecture=MSIL">
48+
<SpecificVersion>False</SpecificVersion>
49+
<HintPath>..\..\..\ServiceStack\src\ServiceStack\bin\Release\ServiceStack.dll</HintPath>
4850
</Reference>
49-
<Reference Include="ServiceStack.Common">
50-
<HintPath>..\packages\ServiceStack.Common.3.9.63\lib\net35\ServiceStack.Common.dll</HintPath>
51+
<Reference Include="ServiceStack.Client, Version=4.0.11.0, Culture=neutral, processorArchitecture=MSIL">
52+
<SpecificVersion>False</SpecificVersion>
53+
<HintPath>..\..\..\ServiceStack\src\ServiceStack\bin\Release\ServiceStack.Client.dll</HintPath>
5154
</Reference>
52-
<Reference Include="ServiceStack.Interfaces">
53-
<HintPath>..\packages\ServiceStack.Common.3.9.63\lib\net35\ServiceStack.Interfaces.dll</HintPath>
55+
<Reference Include="ServiceStack.Common, Version=4.0.11.0, Culture=neutral, processorArchitecture=MSIL">
56+
<SpecificVersion>False</SpecificVersion>
57+
<HintPath>..\..\..\ServiceStack\src\ServiceStack\bin\Release\ServiceStack.Common.dll</HintPath>
5458
</Reference>
55-
<Reference Include="ServiceStack.OrmLite">
56-
<HintPath>..\packages\ServiceStack.OrmLite.SqlServer.3.9.63\lib\net35\ServiceStack.OrmLite.dll</HintPath>
59+
<Reference Include="ServiceStack.Interfaces, Version=4.0.0.0, Culture=neutral, PublicKeyToken=e06fbc6124f57c43, processorArchitecture=MSIL">
60+
<SpecificVersion>False</SpecificVersion>
61+
<HintPath>..\..\..\ServiceStack\src\ServiceStack\bin\Release\ServiceStack.Interfaces.dll</HintPath>
5762
</Reference>
58-
<Reference Include="ServiceStack.OrmLite.SqlServer">
59-
<HintPath>..\packages\ServiceStack.OrmLite.SqlServer.3.9.63\lib\net35\ServiceStack.OrmLite.SqlServer.dll</HintPath>
60-
</Reference>
61-
<Reference Include="ServiceStack.Redis">
62-
<HintPath>..\packages\ServiceStack.Redis.3.9.63\lib\net35\ServiceStack.Redis.dll</HintPath>
63-
</Reference>
64-
<Reference Include="ServiceStack.ServiceInterface">
65-
<HintPath>..\packages\ServiceStack.3.9.63\lib\net35\ServiceStack.ServiceInterface.dll</HintPath>
66-
</Reference>
67-
<Reference Include="ServiceStack.Text">
68-
<HintPath>..\packages\ServiceStack.Text.3.9.63\lib\net35\ServiceStack.Text.dll</HintPath>
63+
<Reference Include="ServiceStack.Text, Version=4.0.11.0, Culture=neutral, processorArchitecture=MSIL">
64+
<SpecificVersion>False</SpecificVersion>
65+
<HintPath>..\..\..\ServiceStack\src\ServiceStack\bin\Release\ServiceStack.Text.dll</HintPath>
6966
</Reference>
7067
<Reference Include="System" />
7168
<Reference Include="System.Data" />
72-
<Reference Include="System.Core" />
7369
<Reference Include="System.Data.DataSetExtensions" />
74-
<Reference Include="System.Xml.Linq" />
70+
<Reference Include="System.Web.ApplicationServices" />
71+
<Reference Include="System.Web.DynamicData" />
72+
<Reference Include="System.Web.Entity" />
73+
<Reference Include="System.Web.Extensions" />
7574
<Reference Include="System.Drawing" />
7675
<Reference Include="System.Web" />
7776
<Reference Include="System.Xml" />
7877
<Reference Include="System.Configuration" />
78+
<Reference Include="System.Xml.Linq" />
7979
</ItemGroup>
8080
<ItemGroup>
81-
<Content Include="default.shtml" />
81+
<Content Include="Views\Shared\_Layout.shtml" />
8282
<Content Include="css\default.css" />
8383
<Content Include="css\styles.css" />
8484
<Content Include="Global.asax" />

‎src/Docs/Global.asax.cs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using System;
2+
using System.Linq;
23
using Docs.Logic;
34
using Funq;
45
using ServiceStack;
56
using ServiceStack.Configuration;
6-
using ServiceStack.ServiceHost;
7-
using ServiceStack.WebHost.Endpoints;
7+
using ServiceStack.Formats;
88

99
namespace Docs
1010
{
@@ -27,10 +27,13 @@ public override void Configure(Container container)
2727
.Add<Search>("/search")
2828
.Add<Search>("/search/{Query}");
2929

30-
SetConfig(new EndpointHostConfig {
30+
SetConfig(new HostConfig {
3131
WebHostUrl = baseUrl, //replaces ~/ with Url
3232
MarkdownBaseType = typeof(CustomMarkdownPage), //set custom base for all Markdown pages
3333
});
34+
35+
var plugin = (MarkdownFormat)Plugins.First(x => x is MarkdownFormat);
36+
var page = plugin.FindByPathInfo("/about");
3437
}
3538
}
3639

‎src/Docs/default.shtml‎ renamed to ‎src/Docs/Views/Shared/_Layout.shtml‎

File renamed without changes.

0 commit comments

Comments
 (0)