Skip to content

Commit 3e7bca4

Browse files
mythzmythz
committed
Upgrade to v4.0.44
1 parent 2d5f9f1 commit 3e7bca4

File tree

44 files changed

+1251
-13274
lines changed

Some content is hidden

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

44 files changed

+1251
-13274
lines changed

‎src/.vs/config/applicationhost.config

Lines changed: 1027 additions & 0 deletions
Large diffs are not rendered by default.

‎src/RedisAdminUI.DataSource.Northwind/RedisAdminUI.DataSource.Northwind.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
</PropertyGroup>
5555
<ItemGroup>
5656
<Reference Include="ServiceStack.Interfaces, Version=4.0.0.0, Culture=neutral, PublicKeyToken=e06fbc6124f57c43, processorArchitecture=MSIL">
57-
<SpecificVersion>False</SpecificVersion>
58-
<HintPath>..\packages\ServiceStack.Interfaces.4.0.31\lib\portable-wp80+sl5+net40+win8+monotouch+monoandroid\ServiceStack.Interfaces.dll</HintPath>
57+
<HintPath>..\packages\ServiceStack.Interfaces.4.0.44\lib\portable-wp80+sl5+net40+win8+monotouch+monoandroid+xamarin.ios10\ServiceStack.Interfaces.dll</HintPath>
58+
<Private>True</Private>
5959
</Reference>
6060
<Reference Include="System" />
6161
<Reference Include="System.ComponentModel.DataAnnotations">

‎src/RedisAdminUI.DataSource.Northwind/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ServiceStack.Interfaces" version="4.0.31" targetFramework="net40" />
3+
<package id="ServiceStack.Interfaces" version="4.0.44" targetFramework="net4" />
44
</packages>

‎src/RedisAdminUI.ServiceInterface/App/GetCodeGeneratedJavaScriptService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public object Any(GetCodeGeneratedJavaScript request)
121121
");
122122
var isFirst = true;
123123

124-
var allOperationTypes = HostContext.Metadata.GetAllTypes();
124+
var allOperationTypes = HostContext.Metadata.GetAllOperationTypes();
125125
for (int opIndex = 0; opIndex < allOperationTypes.Count; opIndex++)
126126
{
127127
var operationType = allOperationTypes[opIndex];

‎src/RedisAdminUI.ServiceInterface/RedisAdminUI.ServiceInterface.csproj

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,27 +53,29 @@
5353
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
5454
</PropertyGroup>
5555
<ItemGroup>
56-
<Reference Include="ServiceStack, Version=4.0.31.0, Culture=neutral, processorArchitecture=MSIL">
57-
<SpecificVersion>False</SpecificVersion>
58-
<HintPath>..\packages\ServiceStack.4.0.31\lib\net40\ServiceStack.dll</HintPath>
56+
<Reference Include="ServiceStack, Version=4.0.44.0, Culture=neutral, processorArchitecture=MSIL">
57+
<HintPath>..\packages\ServiceStack.4.0.44\lib\net40\ServiceStack.dll</HintPath>
58+
<Private>True</Private>
5959
</Reference>
60-
<Reference Include="ServiceStack.Client">
61-
<HintPath>..\packages\ServiceStack.Client.4.0.31\lib\net40\ServiceStack.Client.dll</HintPath>
60+
<Reference Include="ServiceStack.Client, Version=4.0.44.0, Culture=neutral, processorArchitecture=MSIL">
61+
<HintPath>..\packages\ServiceStack.Client.4.0.44\lib\net40\ServiceStack.Client.dll</HintPath>
62+
<Private>True</Private>
6263
</Reference>
63-
<Reference Include="ServiceStack.Common, Version=4.0.31.0, Culture=neutral, processorArchitecture=MSIL">
64-
<SpecificVersion>False</SpecificVersion>
65-
<HintPath>..\packages\ServiceStack.Common.4.0.31\lib\net40\ServiceStack.Common.dll</HintPath>
64+
<Reference Include="ServiceStack.Common, Version=4.0.44.0, Culture=neutral, processorArchitecture=MSIL">
65+
<HintPath>..\packages\ServiceStack.Common.4.0.44\lib\net40\ServiceStack.Common.dll</HintPath>
66+
<Private>True</Private>
6667
</Reference>
6768
<Reference Include="ServiceStack.Interfaces, Version=4.0.0.0, Culture=neutral, PublicKeyToken=e06fbc6124f57c43, processorArchitecture=MSIL">
68-
<SpecificVersion>False</SpecificVersion>
69-
<HintPath>..\packages\ServiceStack.Interfaces.4.0.31\lib\portable-wp80+sl5+net40+win8+monotouch+monoandroid\ServiceStack.Interfaces.dll</HintPath>
69+
<HintPath>..\packages\ServiceStack.Interfaces.4.0.44\lib\portable-wp80+sl5+net40+win8+monotouch+monoandroid+xamarin.ios10\ServiceStack.Interfaces.dll</HintPath>
70+
<Private>True</Private>
7071
</Reference>
71-
<Reference Include="ServiceStack.Redis">
72-
<HintPath>..\packages\ServiceStack.Redis.4.0.31\lib\net40\ServiceStack.Redis.dll</HintPath>
72+
<Reference Include="ServiceStack.Redis, Version=4.0.44.0, Culture=neutral, processorArchitecture=MSIL">
73+
<HintPath>..\packages\ServiceStack.Redis.4.0.44\lib\net40\ServiceStack.Redis.dll</HintPath>
74+
<Private>True</Private>
7375
</Reference>
74-
<Reference Include="ServiceStack.Text, Version=4.0.31.0, Culture=neutral, processorArchitecture=MSIL">
75-
<SpecificVersion>False</SpecificVersion>
76-
<HintPath>..\packages\ServiceStack.Text.4.0.31\lib\net40\ServiceStack.Text.dll</HintPath>
76+
<Reference Include="ServiceStack.Text, Version=4.0.44.0, Culture=neutral, processorArchitecture=MSIL">
77+
<HintPath>..\packages\ServiceStack.Text.4.0.44\lib\net40\ServiceStack.Text.dll</HintPath>
78+
<Private>True</Private>
7779
</Reference>
7880
<Reference Include="System" />
7981
<Reference Include="System.Core">

‎src/RedisAdminUI.ServiceInterface/packages.config

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

‎src/RedisAdminUI.ServiceModel/Operations/Common/GetTimeToLive.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public GetTimeToLiveResponse()
2020
}
2121

2222
[DataMember]
23-
public TimeSpan TimeRemaining { get; set; }
23+
public TimeSpan? TimeRemaining { get; set; }
2424

2525
[DataMember]
2626
public ResponseStatus ResponseStatus { get; set; }

‎src/RedisAdminUI.ServiceModel/RedisAdminUI.ServiceModel.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
</PropertyGroup>
5555
<ItemGroup>
5656
<Reference Include="ServiceStack.Interfaces, Version=4.0.0.0, Culture=neutral, PublicKeyToken=e06fbc6124f57c43, processorArchitecture=MSIL">
57-
<SpecificVersion>False</SpecificVersion>
58-
<HintPath>..\packages\ServiceStack.Interfaces.4.0.31\lib\portable-wp80+sl5+net40+win8+monotouch+monoandroid\ServiceStack.Interfaces.dll</HintPath>
57+
<HintPath>..\packages\ServiceStack.Interfaces.4.0.44\lib\portable-wp80+sl5+net40+win8+monotouch+monoandroid+xamarin.ios10\ServiceStack.Interfaces.dll</HintPath>
58+
<Private>True</Private>
5959
</Reference>
6060
<Reference Include="System" />
6161
<Reference Include="System.Core">
@@ -204,15 +204,15 @@
204204
<Install>true</Install>
205205
</BootstrapperPackage>
206206
</ItemGroup>
207-
<ItemGroup>
208-
<None Include="packages.config" />
209-
</ItemGroup>
210207
<ItemGroup>
211208
<ProjectReference Include="..\RedisAdminUI.DataSource.Northwind\RedisAdminUI.DataSource.Northwind.csproj">
212209
<Project>{508FA67C-D7B3-4823-A26E-F6467C15B83A}</Project>
213210
<Name>RedisAdminUI.DataSource.Northwind</Name>
214211
</ProjectReference>
215212
</ItemGroup>
213+
<ItemGroup>
214+
<None Include="packages.config" />
215+
</ItemGroup>
216216
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
217217
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
218218
Other similar extension points exist, see Microsoft.Common.targets.

‎src/RedisAdminUI.ServiceModel/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ServiceStack.Interfaces" version="4.0.31" targetFramework="net40" />
3+
<package id="ServiceStack.Interfaces" version="4.0.44" targetFramework="net4" />
44
</packages>

‎src/RedisAdminUI/RedisAdminUI.csproj

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<IISExpressWindowsAuthentication />
2525
<IISExpressUseClassicPipelineMode />
2626
<TargetFrameworkProfile />
27+
<UseGlobalApplicationHostFile />
2728
</PropertyGroup>
2829
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2930
<DebugSymbols>true</DebugSymbols>
@@ -46,28 +47,29 @@
4647
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
4748
</PropertyGroup>
4849
<ItemGroup>
49-
<Reference Include="ServiceStack, Version=4.0.31.0, Culture=neutral, processorArchitecture=MSIL">
50-
<SpecificVersion>False</SpecificVersion>
51-
<HintPath>..\packages\ServiceStack.4.0.31\lib\net40\ServiceStack.dll</HintPath>
50+
<Reference Include="ServiceStack, Version=4.0.44.0, Culture=neutral, processorArchitecture=MSIL">
51+
<HintPath>..\packages\ServiceStack.4.0.44\lib\net40\ServiceStack.dll</HintPath>
52+
<Private>True</Private>
5253
</Reference>
53-
<Reference Include="ServiceStack.Client">
54-
<HintPath>..\packages\ServiceStack.Client.4.0.31\lib\net40\ServiceStack.Client.dll</HintPath>
54+
<Reference Include="ServiceStack.Client, Version=4.0.44.0, Culture=neutral, processorArchitecture=MSIL">
55+
<HintPath>..\packages\ServiceStack.Client.4.0.44\lib\net40\ServiceStack.Client.dll</HintPath>
56+
<Private>True</Private>
5557
</Reference>
56-
<Reference Include="ServiceStack.Common, Version=4.0.31.0, Culture=neutral, processorArchitecture=MSIL">
57-
<SpecificVersion>False</SpecificVersion>
58-
<HintPath>..\packages\ServiceStack.Common.4.0.31\lib\net40\ServiceStack.Common.dll</HintPath>
58+
<Reference Include="ServiceStack.Common, Version=4.0.44.0, Culture=neutral, processorArchitecture=MSIL">
59+
<HintPath>..\packages\ServiceStack.Common.4.0.44\lib\net40\ServiceStack.Common.dll</HintPath>
60+
<Private>True</Private>
5961
</Reference>
6062
<Reference Include="ServiceStack.Interfaces, Version=4.0.0.0, Culture=neutral, PublicKeyToken=e06fbc6124f57c43, processorArchitecture=MSIL">
61-
<SpecificVersion>False</SpecificVersion>
62-
<HintPath>..\packages\ServiceStack.Interfaces.4.0.31\lib\portable-wp80+sl5+net40+win8+monotouch+monoandroid\ServiceStack.Interfaces.dll</HintPath>
63+
<HintPath>..\packages\ServiceStack.Interfaces.4.0.44\lib\portable-wp80+sl5+net40+win8+monotouch+monoandroid+xamarin.ios10\ServiceStack.Interfaces.dll</HintPath>
64+
<Private>True</Private>
6365
</Reference>
64-
<Reference Include="ServiceStack.Redis, Version=4.0.31.0, Culture=neutral, processorArchitecture=MSIL">
65-
<SpecificVersion>False</SpecificVersion>
66-
<HintPath>..\packages\ServiceStack.Redis.4.0.31\lib\net40\ServiceStack.Redis.dll</HintPath>
66+
<Reference Include="ServiceStack.Redis, Version=4.0.44.0, Culture=neutral, processorArchitecture=MSIL">
67+
<HintPath>..\packages\ServiceStack.Redis.4.0.44\lib\net40\ServiceStack.Redis.dll</HintPath>
68+
<Private>True</Private>
6769
</Reference>
68-
<Reference Include="ServiceStack.Text, Version=4.0.31.0, Culture=neutral, processorArchitecture=MSIL">
69-
<SpecificVersion>False</SpecificVersion>
70-
<HintPath>..\packages\ServiceStack.Text.4.0.31\lib\net40\ServiceStack.Text.dll</HintPath>
70+
<Reference Include="ServiceStack.Text, Version=4.0.44.0, Culture=neutral, processorArchitecture=MSIL">
71+
<HintPath>..\packages\ServiceStack.Text.4.0.44\lib\net40\ServiceStack.Text.dll</HintPath>
72+
<Private>True</Private>
7173
</Reference>
7274
<Reference Include="System" />
7375
<Reference Include="System.Data" />

‎src/RedisAdminUI/Web.config

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2,49 +2,49 @@
22
<!--Standard IIS 7.0 Web.config as created by Visual Studio.NET -->
33
<!-- All changes from the default configuaration is prefixed by '[ServiceStack Specific]:' -->
44
<configuration>
5-
<appSettings>
6-
<add key="MonoServerDefaultIndexFiles" value="Default.aspx, default.htm"/>
7-
<add key="RedisHostAddress" value="localhost:6379"/>
8-
<add key="RedisDb" value="0"/>
9-
<add key="DefaultRedirectPath" value="AjaxClient"/>
10-
</appSettings>
5+
<appSettings>
6+
<add key="MonoServerDefaultIndexFiles" value="Default.aspx, default.htm"/>
7+
<add key="RedisHostAddress" value="localhost:6379"/>
8+
<add key="RedisDb" value="0"/>
9+
<add key="DefaultRedirectPath" value="AjaxClient"/>
10+
</appSettings>
1111

12-
<connectionStrings/>
12+
<connectionStrings/>
13+
14+
<location path="redis">
15+
<system.web>
16+
<httpHandlers>
17+
<add path="*" type="ServiceStack.HttpHandlerFactory, ServiceStack" verb="*"/>
18+
</httpHandlers>
19+
</system.web>
20+
<!-- Required for IIS 7.0 -->
21+
<system.webServer>
22+
<modules runAllManagedModulesForAllRequests="true"/>
23+
<validation validateIntegratedModeConfiguration="false"/>
24+
<handlers>
25+
<add path="*" name="ServiceStack.Factory"
26+
type="ServiceStack.HttpHandlerFactory, ServiceStack"
27+
verb="*" preCondition="integratedMode"
28+
resourceType="Unspecified" allowPathInfo="true"/>
29+
</handlers>
30+
</system.webServer>
31+
</location>
1332

14-
<location path="redis">
1533
<system.web>
16-
<httpHandlers>
17-
<add path="*" type="ServiceStack.HttpHandlerFactory, ServiceStack" verb="*"/>
18-
</httpHandlers>
19-
</system.web>
20-
<!-- Required for IIS 7.0 -->
21-
<system.webServer>
22-
<modules runAllManagedModulesForAllRequests="true"/>
23-
<validation validateIntegratedModeConfiguration="false"/>
24-
<handlers>
25-
<add path="*" name="ServiceStack.Factory"
26-
type="ServiceStack.HttpHandlerFactory, ServiceStack"
27-
verb="*" preCondition="integratedMode"
28-
resourceType="Unspecified" allowPathInfo="true"/>
29-
</handlers>
30-
</system.webServer>
31-
</location>
32-
33-
<system.web>
34-
<!--
34+
<!--
3535
Set compilation debug="true" to insert debugging
3636
symbols into the compiled page. Because this
3737
affects performance, set this value to true only
3838
during development.
3939
-->
40-
<compilation debug="true" targetFramework="4.0"/>
41-
<!--
40+
<compilation debug="true" targetFramework="4.0"/>
41+
<!--
4242
The <authentication> section enables configuration
4343
of the security authentication mode used by
4444
ASP.NET to identify an incoming user.
4545
-->
46-
<authentication mode="Windows"/>
47-
<!--
46+
<authentication mode="Windows"/>
47+
<!--
4848
The <customErrors> section enables configuration
4949
of what to do if/when an unhandled error occurs
5050
during the execution of a request. Specifically,
@@ -56,16 +56,16 @@
5656
<error statusCode="404" redirect="FileNotFound.htm" />
5757
</customErrors>
5858
-->
59-
<httpHandlers>
60-
<add path="redis*" type="ServiceStack.HttpHandlerFactory, ServiceStack" verb="*"/>
61-
</httpHandlers>
62-
<pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID"/>
63-
</system.web>
64-
<!--
59+
<httpHandlers>
60+
<add path="redis*" type="ServiceStack.HttpHandlerFactory, ServiceStack" verb="*"/>
61+
</httpHandlers>
62+
<pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID"/>
63+
</system.web>
64+
<!--
6565
The system.webServer section is required for running ASP.NET AJAX under Internet
6666
Information Services 7.0. It is not necessary for previous version of IIS.
6767
-->
68-
<system.webServer>
69-
<validation validateIntegratedModeConfiguration="false"/>
70-
</system.webServer>
68+
<system.webServer>
69+
<validation validateIntegratedModeConfiguration="false"/>
70+
</system.webServer>
7171
</configuration>

‎src/RedisAdminUI/packages.config

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

‎src/packages/ServiceStack.4.0.31/ServiceStack.4.0.31.nupkg

-521 KB
Binary file not shown.

‎src/packages/ServiceStack.4.0.31/lib/net40/ServiceStack.dll

-1.26 MB
Binary file not shown.

0 commit comments

Comments
 (0)