Skip to content

Missing references fixes, changed target .NET fx to 4.0 #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified lib/ServiceStack.Common.dll
Binary file not shown.
Binary file modified lib/ServiceStack.Interfaces.dll
Binary file not shown.
Binary file modified lib/ServiceStack.OrmLite.SqlServer.dll
Binary file not shown.
Binary file modified lib/ServiceStack.OrmLite.dll
Binary file not shown.
Binary file modified lib/ServiceStack.Razor.dll
Binary file not shown.
Binary file modified lib/ServiceStack.Redis.dll
Binary file not shown.
Binary file modified lib/ServiceStack.ServiceInterface.dll
Binary file not shown.
Binary file modified lib/ServiceStack.Text.dll
Binary file not shown.
Binary file modified lib/ServiceStack.dll
Binary file not shown.
2 changes: 0 additions & 2 deletions src/ServiceStack.Hello/Global.asax.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using System;
using System.ComponentModel;
using System.Runtime.Serialization;
using ServiceStack.ServiceHost;
using ServiceStack.WebHost.Endpoints;

Expand Down
20 changes: 8 additions & 12 deletions src/ServiceStack.Hello/ServiceStack.Hello.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ServiceStack.Hello</RootNamespace>
<AssemblyName>ServiceStack.Hello</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
<UseIISExpress>false</UseIISExpress>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -38,16 +39,14 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="ServiceStack, Version=3.9.3.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>packages\ServiceStack.3.9.3\lib\net35\ServiceStack.dll</HintPath>
<Reference Include="ServiceStack">
<HintPath>..\..\lib\ServiceStack.dll</HintPath>
</Reference>
<Reference Include="ServiceStack.Common, Version=3.9.3.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>packages\ServiceStack.Common.3.9.3\lib\net35\ServiceStack.Common.dll</HintPath>
<Reference Include="ServiceStack.Common">
<HintPath>..\..\lib\ServiceStack.Common.dll</HintPath>
</Reference>
<Reference Include="ServiceStack.Interfaces, Version=3.9.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\ServiceStack.Common.3.9.3\lib\net35\ServiceStack.Interfaces.dll</HintPath>
<Reference Include="ServiceStack.Interfaces">
<HintPath>..\..\lib\ServiceStack.Interfaces.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Runtime.Serialization">
Expand Down Expand Up @@ -76,9 +75,6 @@
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
29 changes: 3 additions & 26 deletions src/ServiceStack.Hello/Web.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,41 +3,18 @@
<!-- ServiceStack: Required to host at: /servicestack -->
<location path="servicestack">
<system.web>
<compilation targetFramework="4.0"/>
<httpHandlers>
<add path="*" type="ServiceStack.WebHost.Endpoints.ServiceStackHttpHandlerFactory, ServiceStack" verb="*"/>
</httpHandlers>
</system.web>

<!-- Required for IIS7 -->
<system.webServer>
<modules runAllManagedModulesForAllRequests="true"/>
<validation validateIntegratedModeConfiguration="false" />
<validation validateIntegratedModeConfiguration="false"/>
<handlers>
<add path="*" name="ServiceStack.Factory" type="ServiceStack.WebHost.Endpoints.ServiceStackHttpHandlerFactory, ServiceStack" verb="*" preCondition="integratedMode" resourceType="Unspecified" allowPathInfo="true" />
<add path="*" name="ServiceStack.Factory" type="ServiceStack.WebHost.Endpoints.ServiceStackHttpHandlerFactory, ServiceStack" verb="*" preCondition="integratedMode" resourceType="Unspecified" allowPathInfo="true"/>
</handlers>
</system.webServer>
</location>
<!--
The system.webServer section is required for running ASP.NET AJAX under Internet
Information Services 7.0. It is not necessary for previous version of IIS.
-->
<system.webServer>

<!-- ServiceStack: Required -->
<validation validateIntegratedModeConfiguration="false"/>

<modules>
<remove name="ScriptModule"/>
<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
</modules>
<handlers>
<remove name="WebServiceHandlerFactory-Integrated"/>
<remove name="ScriptHandlerFactory"/>
<remove name="ScriptHandlerFactoryAppServices"/>
<remove name="ScriptResource"/>
<add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
<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"/>
</handlers>
</system.webServer>
</configuration>
9 changes: 1 addition & 8 deletions src/ServiceStack.Hello/default.htm
Original file line number Diff line number Diff line change
Expand Up @@ -169,14 +169,7 @@
<a href="http://www.servicestack.net" style="display:block;position:absolute;top:5px;left:10px;"><img src="http://servicestack.net/icon-home.jpg" alt="ServiceStack Home" /></a>

<div id="header-links">
<a href="../ServiceStack.Hello/">Hello World</a>
<a href="../Backbone.Todos/">Todos</a>
<a href="../RedisStackOverflow/">Redis StackOverflow</a>
<a href="../RestFiles/">REST Files</a>
<a href="../ServiceStack.MovieRest/">REST Movies</a>
<a href="../ServiceStack.Northwind/">Northwind Database</a>
<a href="../ServiceStack.Examples.Clients/">Ajax Client</a>
<a href="../ServiceStack.Examples.Clients/Soap12.aspx">Soap 1.2</a>
<a href="../servicestack/ServiceStack.Hello/">Hello World</a>
</div>

<a class="lnk-src" href="https://github.com/ServiceStack/ServiceStack"><img src="img/btn-github.png" width="186" height="84" /></a>
Expand Down