update.

dotnet · Oct 24, 2024 · 3f52c4d · 3f52c4d
1 parent db11dd1
commit 3f52c4d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/src/dotnet-svcutil/lib/src/CommandProcessorOptions.cs b/src/dotnet-svcutil/lib/src/CommandProcessorOptions.cs
@@ -627,12 +627,7 @@ private async Task ProcessReferencesOptionAsync(CancellationToken cancellationTo
                     {
                         for (int idx = this.References.Count - 1; idx >= 0; idx--)
                         {
-                            var selected = references.Where(x => string.Equals(this.References[idx].Name, x.Name, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
-                            if (selected != null)
-                            {
-                                this.References[idx] = selected;
-                            }
-                            else
+                            if (!references.Contains(this.References[idx]))
                             {
                                 this.References.RemoveAt(idx);
                             }

diff --git a/src/dotnet-svcutil/lib/src/Shared/Options/UpdateOptions.cs b/src/dotnet-svcutil/lib/src/Shared/Options/UpdateOptions.cs
@@ -104,8 +104,7 @@ public void MakePathsRelativeTo(DirectoryInfo optionsFileDirectory)
                 var reference = this.References[idx];
                 if (reference.DependencyType == ProjectDependencyType.Project || reference.DependencyType == ProjectDependencyType.Binary)
                 {
-                    PathHelper.GetRelativePath(reference.FullPath, optionsFileDirectory, out relPath);
-                    this.References[idx].ReferenceIdentity = relPath;
+                    this.References[idx].ReferenceIdentity = PathHelper.GetRelativePath(reference.FullPath, optionsFileDirectory, out relPath) ? relPath : reference.FullPath;
                 }
             }
         }
@@ -134,7 +133,9 @@ public void ResolveFullPathsFrom(DirectoryInfo optionsFileDirectory)
                 var reference = this.References[idx];
                 if (reference.DependencyType == ProjectDependencyType.Project || reference.DependencyType == ProjectDependencyType.Binary)
                 {
-                    this.References[idx].FullPath = Path.Combine(optionsFileDirectory.FullName, reference.ReferenceIdentity);
+                    string fullPath = Path.GetFullPath(Path.Combine(optionsFileDirectory.FullName, reference.ReferenceIdentity));
+                    this.References[idx].FullPath = fullPath;
+                    this.References[idx].ReferenceIdentity = fullPath;
                 }
             }
         }

diff --git a/src/dotnet-svcutil/lib/src/Shared/ProjectDependency.cs b/src/dotnet-svcutil/lib/src/Shared/ProjectDependency.cs
@@ -153,7 +153,7 @@ private ProjectDependency(string filePath = "", string packageName = "", string
 
             this.ReferenceIdentity = this.DependencyType == ProjectDependencyType.Package || this.DependencyType == ProjectDependencyType.Tool || !string.IsNullOrWhiteSpace(packageName) ?
                 string.Format(CultureInfo.InvariantCulture, "{0}, {{{1}, {2}}}", this.AssemblyName, this.Name, this.Version) :
-                this.FullPath;
+                filePath;
 
             this.IsFramework = this.Name == NetCoreAppPackageID || this.Name == NetStandardLibraryPackageID;
         }