lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-12-02 11:44:41 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

#19030: Fixing Azure unit test

Browse Source 
Work Item: 19030

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2012-09-19 18:21:51 -07:00
parent e33eb89e80
commit 739c3a6bd5
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AzurePackage.proj
View File

@@ -16,7 +16,8 @@
</PropertyGroup> </PropertyGroup>
<Import Project="$(LibFolder)\msbuild\MSBuild.Community.Tasks.Targets"/> <Import Project="$(LibFolder)\msbuild\MSBuild.Community.Tasks.Targets"/>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\Windows Azure Tools\1.7\Microsoft.WindowsAzure.targets" /> <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\Windows Azure Tools\1.7\Microsoft.WindowsAzure.targets" Condition="exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\Windows Azure Tools\1.7\Microsoft.WindowsAzure.targets')"/>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v11.0\Windows Azure Tools\1.7\Microsoft.WindowsAzure.targets" Condition="exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v11.0\Windows Azure Tools\1.7\Microsoft.WindowsAzure.targets')"/>
<!-- Coordinating Targets --> <!-- Coordinating Targets -->

7
src/Orchard.Azure/AzureFileSystem.cs
View File

@@ -298,9 +298,10 @@ namespace Orchard.Azure {
return "application/unknown"; return "application/unknown";
} }
try {
try { try {
string applicationHost = System.Environment.ExpandEnvironmentVariables(@"%windir%\system32\inetsrv\config\applicationHost.config"); string applicationHost = System.Environment.ExpandEnvironmentVariables(@"%windir%\system32\inetsrv\config\applicationHost.config");
string webConfig = System.Web.Configuration.WebConfigurationManager.OpenWebConfiguration("/").FilePath; string webConfig = System.Web.Configuration.WebConfigurationManager.OpenWebConfiguration(null).FilePath;
// search for custom mime types in web.config and applicationhost.config // search for custom mime types in web.config and applicationhost.config
foreach (var configFile in new[] {webConfig, applicationHost}) { foreach (var configFile in new[] {webConfig, applicationHost}) {
@@ -315,6 +316,10 @@ namespace Orchard.Azure {
} }
} }
} }
}
catch {
// ignore issues with web.config to fall back to registry
}
// search into the registry // search into the registry
RegistryKey regKey = Registry.ClassesRoot.OpenSubKey(extension.ToLower()); RegistryKey regKey = Registry.ClassesRoot.OpenSubKey(extension.ToLower());