Partial publish fixes

- Fix slash resolution for lock file - Skip running events when generating lock file after copy #1839 #1832 #1833
aspnet · May 11, 2015 · 4549e84 · 4549e84
1 parent 6f3fc24
commit 4549e84
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 18 deletions.
diff --git a/src/Microsoft.Framework.PackageManager/Publish/PublishProject.cs b/src/Microsoft.Framework.PackageManager/Publish/PublishProject.cs
@@ -341,22 +341,22 @@ private bool PrunePackages(PublishRoot root)
 
                         foreach (var path in library.RuntimeAssemblies)
                         {
-                            keep.Add(Path.Combine(packagesDir, path));
+                            keep.Add(CombinePath(packagesDir, path));
                         }
 
                         foreach (var path in library.CompileTimeAssemblies)
                         {
-                            keep.Add(Path.Combine(packagesDir, path));
+                            keep.Add(CombinePath(packagesDir, path));
                         }
 
                         foreach (var path in library.NativeLibraries)
                         {
-                            keep.Add(Path.Combine(packagesDir, path));
+                            keep.Add(CombinePath(packagesDir, path));
                         }
 
                         foreach (var specialFolder in specialFolders)
                         {
-                            var specialFolderPath = Path.Combine(packagesDir, specialFolder);
+                            var specialFolderPath = CombinePath(packagesDir, specialFolder);
 
                             if (!Directory.Exists(specialFolderPath))
                             {
@@ -388,6 +388,11 @@ private bool PrunePackages(PublishRoot root)
             return true;
         }
 
+        private static string CombinePath(string path1, string path2)
+        {
+            return Path.Combine(path1, path2.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar));
+        }
+
         private bool UpdateLockFile(PublishRoot root)
         {
             var appEnv = (IApplicationEnvironment)root.HostServices.GetService(typeof(IApplicationEnvironment));
@@ -408,6 +413,7 @@ private bool UpdateLockFile(PublishRoot root)
                     restoreCommand.TargetFrameworks.Add(runtime.Framework);
                 }
 
+                restoreCommand.SkipRestoreEvents = true;
                 restoreCommand.SkipInstall = true;
                 restoreCommand.CheckHashFile = false;
                 restoreCommand.RestoreDirectory = project.IsPackage ? Path.Combine(project.TargetPath, "root") : project.TargetPath;

diff --git a/src/Microsoft.Framework.PackageManager/Restore/RestoreCommand.cs b/src/Microsoft.Framework.PackageManager/Restore/RestoreCommand.cs
@@ -67,6 +67,7 @@ public RestoreCommand(FrameworkName fallbackFramework)
         public Reports Reports { get; set; }
         public bool CheckHashFile { get; set; } = true;
         public bool SkipInstall { get; set; }
+        public bool SkipRestoreEvents { get; set; }
 
         private Dictionary<string, List<string>> ErrorMessages { get; set; }
 
@@ -210,11 +211,14 @@ private async Task<bool> RestoreForProject(string projectJsonPath, string rootDi
                 return null;
             };
 
-            if (!ScriptExecutor.Execute(project, "prerestore", getVariable))
+            if (!SkipRestoreEvents)
             {
-                ErrorMessages.GetOrAdd("prerestore", _ => new List<string>()).Add(ScriptExecutor.ErrorMessage);
-                Reports.Error.WriteLine(ScriptExecutor.ErrorMessage);
-                return false;
+                if (!ScriptExecutor.Execute(project, "prerestore", getVariable))
+                {
+                    ErrorMessages.GetOrAdd("prerestore", _ => new List<string>()).Add(ScriptExecutor.ErrorMessage);
+                    Reports.Error.WriteLine(ScriptExecutor.ErrorMessage);
+                    return false;
+                }
             }
 
             var projectDirectory = project.ProjectDirectory;
@@ -471,18 +475,21 @@ private async Task<bool> RestoreForProject(string projectJsonPath, string rootDi
                               targetContexts);
             }
 
-            if (!ScriptExecutor.Execute(project, "postrestore", getVariable))
+            if (!SkipRestoreEvents)
             {
-                ErrorMessages.GetOrAdd("postrestore", _ => new List<string>()).Add(ScriptExecutor.ErrorMessage);
-                Reports.Error.WriteLine(ScriptExecutor.ErrorMessage);
-                return false;
-            }
+                if (!ScriptExecutor.Execute(project, "postrestore", getVariable))
+                {
+                    ErrorMessages.GetOrAdd("postrestore", _ => new List<string>()).Add(ScriptExecutor.ErrorMessage);
+                    Reports.Error.WriteLine(ScriptExecutor.ErrorMessage);
+                    return false;
+                }
 
-            if (!ScriptExecutor.Execute(project, "prepare", getVariable))
-            {
-                ErrorMessages.GetOrAdd("prepare", _ => new List<string>()).Add(ScriptExecutor.ErrorMessage);
-                Reports.Error.WriteLine(ScriptExecutor.ErrorMessage);
-                return false;
+                if (!ScriptExecutor.Execute(project, "prepare", getVariable))
+                {
+                    ErrorMessages.GetOrAdd("prepare", _ => new List<string>()).Add(ScriptExecutor.ErrorMessage);
+                    Reports.Error.WriteLine(ScriptExecutor.ErrorMessage);
+                    return false;
+                }
             }
 
             Reports.Information.WriteLine(string.Format("{0}, {1}ms elapsed", "Restore complete".Green().Bold(), sw.ElapsedMilliseconds));