Merge pull request #45 from vasily-kirichenko/appSettings-web

fixed: AppSettingsProvider cannot find web.config
fsprojects · Dec 6, 2014 · 1ca63b4 · 1ca63b4
2 parents 8805bf7 + 9d00c38
commit 1ca63b4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/src/FSharp.Configuration/AppSettingsProvider.fs b/src/FSharp.Configuration/AppSettingsProvider.fs
@@ -8,16 +8,21 @@ open System
 open System.Configuration
 open System.Collections.Generic
 open System.Globalization
-open System.IO
+
+let private getConfig() =
+    if Web.HttpContext.Current <> null && not (Web.HttpContext.Current.Request.PhysicalPath = "") then
+        Web.Configuration.WebConfigurationManager.OpenWebConfiguration("~")
+    else
+        ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None)
 
 let getConfigValue(key) =
-    let settings = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None).AppSettings.Settings
+    let settings = getConfig().AppSettings.Settings
     settings.[key].Value
 
 let setConfigValue(key, value) = 
-    let settings = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None)
-    settings.AppSettings.Settings.[key].Value <- value
-    settings.Save()
+    let config = getConfig() 
+    config.AppSettings.Settings.[key].Value <- value
+    config.Save()
 
 let getConnectionString(key: string) =
     let connectionStrings = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None).ConnectionStrings.ConnectionStrings

diff --git a/src/FSharp.Configuration/FSharp.Configuration.fsproj b/src/FSharp.Configuration/FSharp.Configuration.fsproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -26,7 +26,8 @@
     </DocumentationFile>
     <StartAction>Program</StartAction>
     <StartProgram>C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\devenv.exe</StartProgram>
-    <StartArguments>l:\git\FSharp.Configuration\FSharp.Configuration.Tests.sln</StartArguments>
+    <StartArguments>
+    </StartArguments>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -48,6 +49,7 @@
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Web" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>