Merge branch '70-api-does-not-return-error-messages-for-non-http-200'

lloydstone · Apr 7, 2014 · 53985e9 · 53985e9
2 parents 06bbbc9 + 5755124
commit 53985e9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/Web/Femah.Examples.Additionator.Web/Femah.Examples.Additionator.Web.csproj b/Web/Femah.Examples.Additionator.Web/Femah.Examples.Additionator.Web.csproj
@@ -15,7 +15,7 @@
     <AssemblyName>Femah.Examples.Additionator.Web</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <MvcBuildViews>false</MvcBuildViews>
-    <UseIISExpress>true</UseIISExpress>
+    <UseIISExpress>false</UseIISExpress>
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
     <IISExpressWindowsAuthentication />
@@ -49,7 +49,7 @@
   <ItemGroup>
     <Reference Include="Femah.Core, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Femah.Core.0.1.43-beta\lib\Net35\Femah.Core.dll</HintPath>
+      <HintPath>..\..\packages\Femah.Core.0.1.47-beta\lib\Net35\Femah.Core.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Newtonsoft.Json">
@@ -287,10 +287,10 @@
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
+          <AutoAssignPort>False</AutoAssignPort>
           <DevelopmentServerPort>63745</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:63745/</IISUrl>
+          <IISUrl>http://localhost</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

diff --git a/Web/Femah.Examples.Additionator.Web/Web.config b/Web/Femah.Examples.Additionator.Web/Web.config
@@ -3,6 +3,7 @@
   For more information on how to configure your ASP.NET application, please visit
   http://go.microsoft.com/fwlink/?LinkId=301880
   -->
+
 <configuration>
   <configSections>
     <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
@@ -31,6 +32,7 @@
     <httpRuntime targetFramework="4.5.1" />
   </system.web>
   <system.webServer>
+    <httpErrors existingResponse="PassThrough" />
     <modules>
       <remove name="FormsAuthenticationModule" />
     </modules>
@@ -39,6 +41,8 @@
       <remove name="OPTIONSVerbHandler" />
       <remove name="TRACEVerbHandler" />
       <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
+      <!-- We need the below for debugging in to femah.core using symbolsource (TODO: wrap in to nuget logic) -->
+      <!-- <add name="FEMAHAPI" verb="GET,PUT" path="femah.axd/api*" type="Femah.Core.Api.FemahApiHttpHandler, Femah.Core" preCondition="integratedMode" /> -->
     </handlers>
   </system.webServer>
   <runtime>
@@ -92,4 +96,5 @@
       </handlers>
     </system.webServer>
   </location>
+
 </configuration>
diff --git a/Web/Femah.Examples.Additionator.Web/packages.config b/Web/Femah.Examples.Additionator.Web/packages.config
@@ -3,7 +3,7 @@
   <package id="Antlr" version="3.4.1.9004" targetFramework="net451" />
   <package id="bootstrap" version="3.0.0" targetFramework="net451" />
   <package id="EntityFramework" version="6.0.0" targetFramework="net451" />
-  <package id="Femah.Core" version="0.1.43-beta" targetFramework="net45" />
+  <package id="Femah.Core" version="0.1.47-beta" targetFramework="net45" />
   <package id="jQuery" version="1.10.2" targetFramework="net451" />
   <package id="jQuery.Validation" version="1.11.1" targetFramework="net451" />
   <package id="Microsoft.AspNet.Identity.Core" version="1.0.0" targetFramework="net451" />