Skip to content

Commit efcdd4a

Browse files
committed
Fix exception message
1 parent b76fd91 commit efcdd4a

15 files changed

+97
-38
lines changed

src/Cli/dotnet/CliStrings.resx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,10 @@ setx PATH "%PATH%;{0}"
441441
<value>More than one packaged shim is available: {0}.</value>
442442
</data>
443443
<data name="FailedToReadNuGetLockFile" xml:space="preserve">
444-
<value>Failed to read NuGet LockFile for tool package '{0}': {1}</value>
444+
<value>Failed to read NuGet assets file for tool package '{0}': {1}</value>
445+
</data>
446+
<data name="FailedToFindLibraryInAssetsFile" xml:space="preserve">
447+
<value>Failed to find library in NuGet assets file for tool package '{0}': {1}</value>
445448
</data>
446449
<data name="LevelArgumentName" xml:space="preserve">
447450
<value>LEVEL</value>

src/Cli/dotnet/ToolPackage/ToolPackageInstance.cs

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -75,23 +75,14 @@ public ToolPackageInstance(PackageId id,
7575
}
7676
catch (Exception ex) when (ex is UnauthorizedAccessException || ex is IOException)
7777
{
78-
throw new ToolPackageException(
79-
string.Format(
80-
CliStrings.FailedToReadNuGetLockFile,
81-
Id,
82-
ex.Message),
83-
ex);
78+
throw new ToolPackageException(string.Format(CliStrings.FailedToReadNuGetLockFile, Id, ex.Message), ex);
8479
}
8580

8681
var library = FindLibraryInLockFile(lockFile);
8782
if (library == null)
8883
{
8984
throw new ToolPackageException(
90-
string.Format(
91-
// TODO: Change exception message
92-
CliStrings.FailedToReadNuGetLockFile,
93-
Id,
94-
resolvedAssetsFileNameFullPath));
85+
string.Format(CliStrings.FailedToFindLibraryInAssetsFile, Id, resolvedAssetsFileNameFullPath));
9586
}
9687

9788

src/Cli/dotnet/xlf/CliStrings.cs.xlf

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/dotnet/xlf/CliStrings.de.xlf

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/dotnet/xlf/CliStrings.es.xlf

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/dotnet/xlf/CliStrings.fr.xlf

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/dotnet/xlf/CliStrings.it.xlf

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/dotnet/xlf/CliStrings.ja.xlf

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/dotnet/xlf/CliStrings.ko.xlf

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/dotnet/xlf/CliStrings.pl.xlf

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)