Skip to content

Commit

Permalink
Update.
Browse files Browse the repository at this point in the history
  • Loading branch information
imcarolwang committed Sep 18, 2024
1 parent d0ab5b7 commit 33d576b
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/dotnet-svcutil/lib/src/CommandProcessorOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ private async Task ProcessReferencesOptionAsync(CancellationToken cancellationTo
{
for (int idx = this.References.Count - 1; idx >= 0; idx--)
{
var selected = references.Where(x => this.References[idx].Name == x.Name).FirstOrDefault();
var selected = references.Where(x => string.Equals(this.References[idx].Name, x.Name, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
if (selected != null)
{
this.References[idx] = selected;
Expand Down
10 changes: 0 additions & 10 deletions src/dotnet-svcutil/lib/src/Shared/Options/UpdateOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -97,16 +97,6 @@ public void MakePathsRelativeTo(DirectoryInfo optionsFileDirectory)
this.Inputs[idx] = new Uri(relPath, UriKind.Relative);
}
}

//update referenced assembly path
for (int idx = 0; idx < this.References.Count; idx++)
{
var reference = this.References[idx];
if (reference.DependencyType.Equals(ProjectDependencyType.Binary))
{
this.References[idx] = ProjectDependency.FromAssembly(reference.AssemblyName);
}
}
}

public void ResolveFullPathsFrom(DirectoryInfo optionsFileDirectory)
Expand Down
2 changes: 1 addition & 1 deletion src/dotnet-svcutil/lib/src/Shared/ProjectDependency.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
this.AssemblyName;

this.IsFramework = this.Name == NetCoreAppPackageID || this.Name == NetStandardLibraryPackageID;
}
Expand Down

0 comments on commit 33d576b

Please sign in to comment.