Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix https://github.com/NuGet/Home/issues/225 #20

Closed
wants to merge 1 commit into from
Closed

Fix https://github.com/NuGet/Home/issues/225 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/NuGet.Core/NuGet.ProjectManagement/Projects/IMSBuildNuGetProjectSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

using System.Collections.Generic;
using System.IO;
using System.IO.Compression;
using System.Threading.Tasks;
using NuGet.Frameworks;
using NuGet.Packaging.Core;
Expand Down
103 changes: 45 additions & 58 deletions src/NuGet.Core/NuGet.ProjectManagement/Projects/MSBuildNuGetProject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,33 +17,6 @@

namespace NuGet.ProjectManagement
{
internal class PackageItemComparer : IComparer<string>
{
public int Compare(string x, string y)
{
// BUG 636: We sort files so that they are added in the correct order
// e.g aspx before aspx.cs

if (x.Equals(y, StringComparison.OrdinalIgnoreCase))
{
return 0;
}

// Add files that are prefixes of other files first
if (x.StartsWith(y, StringComparison.OrdinalIgnoreCase))
{
return -1;
}

if (y.StartsWith(x, StringComparison.OrdinalIgnoreCase))
{
return 1;
}

return string.Compare(y, x, StringComparison.OrdinalIgnoreCase);
}
}

/// <summary>
/// This class represents a NuGetProject based on a .NET project. This also contains an instance of a
/// FolderNuGetProject
Expand Down Expand Up @@ -92,7 +65,9 @@ public class MSBuildNuGetProject : NuGetProject
{ new FileTransformExtensions(".install.xdt", ".uninstall.xdt"), new XdtTransformer() }
};

public MSBuildNuGetProject(IMSBuildNuGetProjectSystem msbuildNuGetProjectSystem, string folderNuGetProjectPath, string packagesConfigFolderPath)
public MSBuildNuGetProject(IMSBuildNuGetProjectSystem msbuildNuGetProjectSystem,
string folderNuGetProjectPath,
string packagesConfigFolderPath)
{
if (msbuildNuGetProjectSystem == null)
{
Expand Down Expand Up @@ -178,7 +153,7 @@ public override async Task<bool> InstallPackageAsync(
return false;
}

// Step-2: Create PackageReader using the PackageStream and obtain the various item groups
// Step-2: Create PackageReader using the PackageStream and obtain the various item groups
downloadResourceResult.PackageStream.Seek(0, SeekOrigin.Begin);
var packageReader = downloadResourceResult.PackageReader;
if (packageReader == null)
Expand Down Expand Up @@ -279,7 +254,7 @@ public override async Task<bool> InstallPackageAsync(
}
PackageEventsProvider.Instance.NotifyInstalling(packageEventArgs);

// Step-6: Install package to FolderNuGetProject
// Step-6: Install package to FolderNuGetProject
await FolderNuGetProject.InstallPackageAsync(packageIdentity, downloadResourceResult, nuGetProjectContext, token);

// Step-7: Raise PackageInstalled event
Expand All @@ -303,10 +278,12 @@ public override async Task<bool> InstallPackageAsync(
{
var referenceItemFullPath = Path.Combine(packageInstallPath, referenceItem);
var referenceName = Path.GetFileName(referenceItem);

if (MSBuildNuGetProjectSystem.ReferenceExists(referenceName))
{
MSBuildNuGetProjectSystem.RemoveReference(referenceName);
}

MSBuildNuGetProjectSystem.AddReference(referenceItemFullPath);
}
}
Expand Down Expand Up @@ -403,36 +380,57 @@ public override async Task<bool> UninstallPackageAsync(PackageIdentity packageId
}

var packageTargetFramework = packageReference.TargetFramework ?? MSBuildNuGetProjectSystem.TargetFramework;
var packageEventArgs = new PackageEventArgs(FolderNuGetProject, packageIdentity, FolderNuGetProject.GetInstalledPath(packageIdentity));
var packageEventArgs = new PackageEventArgs(FolderNuGetProject,
packageIdentity,
FolderNuGetProject.GetInstalledPath(packageIdentity));

if (PackageUninstalling != null)
{
PackageUninstalling(this, packageEventArgs);
}

using (var packageStream = File.OpenRead(FolderNuGetProject.GetInstalledPackageFilePath(packageIdentity)))
{
// Step-2: Create PackageReader using the PackageStream and obtain the various item groups
// Get the package target framework instead of using project targetframework
var zipArchive = new ZipArchive(packageStream);
var packageReader = new PackageReader(zipArchive);

// Step-2: Execute powershell script - uninstall.ps1
var toolItemGroups = packageReader.GetToolItems();
var compatibleToolItemsGroup = MSBuildNuGetProjectSystemUtility
.GetMostCompatibleGroup(packageTargetFramework, toolItemGroups);

if (MSBuildNuGetProjectSystemUtility.IsValid(compatibleToolItemsGroup))
{
var uninstallPS1RelativePath = compatibleToolItemsGroup.Items.FirstOrDefault(
p => p.EndsWith(Path.DirectorySeparatorChar + PowerShellScripts.Uninstall, StringComparison.OrdinalIgnoreCase));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please break long lines (since the lines are moved anyways)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

k


if (!string.IsNullOrEmpty(uninstallPS1RelativePath))
{
var packageInstallPath = FolderNuGetProject.GetInstalledPath(packageIdentity);
await MSBuildNuGetProjectSystem.ExecuteScriptAsync(packageIdentity, packageInstallPath, uninstallPS1RelativePath, this, throwOnFailure: false);
}
}

// Step-3: Obtain the various item groups
// Get the package target framework instead of using project targetframework
var referenceItemGroups = packageReader.GetReferenceItems();
var contentFileGroups = packageReader.GetContentItems();
var buildFileGroups = packageReader.GetBuildItems();

// Step-3: Get the most compatible items groups for all items groups
// Step-4: Get the most compatible items groups for all items groups
var compatibleReferenceItemsGroup =
MSBuildNuGetProjectSystemUtility.GetMostCompatibleGroup(packageTargetFramework, referenceItemGroups);

var compatibleContentFilesGroup =
MSBuildNuGetProjectSystemUtility.GetMostCompatibleGroup(packageTargetFramework, contentFileGroups);

var compatibleBuildFilesGroup =
MSBuildNuGetProjectSystemUtility.GetMostCompatibleGroup(packageTargetFramework, buildFileGroups);

// TODO: Need to handle References element??

// Step-4: Raise PackageUninstalling event
if (PackageUninstalling != null)
{
PackageUninstalling(this, packageEventArgs);
}
PackageEventsProvider.Instance.NotifyUninstalling(packageEventArgs);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this move up and be along with 'PackageUninstalling' event too?


// Step-5: Uninstall package from packages.config
// Step-5: Remove package reference from packages.config
await PackagesConfigNuGetProject.UninstallPackageAsync(packageIdentity, nuGetProjectContext, token);

// Step-6: Remove packages.config from MSBuildNuGetProject if there are no packages
Expand Down Expand Up @@ -484,38 +482,27 @@ public override async Task<bool> UninstallPackageAsync(PackageIdentity packageId
}

// Step-7.5: Remove binding redirects. This is a no-op
// Binding redirects will be removed when all packages have finished
// uninstalling for performance reasons

// Step-8: Raise PackageReferenceRemoved event
if (PackageReferenceRemoved != null)
{
PackageReferenceRemoved(this, packageEventArgs);
}
PackageEventsProvider.Instance.NotifyReferenceRemoved(packageEventArgs);

// Step-9: Execute powershell script - uninstall.ps1
var toolItemGroups = packageReader.GetToolItems();
var compatibleToolItemsGroup = MSBuildNuGetProjectSystemUtility.GetMostCompatibleGroup(packageTargetFramework,
toolItemGroups);
if (MSBuildNuGetProjectSystemUtility.IsValid(compatibleToolItemsGroup))
{
var uninstallPS1RelativePath = compatibleToolItemsGroup.Items.FirstOrDefault(
p => p.EndsWith(Path.DirectorySeparatorChar + PowerShellScripts.Uninstall, StringComparison.OrdinalIgnoreCase));
if (!string.IsNullOrEmpty(uninstallPS1RelativePath))
{
var packageInstallPath = FolderNuGetProject.GetInstalledPath(packageIdentity);
await MSBuildNuGetProjectSystem.ExecuteScriptAsync(packageIdentity, packageInstallPath, uninstallPS1RelativePath, this, throwOnFailure: false);
}
}
PackageEventsProvider.Instance.NotifyReferenceRemoved(packageEventArgs);
}

// Step-10: Uninstall package from the folderNuGetProject
// Step-9: Uninstall package from the folderNuGetProject
await FolderNuGetProject.UninstallPackageAsync(packageIdentity, nuGetProjectContext, token);

// Step-11: Raise PackageUninstalled event
// Step-10: Raise PackageUninstalled event
if (PackageUninstalled != null)
{
PackageUninstalled(this, packageEventArgs);
}

PackageEventsProvider.Instance.NotifyUninstalled(packageEventArgs);

return true;
Expand Down
47 changes: 37 additions & 10 deletions src/NuGet.Core/NuGet.ProjectManagement/Utility/MSBuildNuGetProjectSystemUtility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ internal static void AddFiles(IMSBuildNuGetProjectSystem msBuildNuGetProjectSyst
IDictionary<FileTransformExtensions, IPackageFileTransformer> fileTransformers)
{
var packageTargetFramework = frameworkSpecificGroup.TargetFramework;

var packageItemListAsArchiveEntryNames = frameworkSpecificGroup.Items.ToList();
packageItemListAsArchiveEntryNames.Sort(new PackageItemComparer());
try
Expand Down Expand Up @@ -154,9 +154,9 @@ internal static void DeleteFiles(IMSBuildNuGetProjectSystem msBuildNuGetProjectS

// Get all directories that this package may have added
var directories = from grouping in directoryLookup
from directory in FileSystemUtility.GetDirectories(grouping.Key, altDirectorySeparator: false)
orderby directory.Length descending
select directory;
from directory in FileSystemUtility.GetDirectories(grouping.Key, altDirectorySeparator: false)
orderby directory.Length descending
select directory;

// Remove files from every directory
foreach (var directory in directories)
Expand Down Expand Up @@ -329,6 +329,7 @@ internal static void DeleteDirectory(IMSBuildNuGetProjectSystem msBuildNuGetProj
msBuildNuGetProjectSystem.NuGetProjectContext.Log(MessageLevel.Warning, Strings.Warning_DirectoryNotEmpty, path);
return;
}

msBuildNuGetProjectSystem.DeleteDirectory(path, recursive);

// Workaround for update-package TFS issue. If we're bound to TFS, do not try and delete directories.
Expand All @@ -339,7 +340,10 @@ internal static void DeleteDirectory(IMSBuildNuGetProjectSystem msBuildNuGetProj
return;
}

try
// For potential project systems that do not remove items from disk, we delete the folder directly
// There is no actual scenario where we know this is broken without the code below, but since the
// code was always there, we are leaving it behind for now.
if (!Directory.Exists(fullPath))
{
Directory.Delete(fullPath, recursive);

Expand All @@ -349,13 +353,9 @@ internal static void DeleteDirectory(IMSBuildNuGetProjectSystem msBuildNuGetProj
{
Thread.Sleep(100);
}
msBuildNuGetProjectSystem.RemoveFile(path);

msBuildNuGetProjectSystem.NuGetProjectContext.Log(MessageLevel.Debug, Strings.Debug_RemovedFolder, fullPath);
}
catch (DirectoryNotFoundException)
{
}
}

private static void PerformSafeAction(Action action, INuGetProjectContext nuGetProjectContext)
Expand Down Expand Up @@ -510,5 +510,32 @@ internal static void AddFile(IMSBuildNuGetProjectSystem msBuildNuGetProjectSyste
msBuildNuGetProjectSystem.AddFile(path, memoryStream);
}
}

private class PackageItemComparer : IComparer<string>
{
public int Compare(string x, string y)
{
// BUG 636: We sort files so that they are added in the correct order
// e.g aspx before aspx.cs

if (x.Equals(y, StringComparison.OrdinalIgnoreCase))
{
return 0;
}

// Add files that are prefixes of other files first
if (x.StartsWith(y, StringComparison.OrdinalIgnoreCase))
{
return -1;
}

if (y.StartsWith(x, StringComparison.OrdinalIgnoreCase))
{
return 1;
}

return string.Compare(y, x, StringComparison.OrdinalIgnoreCase);
}
}
}
}
}