Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900

external/corefx/src/System.IO.FileSystem.AccessControl/tests/Configurations.props

@@ -2,7 +2,7 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <BuildConfigurations>
-      netstandard1.3-Windows_NT;
+      netstandard-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>

external/corefx/src/System.IO.FileSystem.AccessControl/tests/FileSystemAclExtensionsTests.cs

@@ -15,24 +15,84 @@ namespace System.IO
             Assert.Throws<NullReferenceException>(() => FileSystemAclExtensions.GetAccessControl((DirectoryInfo)null));
         }
 
+        [Fact]
+        public void GetAccessControl_DirectoryInfo_ReturnsValidObject()
+        {
+            using (var directory = new TempDirectory())
+            {
+                DirectoryInfo directoryInfo = new DirectoryInfo(directory.Path);
+
+                DirectorySecurity directorySecurity = directoryInfo.GetAccessControl();
+
+                Assert.NotNull(directorySecurity);
+                Assert.Equal(typeof(FileSystemRights), directorySecurity.AccessRightType);
+            }
+        }
+
         [Fact]
         public void GetAccessControl_DirectoryInfo_AccessControlSections_InvalidArguments()
         {
             Assert.Throws<NullReferenceException>(() => FileSystemAclExtensions.GetAccessControl((DirectoryInfo)null, new AccessControlSections()));
         }
 
+        [Fact]
+        public void GetAccessControl_DirectoryInfo_AccessControlSections_ReturnsValidObject()
+        {
+            using (var directory = new TempDirectory())
+            {
+                DirectoryInfo directoryInfo = new DirectoryInfo(directory.Path);
+                AccessControlSections accessControlSections = new AccessControlSections();
+
+                DirectorySecurity directorySecurity = directoryInfo.GetAccessControl(accessControlSections);
+
+                Assert.NotNull(directorySecurity);
+                Assert.Equal(typeof(FileSystemRights), directorySecurity.AccessRightType);
+            }
+        }
+
         [Fact]
         public void GetAccessControl_FileInfo_InvalidArguments()
         {
             Assert.Throws<NullReferenceException>(() => FileSystemAclExtensions.GetAccessControl((FileInfo)null));
         }
 
+        [Fact]
+        public void GetAccessControl_FileInfo_ReturnsValidObject()
+        {
+            using (var directory = new TempDirectory())
+            using (var file = new TempFile(Path.Combine(directory.Path, "file.txt")))
+            {
+                FileInfo fileInfo = new FileInfo(file.Path);
+
+                FileSecurity fileSecurity = fileInfo.GetAccessControl();
+
+                Assert.NotNull(fileSecurity);
+                Assert.Equal(typeof(FileSystemRights), fileSecurity.AccessRightType);
+            }
+        }
+
         [Fact]
         public void GetAccessControl_FileInfo_AccessControlSections_InvalidArguments()
         {
             Assert.Throws<NullReferenceException>(() => FileSystemAclExtensions.GetAccessControl((FileInfo)null, new AccessControlSections()));
         }
 
+        [Fact]
+        public void GetAccessControl_FileInfo_AccessControlSections_ReturnsValidObject()
+        {
+            using (var directory = new TempDirectory())
+            using (var file = new TempFile(Path.Combine(directory.Path, "file.txt")))
+            {
+                FileInfo fileInfo = new FileInfo(file.Path);
+                AccessControlSections accessControlSections = new AccessControlSections();
+
+                FileSecurity fileSecurity = fileInfo.GetAccessControl(accessControlSections);
+
+                Assert.NotNull(fileSecurity);
+                Assert.Equal(typeof(FileSystemRights), fileSecurity.AccessRightType);
+            }
+        }
+
         [Fact]
         public void GetAccessControl_Filestream_InvalidArguments()
         {
@@ -42,15 +102,47 @@ namespace System.IO
         [Fact]
         public void SetAccessControl_DirectoryInfo_DirectorySecurity_InvalidArguments()
         {
-            DirectoryInfo directoryInfo = new DirectoryInfo("\\");
-            Assert.Throws<ArgumentNullException>("directorySecurity", () => FileSystemAclExtensions.SetAccessControl(directoryInfo, (DirectorySecurity)null));
+            using (var directory = new TempDirectory())
+            {
+                DirectoryInfo directoryInfo = new DirectoryInfo(directory.Path);
+                Assert.Throws<ArgumentNullException>("directorySecurity", () => directoryInfo.SetAccessControl((DirectorySecurity) null));
+            }
+        }
+
+        [Fact]
+        public void SetAccessControl_DirectoryInfo_DirectorySecurity_Success()
+        {
+            using (var directory = new TempDirectory())
+            {
+                DirectoryInfo directoryInfo = new DirectoryInfo(directory.Path);
+                DirectorySecurity directorySecurity = new DirectorySecurity();
+
+                directoryInfo.SetAccessControl(directorySecurity);
+            }
         }
 
         [Fact]
         public void SetAccessControl_FileInfo_FileSecurity_InvalidArguments()
         {
-            FileInfo fileInfo = new FileInfo("\\");
-            Assert.Throws<ArgumentNullException>("fileSecurity", () => FileSystemAclExtensions.SetAccessControl(fileInfo, (FileSecurity)null));
+            using (var directory = new TempDirectory())
+            using (var file = new TempFile(Path.Combine(directory.Path, "file.txt")))
+            {
+                FileInfo fileInfo = new FileInfo(file.Path);
+                Assert.Throws<ArgumentNullException>("fileSecurity", () => fileInfo.SetAccessControl((FileSecurity) null));
+            }
+        }
+
+        [Fact]
+        public void SetAccessControl_FileInfo_FileSecurity_Success()
+        {
+            using (var directory = new TempDirectory())
+            using (var file = new TempFile(Path.Combine(directory.Path, "file.txt")))
+            {
+                FileInfo fileInfo = new FileInfo(file.Path);
+                FileSecurity fileSecurity = new FileSecurity();
+
+                fileInfo.SetAccessControl(fileSecurity);
+            }
         }
 
         [Fact]

external/corefx/src/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.builds

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <ItemGroup>
-    <Project Include="System.IO.FileSystem.AccessControl.Tests.csproj">
-      <OSGroup>Windows_NT</OSGroup>
-      <TestTFMs>netcoreapp;netcoreapp1.0;net46</TestTFMs>
-    </Project>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
-</Project>

external/corefx/src/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.csproj

@@ -1,13 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <ProjectGuid>{5915DD11-5D57-45A9-BFB0-56FEB7741E1F}</ProjectGuid>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Debug|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Windows_NT-Release|AnyCPU'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" />
   <ItemGroup>
     <Compile Include="FileSystemAclExtensionsTests.cs" />
+    <Compile Include="$(CommonTestPath)\System\IO\TempFile.cs">
+      <Link>Common\System\IO\TempFile.cs</Link>
+    </Compile>
+    <Compile Include="$(CommonTestPath)\System\IO\TempDirectory.cs">
+      <Link>Common\System\IO\TempDirectory.cs</Link>
+    </Compile>
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
+</Project>