Modified the implicit cast from DirectoryInfo to DirectoryInfoBase to…

… correctly return null if asked to cast a null value Signed-off-by: Martin Evans <[email protected]>
schalpat · Apr 17, 2013 · 4e390b1 · 4e390b1
1 parent 2532798
commit 4e390b1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/System.IO.Abstractions/DirectoryInfoBase.cs b/System.IO.Abstractions/DirectoryInfoBase.cs
@@ -27,6 +27,8 @@ public abstract class DirectoryInfoBase : FileSystemInfoBase
 
         public static implicit operator DirectoryInfoBase(DirectoryInfo directoryInfo)
         {
+            if (directoryInfo == null)
+                return null;
             return new DirectoryInfoWrapper(directoryInfo);
         }
     }

diff --git a/System.IO.Abstractions/System.IO.Abstractions.ncrunchproject b/System.IO.Abstractions/System.IO.Abstractions.ncrunchproject
@@ -13,8 +13,8 @@
   <AnalyseExecutionTimes>true</AnalyseExecutionTimes>
   <IncludeStaticReferencesInWorkspace>true</IncludeStaticReferencesInWorkspace>
   <DefaultTestTimeout>60000</DefaultTestTimeout>
-  <UseBuildConfiguration />
-  <UseBuildPlatform />
-  <ProxyProcessPath />
+  <UseBuildConfiguration></UseBuildConfiguration>
+  <UseBuildPlatform></UseBuildPlatform>
+  <ProxyProcessPath></ProxyProcessPath>
   <UseCPUArchitecture>AutoDetect</UseCPUArchitecture>
 </ProjectConfiguration>
diff --git a/TestingHelpers/TestingHelpers.csproj b/TestingHelpers/TestingHelpers.csproj
@@ -87,12 +87,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="StringExtensions.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\System.IO.Abstractions\System.IO.Abstractions.csproj">
-      <Project>{4D398F3A-0784-4401-93CD-46CD2FBD6B92}</Project>
-      <Name>System.IO.Abstractions</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
       <Visible>False</Visible>
@@ -113,6 +107,12 @@
   <ItemGroup>
     <None Include="TestingHelpers.nuspec" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\System.IO.Abstractions\System.IO.Abstractions.csproj">
+      <Project>{4D398F3A-0784-4401-93CD-46CD2FBD6B92}</Project>
+      <Name>System.IO.Abstractions</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/TestingHelpers/TestingHelpers.ncrunchproject b/TestingHelpers/TestingHelpers.ncrunchproject
@@ -13,8 +13,8 @@
   <AnalyseExecutionTimes>true</AnalyseExecutionTimes>
   <IncludeStaticReferencesInWorkspace>true</IncludeStaticReferencesInWorkspace>
   <DefaultTestTimeout>60000</DefaultTestTimeout>
-  <UseBuildConfiguration />
-  <UseBuildPlatform />
-  <ProxyProcessPath />
+  <UseBuildConfiguration></UseBuildConfiguration>
+  <UseBuildPlatform></UseBuildPlatform>
+  <ProxyProcessPath></ProxyProcessPath>
   <UseCPUArchitecture>AutoDetect</UseCPUArchitecture>
 </ProjectConfiguration>