Skip to content

Commit 5e8e742

Browse files
mythzmythz
committed
Upgrade Backbone.Todos to v4.0.11
1 parent 51e1521 commit 5e8e742

24 files changed

+12476
-114
lines changed

‎src/Backbone.Todos/Backbone.Todos.csproj‎

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<AppDesignerFolder>Properties</AppDesignerFolder>
1414
<RootNamespace>Backbone.Todos</RootNamespace>
1515
<AssemblyName>Backbone.Todos</AssemblyName>
16-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1717
<UseIISExpress>true</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,34 +44,38 @@
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>packages\ServiceStack.4.0.11\lib\net40\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">
52+
<HintPath>packages\ServiceStack.Client.4.0.11\lib\net40\ServiceStack.Client.dll</HintPath>
5153
</Reference>
52-
<Reference Include="ServiceStack.Interfaces">
53-
<HintPath>..\packages\ServiceStack.Common.3.9.63\lib\net35\ServiceStack.Interfaces.dll</HintPath>
54+
<Reference Include="ServiceStack.Common, Version=4.0.11.0, Culture=neutral, processorArchitecture=MSIL">
55+
<SpecificVersion>False</SpecificVersion>
56+
<HintPath>packages\ServiceStack.Common.4.0.11\lib\net40\ServiceStack.Common.dll</HintPath>
5457
</Reference>
55-
<Reference Include="ServiceStack.OrmLite">
56-
<HintPath>..\packages\ServiceStack.OrmLite.SqlServer.3.9.63\lib\net35\ServiceStack.OrmLite.dll</HintPath>
58+
<Reference Include="ServiceStack.Interfaces, Version=4.0.0.0, Culture=neutral, PublicKeyToken=e06fbc6124f57c43, processorArchitecture=MSIL">
59+
<SpecificVersion>False</SpecificVersion>
60+
<HintPath>packages\ServiceStack.Interfaces.4.0.11\lib\net40\ServiceStack.Interfaces.dll</HintPath>
5761
</Reference>
58-
<Reference Include="ServiceStack.OrmLite.SqlServer">
59-
<HintPath>..\packages\ServiceStack.OrmLite.SqlServer.3.9.63\lib\net35\ServiceStack.OrmLite.SqlServer.dll</HintPath>
62+
<Reference Include="ServiceStack.Redis, Version=4.0.11.0, Culture=neutral, processorArchitecture=MSIL">
63+
<SpecificVersion>False</SpecificVersion>
64+
<HintPath>packages\ServiceStack.Redis.4.0.11\lib\net40\ServiceStack.Redis.dll</HintPath>
6065
</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>
66+
<Reference Include="ServiceStack.Text, Version=4.0.11.0, Culture=neutral, processorArchitecture=MSIL">
67+
<SpecificVersion>False</SpecificVersion>
68+
<HintPath>packages\ServiceStack.Text.4.0.11\lib\net40\ServiceStack.Text.dll</HintPath>
6969
</Reference>
7070
<Reference Include="System" />
71-
<Reference Include="System.Core" />
7271
<Reference Include="System.Configuration" />
72+
<Reference Include="System.Data.DataSetExtensions" />
7373
<Reference Include="System.Web" />
74+
<Reference Include="System.Web.ApplicationServices" />
75+
<Reference Include="System.Web.DynamicData" />
76+
<Reference Include="System.Web.Entity" />
77+
<Reference Include="System.Web.Extensions" />
78+
<Reference Include="System.Xml.Linq" />
7479
</ItemGroup>
7580
<ItemGroup>
7681
<Content Include="default.htm" />

‎src/Backbone.Todos/Global.asax.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
2+
using ServiceStack;
23
using ServiceStack.Redis;
3-
using ServiceStack.ServiceInterface;
4-
using ServiceStack.WebHost.Endpoints;
54
using Funq;
65
using ServiceStack.Text;
76

‎src/Backbone.Todos/Web.config‎

Lines changed: 8 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,15 @@
11
<?xml version="1.0"?>
22
<configuration>
3-
4-
<configSections>
5-
<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
6-
<sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
7-
<section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
8-
<sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
9-
<section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere" />
10-
<section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
11-
<section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
12-
<section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication" />
13-
</sectionGroup>
14-
</sectionGroup>
15-
</sectionGroup>
16-
</configSections>
17-
18-
<appSettings />
19-
<connectionStrings />
20-
3+
<appSettings/>
4+
<connectionStrings/>
215
<system.web>
22-
<compilation debug="true">
23-
24-
<assemblies>
25-
<add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
26-
<add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
27-
<add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
28-
<add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
29-
</assemblies>
30-
31-
</compilation>
6+
<compilation debug="true" targetFramework="4.0"/>
327
<!--
338
The <authentication> section enables configuration
349
of the security authentication mode used by
3510
ASP.NET to identify an incoming user.
3611
-->
37-
<authentication mode="Windows" />
12+
<authentication mode="Windows"/>
3813
<!--
3914
The <customErrors> section enables configuration
4015
of what to do if/when an unhandled error occurs
@@ -47,73 +22,19 @@
4722
<error statusCode="404" redirect="FileNotFound.htm" />
4823
</customErrors>
4924
-->
50-
51-
<pages>
52-
<controls>
53-
<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
54-
<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
55-
</controls>
56-
</pages>
57-
5825
<httpHandlers>
59-
<remove verb="*" path="*.asmx"/>
60-
<add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
61-
<add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
62-
<add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false"/>
63-
64-
<add path="*" type="ServiceStack.WebHost.Endpoints.ServiceStackHttpHandlerFactory, ServiceStack" verb="*"/>
26+
<add path="*" type="ServiceStack.HttpHandlerFactory, ServiceStack" verb="*"/>
6527
</httpHandlers>
66-
<httpModules>
67-
<add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
68-
</httpModules>
69-
28+
<pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID"/>
7029
</system.web>
71-
72-
<system.codedom>
73-
<compilers>
74-
<compiler language="c#;cs;csharp" extension=".cs" warningLevel="4"
75-
type="Microsoft.CSharp.CSharpCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
76-
<providerOption name="CompilerVersion" value="v3.5"/>
77-
<providerOption name="WarnAsError" value="false"/>
78-
</compiler>
79-
</compilers>
80-
</system.codedom>
81-
8230
<!--
8331
The system.webServer section is required for running ASP.NET AJAX under Internet
8432
Information Services 7.0. It is not necessary for previous version of IIS.
8533
-->
8634
<system.webServer>
8735
<validation validateIntegratedModeConfiguration="false"/>
88-
<modules>
89-
<remove name="ScriptModule" />
90-
<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
91-
</modules>
9236
<handlers>
93-
<remove name="WebServiceHandlerFactory-Integrated"/>
94-
<remove name="ScriptHandlerFactory" />
95-
<remove name="ScriptHandlerFactoryAppServices" />
96-
<remove name="ScriptResource" />
97-
<add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode"
98-
type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
99-
<add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode"
100-
type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
101-
<add name="ScriptResource" preCondition="integratedMode" verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
102-
103-
<add path="*" name="ServiceStack.Factory" type="ServiceStack.WebHost.Endpoints.ServiceStackHttpHandlerFactory, ServiceStack" verb="*" preCondition="integratedMode" resourceType="Unspecified" allowPathInfo="true" />
37+
<add path="*" name="ServiceStack.Factory" type="ServiceStack.HttpHandlerFactory, ServiceStack" verb="*" preCondition="integratedMode" resourceType="Unspecified" allowPathInfo="true"/>
10438
</handlers>
10539
</system.webServer>
106-
<runtime>
107-
<assemblyBinding appliesTo="v2.0.50727" xmlns="urn:schemas-microsoft-com:asm.v1">
108-
<dependentAssembly>
109-
<assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35"/>
110-
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
111-
</dependentAssembly>
112-
<dependentAssembly>
113-
<assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35"/>
114-
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
115-
</dependentAssembly>
116-
</assemblyBinding>
117-
</runtime>
118-
119-
</configuration>
40+
</configuration>

‎src/Backbone.Todos/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/Backbone.Todos/packages/ServiceStack.4.0.11/ServiceStack.4.0.11.nupkg‎

480 KB
Binary file not shown.

‎src/Backbone.Todos/packages/ServiceStack.4.0.11/lib/net40/ServiceStack.dll‎

1.14 MB
Binary file not shown.

0 commit comments

Comments
 (0)