Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

- fixed eol

  • Loading branch information...
commit ee1475a96f38a5c1cee0d3e7c1a3a21c4defd01f 1 parent a8bb84a
Sergey Bogdanov desunit authored

Showing 1 changed file with 131 additions and 131 deletions. Show diff stats Hide diff stats

  1. +131 131 tests/ServiceStack.WebHost.IntegrationTests/Web.config
262 tests/ServiceStack.WebHost.IntegrationTests/Web.config
... ... @@ -1,131 +1,131 @@
1   -<?xml version="1.0"?>
2   -<configuration>
3   - <configSections>
4   - <sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
5   - <sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
6   - <section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
7   - <sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
8   - <section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere"/>
9   - <section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
10   - <section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
11   - <section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
12   - </sectionGroup>
13   - </sectionGroup>
14   - </sectionGroup>
15   - </configSections>
16   - <appSettings>
17   - <add key="test" value="val"/>
18   - <add key="oauth.facebook.AppId" value="231464590266507" />
19   - <add key="oauth.facebook.AppSecret" value="9dd6ce54b4405dd1325d271d2419bc34" />
20   - <add key="oauth.facebook.Permissions" value="email,read_stream,offline_access" />
21   - <add key="RecreateTables" value="True"/>
22   - </appSettings>
23   - <connectionStrings/>
24   -
25   - <location path="api">
26   - <system.web>
27   - <httpHandlers>
28   - <add path="*" type="ServiceStack.WebHost.Endpoints.ServiceStackHttpHandlerFactory, ServiceStack" verb="*"/>
29   - </httpHandlers>
30   - </system.web>
31   - <system.webServer>
32   - <handlers>
33   - <add path="*" name="ServiceStack.Factory" type="ServiceStack.WebHost.Endpoints.ServiceStackHttpHandlerFactory, ServiceStack" verb="*" preCondition="integratedMode" resourceType="Unspecified" allowPathInfo="true"/>
34   - </handlers>
35   - </system.webServer>
36   - </location>
37   -
38   - <system.web>
39   - <!--
40   - Set compilation debug="true" to insert debugging
41   - symbols into the compiled page. Because this
42   - affects performance, set this value to true only
43   - during development.
44   - -->
45   - <compilation debug="true">
46   - <assemblies>
47   - <add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
48   - <add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
49   - <add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
50   - <add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
51   - </assemblies>
52   - </compilation>
53   - <!--
54   - The <authentication> section enables configuration
55   - of the security authentication mode used by
56   - ASP.NET to identify an incoming user.
57   - -->
58   - <authentication mode="Windows"/>
59   - <!--
60   - The <customErrors> section enables configuration
61   - of what to do if/when an unhandled error occurs
62   - during the execution of a request. Specifically,
63   - it enables developers to configure html error pages
64   - to be displayed in place of a error stack trace.
65   -
66   - <customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm">
67   - <error statusCode="403" redirect="NoAccess.htm" />
68   - <error statusCode="404" redirect="FileNotFound.htm" />
69   - </customErrors>
70   - -->
71   - <customErrors mode="Off"></customErrors>
72   -
73   - <pages>
74   - <controls>
75   - <add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
76   - <add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
77   - </controls>
78   - </pages>
79   - <httpHandlers>
80   - <remove verb="*" path="*.asmx"/>
81   - <add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
82   - <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"/>
83   - <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"/>
84   -
85   - <!--<add path="*" type="ServiceStack.WebHost.Endpoints.ServiceStackHttpHandlerFactory, ServiceStack" verb="*"/>-->
86   - </httpHandlers>
87   - <httpModules>
88   - <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
89   - </httpModules>
90   - </system.web>
91   - <system.codedom>
92   - <compilers>
93   - <compiler language="c#;cs;csharp" extension=".cs" warningLevel="4" type="Microsoft.CSharp.CSharpCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
94   - <providerOption name="CompilerVersion" value="v3.5"/>
95   - <providerOption name="WarnAsError" value="false"/>
96   - </compiler>
97   - </compilers>
98   - </system.codedom>
99   - <!--
100   - The system.webServer section is required for running ASP.NET AJAX under Internet
101   - Information Services 7.0. It is not necessary for previous version of IIS.
102   - -->
103   - <system.webServer>
104   - <validation validateIntegratedModeConfiguration="false"/>
105   - <modules>
106   - <remove name="ScriptModule"/>
107   - <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
108   - </modules>
109   - <handlers>
110   - <remove name="WebServiceHandlerFactory-Integrated"/>
111   - <remove name="ScriptHandlerFactory"/>
112   - <remove name="ScriptHandlerFactoryAppServices"/>
113   - <remove name="ScriptResource"/>
114   - <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"/>
115   - <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"/>
116   - <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"/>
117   -
118   - <!--<add path="*" name="ServiceStack.Factory" type="ServiceStack.WebHost.Endpoints.ServiceStackHttpHandlerFactory, ServiceStack" verb="*" preCondition="integratedMode" resourceType="Unspecified" allowPathInfo="true"/>-->
119   - </handlers>
120   - </system.webServer>
121   - <runtime>
122   - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v2.0.50727"><dependentAssembly>
123   - <assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35"/>
124   - <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
125   - </dependentAssembly>
126   - <dependentAssembly>
127   - <assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35"/>
128   - <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
129   - </dependentAssembly>
130   - </assemblyBinding></runtime>
131   -</configuration>
  1 +<?xml version="1.0"?>
  2 +<configuration>
  3 + <configSections>
  4 + <sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
  5 + <sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
  6 + <section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
  7 + <sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
  8 + <section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere"/>
  9 + <section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
  10 + <section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
  11 + <section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
  12 + </sectionGroup>
  13 + </sectionGroup>
  14 + </sectionGroup>
  15 + </configSections>
  16 + <appSettings>
  17 + <add key="test" value="val"/>
  18 + <add key="oauth.facebook.AppId" value="231464590266507" />
  19 + <add key="oauth.facebook.AppSecret" value="9dd6ce54b4405dd1325d271d2419bc34" />
  20 + <add key="oauth.facebook.Permissions" value="email,read_stream,offline_access" />
  21 + <add key="RecreateTables" value="True"/>
  22 + </appSettings>
  23 + <connectionStrings/>
  24 +
  25 + <location path="api">
  26 + <system.web>
  27 + <httpHandlers>
  28 + <add path="*" type="ServiceStack.WebHost.Endpoints.ServiceStackHttpHandlerFactory, ServiceStack" verb="*"/>
  29 + </httpHandlers>
  30 + </system.web>
  31 + <system.webServer>
  32 + <handlers>
  33 + <add path="*" name="ServiceStack.Factory" type="ServiceStack.WebHost.Endpoints.ServiceStackHttpHandlerFactory, ServiceStack" verb="*" preCondition="integratedMode" resourceType="Unspecified" allowPathInfo="true"/>
  34 + </handlers>
  35 + </system.webServer>
  36 + </location>
  37 +
  38 + <system.web>
  39 + <!--
  40 + Set compilation debug="true" to insert debugging
  41 + symbols into the compiled page. Because this
  42 + affects performance, set this value to true only
  43 + during development.
  44 + -->
  45 + <compilation debug="true">
  46 + <assemblies>
  47 + <add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
  48 + <add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
  49 + <add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
  50 + <add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
  51 + </assemblies>
  52 + </compilation>
  53 + <!--
  54 + The <authentication> section enables configuration
  55 + of the security authentication mode used by
  56 + ASP.NET to identify an incoming user.
  57 + -->
  58 + <authentication mode="Windows"/>
  59 + <!--
  60 + The <customErrors> section enables configuration
  61 + of what to do if/when an unhandled error occurs
  62 + during the execution of a request. Specifically,
  63 + it enables developers to configure html error pages
  64 + to be displayed in place of a error stack trace.
  65 +
  66 + <customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm">
  67 + <error statusCode="403" redirect="NoAccess.htm" />
  68 + <error statusCode="404" redirect="FileNotFound.htm" />
  69 + </customErrors>
  70 + -->
  71 + <customErrors mode="Off"></customErrors>
  72 +
  73 + <pages>
  74 + <controls>
  75 + <add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
  76 + <add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
  77 + </controls>
  78 + </pages>
  79 + <httpHandlers>
  80 + <remove verb="*" path="*.asmx"/>
  81 + <add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
  82 + <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"/>
  83 + <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"/>
  84 +
  85 + <!--<add path="*" type="ServiceStack.WebHost.Endpoints.ServiceStackHttpHandlerFactory, ServiceStack" verb="*"/>-->
  86 + </httpHandlers>
  87 + <httpModules>
  88 + <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
  89 + </httpModules>
  90 + </system.web>
  91 + <system.codedom>
  92 + <compilers>
  93 + <compiler language="c#;cs;csharp" extension=".cs" warningLevel="4" type="Microsoft.CSharp.CSharpCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
  94 + <providerOption name="CompilerVersion" value="v3.5"/>
  95 + <providerOption name="WarnAsError" value="false"/>
  96 + </compiler>
  97 + </compilers>
  98 + </system.codedom>
  99 + <!--
  100 + The system.webServer section is required for running ASP.NET AJAX under Internet
  101 + Information Services 7.0. It is not necessary for previous version of IIS.
  102 + -->
  103 + <system.webServer>
  104 + <validation validateIntegratedModeConfiguration="false"/>
  105 + <modules>
  106 + <remove name="ScriptModule"/>
  107 + <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
  108 + </modules>
  109 + <handlers>
  110 + <remove name="WebServiceHandlerFactory-Integrated"/>
  111 + <remove name="ScriptHandlerFactory"/>
  112 + <remove name="ScriptHandlerFactoryAppServices"/>
  113 + <remove name="ScriptResource"/>
  114 + <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"/>
  115 + <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"/>
  116 + <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"/>
  117 +
  118 + <!--<add path="*" name="ServiceStack.Factory" type="ServiceStack.WebHost.Endpoints.ServiceStackHttpHandlerFactory, ServiceStack" verb="*" preCondition="integratedMode" resourceType="Unspecified" allowPathInfo="true"/>-->
  119 + </handlers>
  120 + </system.webServer>
  121 + <runtime>
  122 + <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v2.0.50727"><dependentAssembly>
  123 + <assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35"/>
  124 + <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
  125 + </dependentAssembly>
  126 + <dependentAssembly>
  127 + <assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35"/>
  128 + <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
  129 + </dependentAssembly>
  130 + </assemblyBinding></runtime>
  131 +</configuration>

8 comments on commit ee1475a

Thomas Grassauer

@desunit I just pull the recent changes from the repo and ended up with a lot of modified files. I then follwed the instructions found at https://help.github.com/articles/dealing-with-line-endings and re-normalized the repo but still ended up with 6 modified files. The files in questions are

  • tests/ServiceStack.ServiceModel.Tests/ServiceStack.ServiceModel.Tests.csproj
  • tests/ServiceStack.WebHost.Endpoints.Tests/ServiceStack.WebHost.Endpoints.Tests.csproj
  • tests/ServiceStack.WebHost.Endpoints.Tests/TestExistingDir/default.html
  • tests/ServiceStack.WebHost.Endpoints.Tests/TestExistingDir/upload.html
  • tests/ServiceStack.WebHost.Endpoints.Tests/webpage.html
  • tests/ServiceStack.WebHost.IntegrationTests/Content/default.css

Could you please check this?

Sergey Bogdanov
Owner

Yeah, still trying to apply git rules without touching too many files.

Sergey Bogdanov
Owner

Can you clone the repository into separate folder and check the status?

Thomas Grassauer

I just cloned the repo into a separate folder and all affected files seem to be located in the tests folder.

Sergey Bogdanov
Owner

What's your environment (OS, Git version)? I don't see any problems on my Windows box with Git 1.7.10.

Thomas Grassauer

Win7 64bit, Git 1.7.7

Thomas Grassauer

I upgraded to Git 1.7.11 now it works just fine. Thanks for your support.

Sergey Bogdanov
Owner

Great!

Please sign in to comment.
Something went wrong with that request. Please try again.