[FIX] Save package files with lowercase versions

edvilme · edvilme · commit 235af9cff7bf · 2024-10-10T10:31:25.000-07:00
diff --git a/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs b/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs
@@ -107,10 +107,10 @@ public async Task<string> DownloadPackageAsync(PackageId packageId,
 
             string nupkgPath = downloadFolder == null || !downloadFolder.HasValue
                 ? Path.Combine(_packageInstallDir.Value, packageId.ToString(),
-                    resolvedPackageVersion.ToNormalizedString(),
-                    $"{packageId}.{resolvedPackageVersion.ToNormalizedString()}.nupkg")
+                    resolvedPackageVersion.ToNormalizedString().ToLowerInvariant(),
+                    $"{packageId}.{resolvedPackageVersion.ToNormalizedString().ToLowerInvariant()}.nupkg")
                 : Path.Combine(downloadFolder.Value.Value,
-                    $"{packageId}.{resolvedPackageVersion.ToNormalizedString()}.nupkg");
+                    $"{packageId}.{resolvedPackageVersion.ToNormalizedString().ToLowerInvariant()}.nupkg");
 
             Directory.CreateDirectory(Path.GetDirectoryName(nupkgPath));
             using FileStream destinationStream = File.Create(nupkgPath);
@@ -282,8 +282,8 @@ await GetPackageMetadataAsync(packageId.ToString(), packageVersion, packagesSour
         }
 
         private string GetNupkgUrl(string baseUri, PackageId id, NuGetVersion version) =>
-            baseUri + id.ToString() + "/" + version.ToNormalizedString() + "/" + id.ToString() +
-            "." + version.ToNormalizedString() + ".nupkg";
+            baseUri + id.ToString() + "/" + version.ToNormalizedString().ToLowerInvariant() + "/" + id.ToString() +
+            "." + version.ToNormalizedString().ToLowerInvariant() + ".nupkg";
 
         internal IEnumerable<FilePath> FindAllFilesNeedExecutablePermission(IEnumerable<string> files,
             string targetPath)
diff --git a/src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs b/src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs
@@ -107,11 +107,11 @@ public IToolPackage InstallPackage(PackageLocation packageLocation, PackageId pa
                     }
                     NuGetVersion packageVersion = nugetPackageDownloader.GetBestPackageVersionAsync(packageId, versionRange, packageSourceLocation).GetAwaiter().GetResult();
 
-                    rollbackDirectory = isGlobalTool ? toolDownloadDir.Value: Path.Combine(toolDownloadDir.Value, packageId.ToString(), packageVersion.ToString());
+                    rollbackDirectory = isGlobalTool ? toolDownloadDir.Value: Path.Combine(toolDownloadDir.Value, packageId.ToString(), packageVersion.ToNormalizedString().ToLowerInvariant());
 
                     if (isGlobalTool)
                     {
-                        NuGetv3LocalRepository nugetPackageRootDirectory = new(Path.Combine(_toolPackageStore.GetRootPackageDirectory(packageId).ToString().Trim('"'), packageVersion.ToString()));
+                        NuGetv3LocalRepository nugetPackageRootDirectory = new(Path.Combine(_toolPackageStore.GetRootPackageDirectory(packageId).ToString().Trim('"'), packageVersion.ToNormalizedString().ToLowerInvariant()));
                         var globalPackage = nugetPackageRootDirectory.FindPackage(packageId.ToString(), packageVersion);
 
                         if (globalPackage != null)
@@ -295,7 +295,7 @@ private static async Task<NuGetVersion> DownloadAndExtractPackage(
             }
 
             // Extract the package
-            var nupkgDir = Path.Combine(packagesRootPath, packageId.ToString(), version.ToString());
+            var nupkgDir = Path.Combine(packagesRootPath, packageId.ToString(), version.ToNormalizedString().ToLowerInvariant());
             await nugetPackageDownloader.ExtractPackageAsync(packagePath, new DirectoryPath(nupkgDir));
 
             return version;
diff --git a/src/Cli/dotnet/ToolPackage/ToolPackageInstance.cs b/src/Cli/dotnet/ToolPackage/ToolPackageInstance.cs
@@ -74,7 +74,7 @@ public ToolPackageInstance(PackageId id,
             _lockFile =
                 new Lazy<LockFile>(
                     () => new LockFileFormat().Read(assetsJsonParentDirectory.WithFile(AssetsFileName).Value));
-            var toolsPackagePath = Path.Combine(PackageDirectory.Value, Id.ToString(), Version.ToNormalizedString(), "tools");
+            var toolsPackagePath = Path.Combine(PackageDirectory.Value, Id.ToString(), Version.ToNormalizedString().ToLowerInvariant(), "tools");
             Frameworks = Directory.GetDirectories(toolsPackagePath)
                 .Select(path => NuGetFramework.ParseFolder(Path.GetFileName(path)));
         }
@@ -116,7 +116,7 @@ private FilePath LockFileRelativePathToFullFilePath(string lockFileRelativePath,
             return PackageDirectory
                         .WithSubDirectories(
                             Id.ToString(),
-                            library.Version.ToNormalizedString())
+                            library.Version.ToNormalizedString().ToLowerInvariant())
                         .WithFile(lockFileRelativePath);
         }
 
@@ -198,7 +198,7 @@ private ToolConfiguration DeserializeToolConfiguration(LockFileTargetLibrary lib
                 PackageDirectory
                     .WithSubDirectories(
                         Id.ToString(),
-                        library.Version.ToNormalizedString())
+                        library.Version.ToNormalizedString().ToLowerInvariant())
                     .WithFile(dotnetToolSettings.Path);
 
             var configuration = ToolConfigurationDeserializer.Deserialize(toolConfigurationPath.Value);
diff --git a/src/Cli/dotnet/commands/dotnet-add/dotnet-add-package/AddPackageParser.cs b/src/Cli/dotnet/commands/dotnet-add/dotnet-add-package/AddPackageParser.cs
@@ -38,7 +38,7 @@ internal static class AddPackageParser
                     var allowPrerelease = context.ParseResult.GetValue(PrereleaseOption);
                     return QueryVersionsForPackage(packageId, context.WordToComplete, allowPrerelease, CancellationToken.None)
                         .Result
-                        .Select(version => new CompletionItem(version.ToNormalizedString()));
+                        .Select(version => new CompletionItem(version.ToNormalizedString().ToLowerInvariant()));
                 }
                 else
                 {
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/Mocks/MockPackageResolver.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/Mocks/MockPackageResolver.cs
@@ -22,7 +22,7 @@ public string GetPackageDirectory(string packageId, NuGetVersion version)
         public string GetPackageDirectory(string packageId, NuGetVersion version, out string packageRoot)
         {
             packageRoot = _root;
-            return Path.Combine(_root, packageId, version.ToNormalizedString(), "path");
+            return Path.Combine(_root, packageId, version.ToNormalizedString().ToLowerInvariant(), "path");
         }
 
         public string ResolvePackageAssetPath(LockFileTargetLibrary package, string relativePath) => Path.Combine(GetPackageDirectory(package.Name, package.Version), relativePath);
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageAssets.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageAssets.cs
@@ -1442,7 +1442,7 @@ private void WritePackageDependenciesDesignTime()
 
                 foreach (var package in _lockFile.Libraries)
                 {
-                    var packageVersion = package.Version.ToNormalizedString();
+                    var packageVersion = package.Version.ToNormalizedString().ToLowerInvariant();
                     string packageId = $"{package.Name}/{packageVersion}";
 
                     // Find PackageDefinitions that match our allowed item specs
@@ -1508,7 +1508,7 @@ HashSet<string> GetPackageDependencies()
                     return results;
                 }
 
-                static string GetPackageId(LockFileTargetLibrary package) => $"{package.Name}/{package.Version.ToNormalizedString()}";
+                static string GetPackageId(LockFileTargetLibrary package) => $"{package.Name}/{package.Version.ToNormalizedString().ToLowerInvariant()}";
 
                 Dictionary<string, LogLevel> GetPackageDiagnosticLevels()
                 {
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageDependencies.cs
@@ -166,7 +166,7 @@ private void GetPackageAndFileDefinitions()
             foreach (var package in LockFile.Libraries)
             {
                 var packageName = package.Name;
-                var packageVersion = package.Version.ToNormalizedString();
+                var packageVersion = package.Version.ToNormalizedString().ToLowerInvariant();
                 string packageId = $"{packageName}/{packageVersion}";
                 var item = new TaskItem(packageId);
                 item.SetMetadata(MetadataKeys.Name, packageName);
@@ -288,7 +288,7 @@ private void GetPackageAndFileDependencies(LockFileTarget target)
 
             foreach (var package in target.Libraries)
             {
-                string packageId = $"{package.Name}/{package.Version.ToNormalizedString()}";
+                string packageId = $"{package.Name}/{package.Version.ToNormalizedString().ToLowerInvariant()}";
 
                 if (_projectFileDependencies.Contains(package.Name))
                 {
@@ -313,7 +313,7 @@ private void GetPackageDependencies(
             Dictionary<string, string> resolvedPackageVersions,
             HashSet<string> transitiveProjectRefs)
         {
-            string packageId = $"{package.Name}/{package.Version.ToNormalizedString()}";
+            string packageId = $"{package.Name}/{package.Version.ToNormalizedString().ToLowerInvariant()}";
             string frameworkAlias = _targetNameToAliasMap[targetName];
             foreach (var deps in package.Dependencies)
             {
@@ -339,7 +339,7 @@ private void GetPackageDependencies(
 
         private void GetFileDependencies(LockFileTargetLibrary package, string targetName)
         {
-            string packageId = $"{package.Name}/{package.Version.ToNormalizedString()}";
+            string packageId = $"{package.Name}/{package.Version.ToNormalizedString().ToLowerInvariant()}";
             string frameworkAlias = _targetNameToAliasMap[targetName];
 
             // for each type of file group

Original file line number	Diff line number	Diff line change
`@@ -107,11 +107,11 @@ public IToolPackage InstallPackage(PackageLocation packageLocation, PackageId pa`
`107`	`107`	`}`
`108`	`108`	`NuGetVersion packageVersion = nugetPackageDownloader.GetBestPackageVersionAsync(packageId, versionRange, packageSourceLocation).GetAwaiter().GetResult();`
`109`	`109`
`110`		`- rollbackDirectory = isGlobalTool ? toolDownloadDir.Value: Path.Combine(toolDownloadDir.Value, packageId.ToString(), packageVersion.ToString());`
	`110`	`+ rollbackDirectory = isGlobalTool ? toolDownloadDir.Value: Path.Combine(toolDownloadDir.Value, packageId.ToString(), packageVersion.ToNormalizedString().ToLowerInvariant());`
`111`	`111`
`112`	`112`	`if (isGlobalTool)`
`113`	`113`	`{`
`114`		`- NuGetv3LocalRepository nugetPackageRootDirectory = new(Path.Combine(_toolPackageStore.GetRootPackageDirectory(packageId).ToString().Trim('"'), packageVersion.ToString()));`
	`114`	`+ NuGetv3LocalRepository nugetPackageRootDirectory = new(Path.Combine(_toolPackageStore.GetRootPackageDirectory(packageId).ToString().Trim('"'), packageVersion.ToNormalizedString().ToLowerInvariant()));`
`115`	`115`	`var globalPackage = nugetPackageRootDirectory.FindPackage(packageId.ToString(), packageVersion);`
`116`	`116`
`117`	`117`	`if (globalPackage != null)`
`@@ -295,7 +295,7 @@ private static async Task<NuGetVersion> DownloadAndExtractPackage(`
`295`	`295`	`}`
`296`	`296`
`297`	`297`	`// Extract the package`
`298`		`- var nupkgDir = Path.Combine(packagesRootPath, packageId.ToString(), version.ToString());`
	`298`	`+ var nupkgDir = Path.Combine(packagesRootPath, packageId.ToString(), version.ToNormalizedString().ToLowerInvariant());`
`299`	`299`	`await nugetPackageDownloader.ExtractPackageAsync(packagePath, new DirectoryPath(nupkgDir));`
`300`	`300`
`301`	`301`	`return version;`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ internal static class AddPackageParser`
`38`	`38`	`var allowPrerelease = context.ParseResult.GetValue(PrereleaseOption);`
`39`	`39`	`return QueryVersionsForPackage(packageId, context.WordToComplete, allowPrerelease, CancellationToken.None)`
`40`	`40`	`.Result`
`41`		`- .Select(version => new CompletionItem(version.ToNormalizedString()));`
	`41`	`+ .Select(version => new CompletionItem(version.ToNormalizedString().ToLowerInvariant()));`
`42`	`42`	`}`
`43`	`43`	`else`
`44`	`44`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public string GetPackageDirectory(string packageId, NuGetVersion version)`
`22`	`22`	`public string GetPackageDirectory(string packageId, NuGetVersion version, out string packageRoot)`
`23`	`23`	`{`
`24`	`24`	`packageRoot = _root;`
`25`		`- return Path.Combine(_root, packageId, version.ToNormalizedString(), "path");`
	`25`	`+ return Path.Combine(_root, packageId, version.ToNormalizedString().ToLowerInvariant(), "path");`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public string ResolvePackageAssetPath(LockFileTargetLibrary package, string relativePath) => Path.Combine(GetPackageDirectory(package.Name, package.Version), relativePath);`
Original file line number	Diff line number	Diff line change
`@@ -1442,7 +1442,7 @@ private void WritePackageDependenciesDesignTime()`
`1442`	`1442`
`1443`	`1443`	`foreach (var package in _lockFile.Libraries)`
`1444`	`1444`	`{`
`1445`		`- var packageVersion = package.Version.ToNormalizedString();`
	`1445`	`+ var packageVersion = package.Version.ToNormalizedString().ToLowerInvariant();`
`1446`	`1446`	`string packageId = $"{package.Name}/{packageVersion}";`
`1447`	`1447`
`1448`	`1448`	`// Find PackageDefinitions that match our allowed item specs`
`@@ -1508,7 +1508,7 @@ HashSet<string> GetPackageDependencies()`
`1508`	`1508`	`return results;`
`1509`	`1509`	`}`
`1510`	`1510`
`1511`		`- static string GetPackageId(LockFileTargetLibrary package) => $"{package.Name}/{package.Version.ToNormalizedString()}";`
	`1511`	`+ static string GetPackageId(LockFileTargetLibrary package) => $"{package.Name}/{package.Version.ToNormalizedString().ToLowerInvariant()}";`
`1512`	`1512`
`1513`	`1513`	`Dictionary<string, LogLevel> GetPackageDiagnosticLevels()`
`1514`	`1514`	`{`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ private void GetPackageAndFileDefinitions()`
`166`	`166`	`foreach (var package in LockFile.Libraries)`
`167`	`167`	`{`
`168`	`168`	`var packageName = package.Name;`
`169`		`- var packageVersion = package.Version.ToNormalizedString();`
	`169`	`+ var packageVersion = package.Version.ToNormalizedString().ToLowerInvariant();`
`170`	`170`	`string packageId = $"{packageName}/{packageVersion}";`
`171`	`171`	`var item = new TaskItem(packageId);`
`172`	`172`	`item.SetMetadata(MetadataKeys.Name, packageName);`
`@@ -288,7 +288,7 @@ private void GetPackageAndFileDependencies(LockFileTarget target)`
`288`	`288`
`289`	`289`	`foreach (var package in target.Libraries)`
`290`	`290`	`{`
`291`		`- string packageId = $"{package.Name}/{package.Version.ToNormalizedString()}";`
	`291`	`+ string packageId = $"{package.Name}/{package.Version.ToNormalizedString().ToLowerInvariant()}";`
`292`	`292`
`293`	`293`	`if (_projectFileDependencies.Contains(package.Name))`
`294`	`294`	`{`
`@@ -313,7 +313,7 @@ private void GetPackageDependencies(`
`313`	`313`	`Dictionary<string, string> resolvedPackageVersions,`
`314`	`314`	`HashSet<string> transitiveProjectRefs)`
`315`	`315`	`{`
`316`		`- string packageId = $"{package.Name}/{package.Version.ToNormalizedString()}";`
	`316`	`+ string packageId = $"{package.Name}/{package.Version.ToNormalizedString().ToLowerInvariant()}";`
`317`	`317`	`string frameworkAlias = _targetNameToAliasMap[targetName];`
`318`	`318`	`foreach (var deps in package.Dependencies)`
`319`	`319`	`{`
`@@ -339,7 +339,7 @@ private void GetPackageDependencies(`
`339`	`339`
`340`	`340`	`private void GetFileDependencies(LockFileTargetLibrary package, string targetName)`
`341`	`341`	`{`
`342`		`- string packageId = $"{package.Name}/{package.Version.ToNormalizedString()}";`
	`342`	`+ string packageId = $"{package.Name}/{package.Version.ToNormalizedString().ToLowerInvariant()}";`
`343`	`343`	`string frameworkAlias = _targetNameToAliasMap[targetName];`
`344`	`344`
`345`	`345`	`// for each type of file group`