Skip to content

Commit e89d8d1

Browse files
mythzmythz
committed
Upgrade to v4.5.0
1 parent c77386b commit e89d8d1

File tree

14 files changed

+561
-543
lines changed

14 files changed

+561
-543
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ TestResults
1313
*.suo
1414
*.user
1515
*.sln.docstates
16+
.vs/
1617

1718
# Build results
1819
[Dd]ebug/

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>RedisAdminUI.DataSource.Northwind</RootNamespace>
1212
<AssemblyName>RedisAdminUI.DataSource.Northwind</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<FileUpgradeFlags>
1616
</FileUpgradeFlags>
@@ -42,6 +42,7 @@
4242
<ErrorReport>prompt</ErrorReport>
4343
<WarningLevel>4</WarningLevel>
4444
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
45+
<Prefer32Bit>false</Prefer32Bit>
4546
</PropertyGroup>
4647
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
4748
<DebugType>pdbonly</DebugType>
@@ -51,10 +52,11 @@
5152
<ErrorReport>prompt</ErrorReport>
5253
<WarningLevel>4</WarningLevel>
5354
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
55+
<Prefer32Bit>false</Prefer32Bit>
5456
</PropertyGroup>
5557
<ItemGroup>
5658
<Reference Include="ServiceStack.Interfaces, Version=4.0.0.0, Culture=neutral, PublicKeyToken=e06fbc6124f57c43, processorArchitecture=MSIL">
57-
<HintPath>..\packages\ServiceStack.Interfaces.4.0.48\lib\portable-wp80+sl5+net40+win8+monotouch+monoandroid+xamarin.ios10\ServiceStack.Interfaces.dll</HintPath>
59+
<HintPath>..\packages\ServiceStack.Interfaces.4.5.0\lib\portable-wp80+sl5+net45+win8+wpa81+monotouch+monoandroid+xamarin.ios10\ServiceStack.Interfaces.dll</HintPath>
5860
<Private>True</Private>
5961
</Reference>
6062
<Reference Include="System" />

‎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.48" targetFramework="net4" />
3+
<package id="ServiceStack.Interfaces" version="4.5.0" targetFramework="net45" />
44
</packages>

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

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>RedisAdminUI.ServiceInterface</RootNamespace>
1212
<AssemblyName>RedisAdminUI.ServiceInterface</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<FileUpgradeFlags>
1616
</FileUpgradeFlags>
@@ -42,6 +42,7 @@
4242
<ErrorReport>prompt</ErrorReport>
4343
<WarningLevel>4</WarningLevel>
4444
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
45+
<Prefer32Bit>false</Prefer32Bit>
4546
</PropertyGroup>
4647
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
4748
<DebugType>pdbonly</DebugType>
@@ -51,30 +52,31 @@
5152
<ErrorReport>prompt</ErrorReport>
5253
<WarningLevel>4</WarningLevel>
5354
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
55+
<Prefer32Bit>false</Prefer32Bit>
5456
</PropertyGroup>
5557
<ItemGroup>
56-
<Reference Include="ServiceStack, Version=4.0.48.0, Culture=neutral, processorArchitecture=MSIL">
57-
<HintPath>..\packages\ServiceStack.4.0.48\lib\net40\ServiceStack.dll</HintPath>
58+
<Reference Include="ServiceStack, Version=4.5.0.0, Culture=neutral, processorArchitecture=MSIL">
59+
<HintPath>..\packages\ServiceStack.4.5.0\lib\net45\ServiceStack.dll</HintPath>
5860
<Private>True</Private>
5961
</Reference>
60-
<Reference Include="ServiceStack.Client, Version=4.0.48.0, Culture=neutral, processorArchitecture=MSIL">
61-
<HintPath>..\packages\ServiceStack.Client.4.0.48\lib\net40\ServiceStack.Client.dll</HintPath>
62+
<Reference Include="ServiceStack.Client, Version=4.5.0.0, Culture=neutral, processorArchitecture=MSIL">
63+
<HintPath>..\packages\ServiceStack.Client.4.5.0\lib\net45\ServiceStack.Client.dll</HintPath>
6264
<Private>True</Private>
6365
</Reference>
64-
<Reference Include="ServiceStack.Common, Version=4.0.48.0, Culture=neutral, processorArchitecture=MSIL">
65-
<HintPath>..\packages\ServiceStack.Common.4.0.48\lib\net40\ServiceStack.Common.dll</HintPath>
66+
<Reference Include="ServiceStack.Common, Version=4.5.0.0, Culture=neutral, processorArchitecture=MSIL">
67+
<HintPath>..\packages\ServiceStack.Common.4.5.0\lib\net45\ServiceStack.Common.dll</HintPath>
6668
<Private>True</Private>
6769
</Reference>
6870
<Reference Include="ServiceStack.Interfaces, Version=4.0.0.0, Culture=neutral, PublicKeyToken=e06fbc6124f57c43, processorArchitecture=MSIL">
69-
<HintPath>..\packages\ServiceStack.Interfaces.4.0.48\lib\portable-wp80+sl5+net40+win8+monotouch+monoandroid+xamarin.ios10\ServiceStack.Interfaces.dll</HintPath>
71+
<HintPath>..\packages\ServiceStack.Interfaces.4.5.0\lib\portable-wp80+sl5+net45+win8+wpa81+monotouch+monoandroid+xamarin.ios10\ServiceStack.Interfaces.dll</HintPath>
7072
<Private>True</Private>
7173
</Reference>
72-
<Reference Include="ServiceStack.Redis, Version=4.0.48.0, Culture=neutral, processorArchitecture=MSIL">
73-
<HintPath>..\packages\ServiceStack.Redis.4.0.48\lib\net40\ServiceStack.Redis.dll</HintPath>
74+
<Reference Include="ServiceStack.Redis, Version=4.5.0.0, Culture=neutral, processorArchitecture=MSIL">
75+
<HintPath>..\packages\ServiceStack.Redis.4.5.0\lib\net45\ServiceStack.Redis.dll</HintPath>
7476
<Private>True</Private>
7577
</Reference>
76-
<Reference Include="ServiceStack.Text, Version=4.0.48.0, Culture=neutral, processorArchitecture=MSIL">
77-
<HintPath>..\packages\ServiceStack.Text.4.0.48\lib\net40\ServiceStack.Text.dll</HintPath>
78+
<Reference Include="ServiceStack.Text, Version=4.5.0.0, Culture=neutral, processorArchitecture=MSIL">
79+
<HintPath>..\packages\ServiceStack.Text.4.5.0\lib\net45\ServiceStack.Text.dll</HintPath>
7880
<Private>True</Private>
7981
</Reference>
8082
<Reference Include="System" />

‎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.48" targetFramework="net4" />
4-
<package id="ServiceStack.Client" version="4.0.48" targetFramework="net4" />
5-
<package id="ServiceStack.Common" version="4.0.48" targetFramework="net4" />
6-
<package id="ServiceStack.Interfaces" version="4.0.48" targetFramework="net4" />
7-
<package id="ServiceStack.Redis" version="4.0.48" targetFramework="net4" />
8-
<package id="ServiceStack.Text" version="4.0.48" targetFramework="net4" />
3+
<package id="ServiceStack" version="4.5.0" targetFramework="net45" />
4+
<package id="ServiceStack.Client" version="4.5.0" targetFramework="net45" />
5+
<package id="ServiceStack.Common" version="4.5.0" targetFramework="net45" />
6+
<package id="ServiceStack.Interfaces" version="4.5.0" targetFramework="net45" />
7+
<package id="ServiceStack.Redis" version="4.5.0" targetFramework="net45" />
8+
<package id="ServiceStack.Text" version="4.5.0" targetFramework="net45" />
99
</packages>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>RedisAdminUI.ServiceModel</RootNamespace>
1212
<AssemblyName>RedisAdminUI.ServiceModel</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<FileUpgradeFlags>
1616
</FileUpgradeFlags>
@@ -42,6 +42,7 @@
4242
<ErrorReport>prompt</ErrorReport>
4343
<WarningLevel>4</WarningLevel>
4444
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
45+
<Prefer32Bit>false</Prefer32Bit>
4546
</PropertyGroup>
4647
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
4748
<DebugType>pdbonly</DebugType>
@@ -51,10 +52,11 @@
5152
<ErrorReport>prompt</ErrorReport>
5253
<WarningLevel>4</WarningLevel>
5354
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
55+
<Prefer32Bit>false</Prefer32Bit>
5456
</PropertyGroup>
5557
<ItemGroup>
5658
<Reference Include="ServiceStack.Interfaces, Version=4.0.0.0, Culture=neutral, PublicKeyToken=e06fbc6124f57c43, processorArchitecture=MSIL">
57-
<HintPath>..\packages\ServiceStack.Interfaces.4.0.48\lib\portable-wp80+sl5+net40+win8+monotouch+monoandroid+xamarin.ios10\ServiceStack.Interfaces.dll</HintPath>
59+
<HintPath>..\packages\ServiceStack.Interfaces.4.5.0\lib\portable-wp80+sl5+net45+win8+wpa81+monotouch+monoandroid+xamarin.ios10\ServiceStack.Interfaces.dll</HintPath>
5860
<Private>True</Private>
5961
</Reference>
6062
<Reference Include="System" />

‎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.48" targetFramework="net4" />
3+
<package id="ServiceStack.Interfaces" version="4.5.0" targetFramework="net45" />
44
</packages>

‎src/RedisAdminUI/RedisAdminUI.csproj

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<AppDesignerFolder>Properties</AppDesignerFolder>
1313
<RootNamespace>RedisWebServices</RootNamespace>
1414
<AssemblyName>RedisWebServices</AssemblyName>
15-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
15+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1616
<FileUpgradeFlags>
1717
</FileUpgradeFlags>
1818
<OldToolsVersion>4.0</OldToolsVersion>
@@ -36,6 +36,7 @@
3636
<WarningLevel>4</WarningLevel>
3737
<PlatformTarget>AnyCPU</PlatformTarget>
3838
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
39+
<Prefer32Bit>false</Prefer32Bit>
3940
</PropertyGroup>
4041
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
4142
<DebugType>pdbonly</DebugType>
@@ -45,30 +46,31 @@
4546
<ErrorReport>prompt</ErrorReport>
4647
<WarningLevel>4</WarningLevel>
4748
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
49+
<Prefer32Bit>false</Prefer32Bit>
4850
</PropertyGroup>
4951
<ItemGroup>
50-
<Reference Include="ServiceStack, Version=4.0.48.0, Culture=neutral, processorArchitecture=MSIL">
51-
<HintPath>..\packages\ServiceStack.4.0.48\lib\net40\ServiceStack.dll</HintPath>
52+
<Reference Include="ServiceStack, Version=4.5.0.0, Culture=neutral, processorArchitecture=MSIL">
53+
<HintPath>..\packages\ServiceStack.4.5.0\lib\net45\ServiceStack.dll</HintPath>
5254
<Private>True</Private>
5355
</Reference>
54-
<Reference Include="ServiceStack.Client, Version=4.0.48.0, Culture=neutral, processorArchitecture=MSIL">
55-
<HintPath>..\packages\ServiceStack.Client.4.0.48\lib\net40\ServiceStack.Client.dll</HintPath>
56+
<Reference Include="ServiceStack.Client, Version=4.5.0.0, Culture=neutral, processorArchitecture=MSIL">
57+
<HintPath>..\packages\ServiceStack.Client.4.5.0\lib\net45\ServiceStack.Client.dll</HintPath>
5658
<Private>True</Private>
5759
</Reference>
58-
<Reference Include="ServiceStack.Common, Version=4.0.48.0, Culture=neutral, processorArchitecture=MSIL">
59-
<HintPath>..\packages\ServiceStack.Common.4.0.48\lib\net40\ServiceStack.Common.dll</HintPath>
60+
<Reference Include="ServiceStack.Common, Version=4.5.0.0, Culture=neutral, processorArchitecture=MSIL">
61+
<HintPath>..\packages\ServiceStack.Common.4.5.0\lib\net45\ServiceStack.Common.dll</HintPath>
6062
<Private>True</Private>
6163
</Reference>
6264
<Reference Include="ServiceStack.Interfaces, Version=4.0.0.0, Culture=neutral, PublicKeyToken=e06fbc6124f57c43, processorArchitecture=MSIL">
63-
<HintPath>..\packages\ServiceStack.Interfaces.4.0.48\lib\portable-wp80+sl5+net40+win8+monotouch+monoandroid+xamarin.ios10\ServiceStack.Interfaces.dll</HintPath>
65+
<HintPath>..\packages\ServiceStack.Interfaces.4.5.0\lib\portable-wp80+sl5+net45+win8+wpa81+monotouch+monoandroid+xamarin.ios10\ServiceStack.Interfaces.dll</HintPath>
6466
<Private>True</Private>
6567
</Reference>
66-
<Reference Include="ServiceStack.Redis, Version=4.0.48.0, Culture=neutral, processorArchitecture=MSIL">
67-
<HintPath>..\packages\ServiceStack.Redis.4.0.48\lib\net40\ServiceStack.Redis.dll</HintPath>
68+
<Reference Include="ServiceStack.Redis, Version=4.5.0.0, Culture=neutral, processorArchitecture=MSIL">
69+
<HintPath>..\packages\ServiceStack.Redis.4.5.0\lib\net45\ServiceStack.Redis.dll</HintPath>
6870
<Private>True</Private>
6971
</Reference>
70-
<Reference Include="ServiceStack.Text, Version=4.0.48.0, Culture=neutral, processorArchitecture=MSIL">
71-
<HintPath>..\packages\ServiceStack.Text.4.0.48\lib\net40\ServiceStack.Text.dll</HintPath>
72+
<Reference Include="ServiceStack.Text, Version=4.5.0.0, Culture=neutral, processorArchitecture=MSIL">
73+
<HintPath>..\packages\ServiceStack.Text.4.5.0\lib\net45\ServiceStack.Text.dll</HintPath>
7274
<Private>True</Private>
7375
</Reference>
7476
<Reference Include="System" />
@@ -77,9 +79,9 @@
7779
<Reference Include="System.Web.ApplicationServices" />
7880
<Reference Include="System.Web.DynamicData" />
7981
<Reference Include="System.Web.Entity" />
80-
<Reference Include="System.Web.Extensions" />
8182
<Reference Include="System.Drawing" />
8283
<Reference Include="System.Web" />
84+
<Reference Include="System.Web.Extensions" />
8385
<Reference Include="System.Xml" />
8486
<Reference Include="System.Configuration" />
8587
<Reference Include="System.Web.Services" />

‎src/RedisAdminUI/Web.config

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
<add key="RedisDb" value="0"/>
99
<add key="DefaultRedirectPath" value="AjaxClient"/>
1010
</appSettings>
11-
1211
<connectionStrings/>
13-
1412
<location path="redis">
1513
<system.web>
1614
<httpHandlers>
@@ -22,22 +20,26 @@
2220
<modules runAllManagedModulesForAllRequests="true"/>
2321
<validation validateIntegratedModeConfiguration="false"/>
2422
<handlers>
25-
<add path="*" name="ServiceStack.Factory"
26-
type="ServiceStack.HttpHandlerFactory, ServiceStack"
27-
verb="*" preCondition="integratedMode"
28-
resourceType="Unspecified" allowPathInfo="true"/>
23+
<add path="*" name="ServiceStack.Factory" type="ServiceStack.HttpHandlerFactory, ServiceStack" verb="*" preCondition="integratedMode" resourceType="Unspecified" allowPathInfo="true"/>
2924
</handlers>
3025
</system.webServer>
3126
</location>
27+
<!--
28+
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
3229
30+
The following attributes can be set on the <httpRuntime> tag.
31+
<system.Web>
32+
<httpRuntime targetFramework="4.5" />
33+
</system.Web>
34+
-->
3335
<system.web>
3436
<!--
3537
Set compilation debug="true" to insert debugging
3638
symbols into the compiled page. Because this
3739
affects performance, set this value to true only
3840
during development.
3941
-->
40-
<compilation debug="true" targetFramework="4.0"/>
42+
<compilation debug="true" targetFramework="4.5"/>
4143
<!--
4244
The <authentication> section enables configuration
4345
of the security authentication mode used by

‎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.48" targetFramework="net4" />
4-
<package id="ServiceStack.Client" version="4.0.48" targetFramework="net4" />
5-
<package id="ServiceStack.Common" version="4.0.48" targetFramework="net4" />
6-
<package id="ServiceStack.Interfaces" version="4.0.48" targetFramework="net4" />
7-
<package id="ServiceStack.Redis" version="4.0.48" targetFramework="net4" />
8-
<package id="ServiceStack.Text" version="4.0.48" targetFramework="net4" />
3+
<package id="ServiceStack" version="4.5.0" targetFramework="net45" />
4+
<package id="ServiceStack.Client" version="4.5.0" targetFramework="net45" />
5+
<package id="ServiceStack.Common" version="4.5.0" targetFramework="net45" />
6+
<package id="ServiceStack.Interfaces" version="4.5.0" targetFramework="net45" />
7+
<package id="ServiceStack.Redis" version="4.5.0" targetFramework="net45" />
8+
<package id="ServiceStack.Text" version="4.5.0" targetFramework="net45" />
99
</packages>

‎tests/RedisAdminUI.Tests/App.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
<add key="IntegrationTestsBaseUrl" value="http://localhost/RedisWebServices.Host/Public/"/>
77
<!--<add key="IntegrationTestsBaseUrl" value="http://www.servicestack.net/RedisWebServices.Host/Public/"/>-->
88
</appSettings>
9-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
9+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>

0 commit comments

Comments
 (0)