Merge pull request #2148 from dotnet-bot/from-tfs

Merge changes from TFS

Author: stephentoub

dir.props

@@ -51,7 +51,8 @@
 
     <NugetRestoreCommand>"$(NuGetToolPath)"</NugetRestoreCommand>
     <NugetRestoreCommand>$(NugetRestoreCommand) install</NugetRestoreCommand>
-    <NugetRestoreCommand>$(NugetRestoreCommand) -OutputDirectory "$(PackagesDir.TrimEnd('/'))"</NugetRestoreCommand>
+    <!-- NuGet.exe doesn't like trailing slashes in the output directory argument -->
+    <NugetRestoreCommand>$(NugetRestoreCommand) -OutputDirectory "$(PackagesDir.TrimEnd('/\'.ToCharArray()))"</NugetRestoreCommand>
     <NugetRestoreCommand>$(NugetRestoreCommand) $(NuGetConfigCommandLine)</NugetRestoreCommand>
     <NugetRestoreCommand>$(NugetRestoreCommand) -Verbosity detailed</NugetRestoreCommand>
     <NugetRestoreCommand Condition="'$(OsEnvironment)'=='Unix'">mono $(NuGetRestoreCommand)</NugetRestoreCommand>
@@ -77,7 +78,7 @@
     <DnuRestoreCommand>"$(DnuToolPath)"</DnuRestoreCommand>
     <DnuRestoreCommand>$(DnuRestoreCommand) restore</DnuRestoreCommand>
     <DnuRestoreCommand>$(DnuRestoreCommand) --parallel</DnuRestoreCommand>
-    <DnuRestoreCommand>$(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('/'))" $(DnuRestoreSource)</DnuRestoreCommand>
+    <DnuRestoreCommand>$(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('/\'.ToCharArray()))" $(DnuRestoreSource)</DnuRestoreCommand>
     <DnuRestoreCommand Condition="'$(LockDependencies)' == 'true'">$(DnuRestoreCommand) --lock</DnuRestoreCommand>
   </PropertyGroup>
 

dir.targets

@@ -59,6 +59,13 @@
     </Task>
   </UsingTask>
 
+  <!--
+    Use a semaphore file to determine the need to restore build tools to avoid conflicts with locked binaries.
+  -->
+  <PropertyGroup>
+    <BuildToolsSemaphore>$(ToolsDir)BuildTools.semaphore</BuildToolsSemaphore>
+  </PropertyGroup>
+
   <!--
     Needed to avoid the IntialTargets from having an Output which ends up getting
     added to the output references when you have a project to project reference.
@@ -67,7 +74,7 @@
 
   <Target Name="_RestoreBuildTools"
           Inputs="$(MSBuildThisFileDirectory)dir.props;$(SourceDir).nuget/packages.$(OsEnvironment).config"
-          Outputs="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll;$(NugetToolPath);$(DnuToolPath)">
+          Outputs="$(BuildToolsSemaphore)">
     <Message Importance="High" Text="Restoring build tools..." />
 
     <Copy Condition="Exists('$(NuGetCachedPath)')" SourceFiles="$(NuGetCachedPath)" DestinationFiles="$(NuGetToolPath)" SkipUnchangedFiles="true" />
@@ -95,16 +102,17 @@
     <Exec Condition="'$(OsEnvironment)'=='Unix'"
           Command="find '$(RoslynPackageDir)tools' -name &quot;*.exe&quot; -exec chmod &quot;+x&quot; '{}' ';'" />
 
-    <Error Condition="'$(ErrorIfBuildToolsRestoredFromIndividualProject)'=='true'"
-           Text="The build tools package was just restored and so we cannot continue the build of an individual project because targets from the build tools package were not able to be imported. Please retry the build the individual project again." />
-
     <!--
-      There are cases where the inputs could be newer than the outputs but the
-      download or restore may not need to update. In such cases we need to touch
-      these files otherwise we continually run this target over and over for
-      every project until these files are cleaned (if the are ever cleaned).
+      Touch our semaphore file to ensure Inputs/Outputs comparison for this target will show that we're up to date.
+      Ignore failures in the unlikely, but possible, event that we hit this from two projects simultaneously.
     -->
-    <Touch Files="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll;$(NugetToolPath);$(DnuToolPath)" />
+    <Touch Files="$(BuildToolsSemaphore)"
+           ContinueOnError="WarnAndContinue"
+           AlwaysCreate="true"
+           ForceTouch="true" />
+
+    <Error Condition="'$(ErrorIfBuildToolsRestoredFromIndividualProject)'=='true'"
+           Text="The build tools package was just restored and so we cannot continue the build of an individual project because targets from the build tools package were not able to be imported. Please retry the build the individual project again." />
   </Target>
 
   <!-- Provide default targets which can be hooked onto or overridden as necessary -->

src/System.IO.Compression.ZipFile/src/System/IO/Compression/ZipFile.cs

@@ -8,6 +8,9 @@ namespace System.IO.Compression
 {
     public static class ZipFile
     {
+        // Per the .ZIP File Format Specification 4.4.17.1 all slashes should be forward slashes
+        private const char c_pathSeparator = '/';
+
         /// <summary>
         /// Opens a <code>ZipArchive</code> on the specified path for reading. The specified file is opened with <code>FileMode.Open</code>.
         /// </summary>
@@ -503,10 +506,7 @@ private static void DoCreateFromDirectory(String sourceDirectoryName, String des
                     Int32 entryNameLength = file.FullName.Length - basePath.Length;
                     Debug.Assert(entryNameLength > 0);
 
-                    String entryName = file.FullName.Substring(basePath.Length, entryNameLength);
-
-                    // Remove any leading slashes from the entry name:
-                    entryName = entryName.TrimStart(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+                    String entryName = EntryFromPath(file.FullName, basePath.Length, entryNameLength);
 
                     if (file is FileInfo)
                     {
@@ -520,18 +520,52 @@ private static void DoCreateFromDirectory(String sourceDirectoryName, String des
                         if (possiblyEmpty != null && IsDirEmpty(possiblyEmpty))
                         {
                             // FullName never returns a directory separator character on the end,
-                            // but Zip archives require it to specify an explicit directory:                             
-                            archive.CreateEntry(entryName + Path.DirectorySeparatorChar);
+                            // but Zip archives require it to specify an explicit directory:
+                            archive.CreateEntry(entryName + c_pathSeparator);
                         }
                     }
                 }  // foreach
 
                 // If no entries create an empty root directory entry:
                 if (includeBaseDirectory && directoryIsEmpty)
-                    archive.CreateEntry(di.Name + Path.DirectorySeparatorChar);
+                    archive.CreateEntry(EntryFromPath(di.Name, 0, di.Name.Length) + c_pathSeparator);
+
             } // using
         }  // DoCreateFromDirectory
 
+        private static string EntryFromPath(string entry, int offset, int length)
+        {
+            Debug.Assert(length <= entry.Length - offset);
+
+            // Remove any leading slashes from the entry name:
+            while (length > 0)
+            {
+                if (entry[offset] != Path.DirectorySeparatorChar && 
+                    entry[offset] != Path.AltDirectorySeparatorChar)
+                    break;
+
+                offset++;
+                length--;
+            }
+
+            if (length == 0)
+                return String.Empty;
+
+            // create a mutable copy
+            char[] chars = entry.ToCharArray(offset, length);
+
+            // '/' is a more broadly recognized directory separator on all platforms (eg: mac, linux)
+            // We don't use Path.DirectorySeparatorChar or AltDirectorySeparatorChar because this is
+            // explicitly trying to standardize to '/'
+            for(int i = 0; i < chars.Length; i++)
+            {
+                if (chars[i] == Path.DirectorySeparatorChar || chars[i] == Path.AltDirectorySeparatorChar)
+                    chars[i] = c_pathSeparator;
+            }
+
+            return new string(chars);
+        }
+
 
         private static Boolean IsDirEmpty(DirectoryInfo possiblyEmptyDir)
         {

src/System.IO.Compression.ZipFile/tests/ZipFileConvenienceMethods.cs

@@ -49,7 +49,7 @@ private static void SameExceptForBaseDir(string zipNoBaseDir, string zipBaseDir,
                 {
                     ZipArchiveEntry bEntry = b.Entries[bIdx++];
 
-                    Assert.Equal(Path.Combine(Path.GetFileName(baseDir), aEntry.FullName), bEntry.FullName);
+                    Assert.Equal(Path.GetFileName(baseDir) + "/" + aEntry.FullName, bEntry.FullName);
                     Assert.Equal(aEntry.Name, bEntry.Name);
                     Assert.Equal(aEntry.Length, bEntry.Length);
                     Assert.Equal(aEntry.CompressedLength, bEntry.CompressedLength);

src/System.IO.FileSystem.Watcher/tests/FileSystemWatcher.Error.cs

@@ -63,8 +63,8 @@ public static void FileSystemWatcher_Error_File()
             int internalBufferOperationCapacity = watcher.InternalBufferSize / (12 + 2 * (file.Path.Length + 1));
 
             // generate enough file change events to overflow the buffer
-            // 2x is an approximation that should force the overflow.
-            for (int i = 1; i < internalBufferOperationCapacity * 2; i++)
+            // 4x is an approximation that should force the overflow.
+            for (int i = 1; i < internalBufferOperationCapacity * 4; i++)
             {
                 File.SetLastWriteTime(file.Path, DateTime.Now + TimeSpan.FromSeconds(i));
             }