Skip to content

Commit 8ffb4d7

Browse files
committed
Update.
1 parent f70768c commit 8ffb4d7

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

src/dotnet-svcutil/lib/src/CommandProcessorOptions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ private async Task ProcessReferencesOptionAsync(CancellationToken cancellationTo
627627
{
628628
for (int idx = this.References.Count - 1; idx >= 0; idx--)
629629
{
630-
var selected = references.Where(x => this.References[idx].Name == x.Name).FirstOrDefault();
630+
var selected = references.Where(x => string.Equals(this.References[idx].Name, x.Name, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
631631
if (selected != null)
632632
{
633633
this.References[idx] = selected;

src/dotnet-svcutil/lib/src/Shared/Options/UpdateOptions.cs

-10
Original file line numberDiff line numberDiff line change
@@ -97,16 +97,6 @@ public void MakePathsRelativeTo(DirectoryInfo optionsFileDirectory)
9797
this.Inputs[idx] = new Uri(relPath, UriKind.Relative);
9898
}
9999
}
100-
101-
//update referenced assembly path
102-
for (int idx = 0; idx < this.References.Count; idx++)
103-
{
104-
var reference = this.References[idx];
105-
if (reference.DependencyType.Equals(ProjectDependencyType.Binary))
106-
{
107-
this.References[idx] = ProjectDependency.FromAssembly(reference.AssemblyName);
108-
}
109-
}
110100
}
111101

112102
public void ResolveFullPathsFrom(DirectoryInfo optionsFileDirectory)

src/dotnet-svcutil/lib/src/Shared/ProjectDependency.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ private ProjectDependency(string filePath = "", string packageName = "", string
153153

154154
this.ReferenceIdentity = this.DependencyType == ProjectDependencyType.Package || this.DependencyType == ProjectDependencyType.Tool || !string.IsNullOrWhiteSpace(packageName) ?
155155
string.Format(CultureInfo.InvariantCulture, "{0}, {{{1}, {2}}}", this.AssemblyName, this.Name, this.Version) :
156-
this.FullPath;
156+
this.AssemblyName;
157157

158158
this.IsFramework = this.Name == NetCoreAppPackageID || this.Name == NetStandardLibraryPackageID;
159159
}

0 commit comments

Comments
 (0)