Skip to content

Commit ee24e55

Browse files
sfoslundsfoslund
authored
Merge pull request #172 from sfoslund/BundleNames
Fix version string spacing issue
2 parents 5b0bacb + 133fea4 commit ee24e55

17 files changed

Lines changed: 204 additions & 200 deletions

‎src/dotnet-core-uninstall/LocalizableStrings.Designer.cs‎

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

‎src/dotnet-core-uninstall/LocalizableStrings.resx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
<value>VERSION</value>
197197
</data>
198198
<data name="UninstallNoOptionDescriptionWindows" xml:space="preserve">
199-
<value>Remove specified .NET Core SDKs or Runtimes. This tool can only uninstall items that were installed using Visual Studio, .NET Core SDK, or Runtime installers. By default, this tool does not uninstall versions that might be needed for Visual Studio. Read the documentation for the .NET Core Uninstall Tool at https://aka.ms/dotnet-core-uninstall.</value>
199+
<value>Remove specified .NET Core SDKs or Runtimes. This tool can only uninstall items that were installed using Visual Studio, .NET Core SDK, or Runtime installers. By default, this tool does not uninstall versions that might be needed for Visual Studio. Read the documentation for the .NET Core Uninstall Tool at https://aka.ms/dotnet-core-uninstall-docs.</value>
200200
</data>
201201
<data name="VerbosityOptionArgumentName" xml:space="preserve">
202202
<value>LEVEL</value>
@@ -211,7 +211,7 @@
211211
<value>Can be used with --sdk, --runtime and --aspnet-runtime to remove x86.</value>
212212
</data>
213213
<data name="NotAdminExceptionMessage" xml:space="preserve">
214-
<value>The current user does not have adequate privileges. See https://aka.ms/dotnet-core-uninstall.</value>
214+
<value>The current user does not have adequate privileges. See https://aka.ms/dotnet-core-uninstall-docs.</value>
215215
</data>
216216
<data name="MoreThanOneVersionSpecifiedExceptionMessageFormat" xml:space="preserve">
217217
<value>You must specify exactly one version for option: {0}.</value>
@@ -279,15 +279,15 @@ Specified versions:
279279
{0}
280280
*** END DRY RUN OUTPUT
281281

282-
To avoid breaking Visual Studio or other problems, read https://aka.ms/dotnet-core-uninstall.
282+
To avoid breaking Visual Studio or other problems, read https://aka.ms/dotnet-core-uninstall-docs.
283283

284284
Run as administrator and use the remove command to uninstall these items.</value>
285285
</data>
286286
<data name="WindowsConfirmationPromptOutputFormat" xml:space="preserve">
287287
<value>The following items will be removed:
288288
{0}
289289

290-
To avoid breaking Visual Studio or other problems, read https://aka.ms/dotnet-core-uninstall.
290+
To avoid breaking Visual Studio or other problems, read https://aka.ms/dotnet-core-uninstall-docs.
291291

292292
Do you want to continue? [y/n] </value>
293293
</data>
@@ -339,7 +339,7 @@ The versions that can be uninstalled with this tool are:
339339
</value>
340340
</data>
341341
<data name="UninstallNoOptionDescriptionMac" xml:space="preserve">
342-
<value>Remove specified .NET Core SDKs or Runtimes. By default, this tool does not uninstall versions that might be needed for Visual Studio for Mac or SDKs. Read the documentation for the .NET Core Uninstall Tool at https://aka.ms/dotnet-core-uninstall.</value>
342+
<value>Remove specified .NET Core SDKs or Runtimes. By default, this tool does not uninstall versions that might be needed for Visual Studio for Mac or SDKs. Read the documentation for the .NET Core Uninstall Tool at https://aka.ms/dotnet-core-uninstall-docs.</value>
343343
</data>
344344
<data name="MacRuntimeRequirementExplainationString" xml:space="preserve">
345345
<value>Used by Visual Studio for Mac or SDKs. Specify individually or use —-force to remove</value>
@@ -362,7 +362,7 @@ This tool cannot uninstall versions of the runtime or SDK that are installed usi
362362
<value>The following items will be removed:
363363
{0}
364364

365-
To avoid breaking Visual Studio for Mac or other problems, read https://aka.ms/dotnet-core-uninstall.
365+
To avoid breaking Visual Studio for Mac or other problems, read https://aka.ms/dotnet-core-uninstall-docs.
366366

367367
Do you want to continue? [y/n] </value>
368368
</data>
@@ -372,7 +372,7 @@ Specified versions:
372372
{0}
373373
*** END DRY RUN OUTPUT
374374

375-
To avoid breaking Visual Studio for Mac or other problems, read https://aka.ms/dotnet-core-uninstall.
375+
To avoid breaking Visual Studio for Mac or other problems, read https://aka.ms/dotnet-core-uninstall-docs.
376376

377377
Run as administrator and use the remove command to uninstall these items.</value>
378378
</data>

‎src/dotnet-core-uninstall/Shared/BundleInfo/Versioning/BundleVersion.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@ protected BundleVersion(string value, string footnote = null)
3434
{
3535
SemVer = semVer;
3636
}
37-
else
37+
else if(value != null && SemanticVersion.TryParse(value.Replace(" ", ""), out var formattedSemVer))
38+
{
39+
SemVer = formattedSemVer;
40+
}
41+
else
3842
{
3943
throw new InvalidInputVersionException(value);
4044
}

‎src/dotnet-core-uninstall/Shared/Commands/UninstallCommandExec.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public static void Execute(IBundleCollector bundleCollector)
3636

3737
var filtered = CommandBundleFilter.GetFilteredWithRequirementStrings(bundleCollector);
3838

39-
if (CommandLineConfigs.CommandLineParseResult.CommandResult.OptionResult(CommandLineConfigs.YesOption.Name) != null)
39+
if (CommandLineConfigs.CommandLineParseResult.FindResultFor(CommandLineConfigs.YesOption) != null)
4040
{
4141
if (!IsAdmin())
4242
{

‎src/dotnet-core-uninstall/xlf/LocalizableStrings.cs.xlf‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,13 @@
111111
<source>The following items will be removed:
112112
{0}
113113

114-
To avoid breaking Visual Studio for Mac or other problems, read https://aka.ms/dotnet-core-uninstall.
114+
To avoid breaking Visual Studio for Mac or other problems, read https://aka.ms/dotnet-core-uninstall-docs.
115115

116116
Do you want to continue? [y/n] </source>
117117
<target state="new">The following items will be removed:
118118
{0}
119119

120-
To avoid breaking Visual Studio for Mac or other problems, read https://aka.ms/dotnet-core-uninstall.
120+
To avoid breaking Visual Studio for Mac or other problems, read https://aka.ms/dotnet-core-uninstall-docs.
121121

122122
Do you want to continue? [y/n] </target>
123123
<note />
@@ -128,15 +128,15 @@ Specified versions:
128128
{0}
129129
*** END DRY RUN OUTPUT
130130

131-
To avoid breaking Visual Studio for Mac or other problems, read https://aka.ms/dotnet-core-uninstall.
131+
To avoid breaking Visual Studio for Mac or other problems, read https://aka.ms/dotnet-core-uninstall-docs.
132132

133133
Run as administrator and use the remove command to uninstall these items.</source>
134134
<target state="new">*** DRY RUN OUTPUT
135135
Specified versions:
136136
{0}
137137
*** END DRY RUN OUTPUT
138138

139-
To avoid breaking Visual Studio for Mac or other problems, read https://aka.ms/dotnet-core-uninstall.
139+
To avoid breaking Visual Studio for Mac or other problems, read https://aka.ms/dotnet-core-uninstall-docs.
140140

141141
Run as administrator and use the remove command to uninstall these items.</target>
142142
<note />
@@ -202,8 +202,8 @@ Uninstalling this item will cause Visual Studio for to break.
202202
<note />
203203
</trans-unit>
204204
<trans-unit id="NotAdminExceptionMessage">
205-
<source>The current user does not have adequate privileges. See https://aka.ms/dotnet-core-uninstall.</source>
206-
<target state="new">The current user does not have adequate privileges. See https://aka.ms/dotnet-core-uninstall.</target>
205+
<source>The current user does not have adequate privileges. See https://aka.ms/dotnet-core-uninstall-docs.</source>
206+
<target state="new">The current user does not have adequate privileges. See https://aka.ms/dotnet-core-uninstall-docs.</target>
207207
<note />
208208
</trans-unit>
209209
<trans-unit id="OperatingSystemNotSupportedExceptionMessage">
@@ -307,13 +307,13 @@ Uninstalling this item will cause Visual Studio for to break.
307307
<note />
308308
</trans-unit>
309309
<trans-unit id="UninstallNoOptionDescriptionMac">
310-
<source>Remove specified .NET Core SDKs or Runtimes. By default, this tool does not uninstall versions that might be needed for Visual Studio for Mac or SDKs. Read the documentation for the .NET Core Uninstall Tool at https://aka.ms/dotnet-core-uninstall.</source>
311-
<target state="new">Remove specified .NET Core SDKs or Runtimes. By default, this tool does not uninstall versions that might be needed for Visual Studio for Mac or SDKs. Read the documentation for the .NET Core Uninstall Tool at https://aka.ms/dotnet-core-uninstall.</target>
310+
<source>Remove specified .NET Core SDKs or Runtimes. By default, this tool does not uninstall versions that might be needed for Visual Studio for Mac or SDKs. Read the documentation for the .NET Core Uninstall Tool at https://aka.ms/dotnet-core-uninstall-docs.</source>
311+
<target state="new">Remove specified .NET Core SDKs or Runtimes. By default, this tool does not uninstall versions that might be needed for Visual Studio for Mac or SDKs. Read the documentation for the .NET Core Uninstall Tool at https://aka.ms/dotnet-core-uninstall-docs.</target>
312312
<note />
313313
</trans-unit>
314314
<trans-unit id="UninstallNoOptionDescriptionWindows">
315-
<source>Remove specified .NET Core SDKs or Runtimes. This tool can only uninstall items that were installed using Visual Studio, .NET Core SDK, or Runtime installers. By default, this tool does not uninstall versions that might be needed for Visual Studio. Read the documentation for the .NET Core Uninstall Tool at https://aka.ms/dotnet-core-uninstall.</source>
316-
<target state="new">Remove specified .NET Core SDKs or Runtimes. This tool can only uninstall items that were installed using Visual Studio, .NET Core SDK, or Runtime installers. By default, this tool does not uninstall versions that might be needed for Visual Studio. Read the documentation for the .NET Core Uninstall Tool at https://aka.ms/dotnet-core-uninstall.</target>
315+
<source>Remove specified .NET Core SDKs or Runtimes. This tool can only uninstall items that were installed using Visual Studio, .NET Core SDK, or Runtime installers. By default, this tool does not uninstall versions that might be needed for Visual Studio. Read the documentation for the .NET Core Uninstall Tool at https://aka.ms/dotnet-core-uninstall-docs.</source>
316+
<target state="new">Remove specified .NET Core SDKs or Runtimes. This tool can only uninstall items that were installed using Visual Studio, .NET Core SDK, or Runtime installers. By default, this tool does not uninstall versions that might be needed for Visual Studio. Read the documentation for the .NET Core Uninstall Tool at https://aka.ms/dotnet-core-uninstall-docs.</target>
317317
<note />
318318
</trans-unit>
319319
<trans-unit id="UninstallNormalVerbosityFormat">
@@ -390,13 +390,13 @@ Uninstalling this item will cause Visual Studio for to break.
390390
<source>The following items will be removed:
391391
{0}
392392

393-
To avoid breaking Visual Studio or other problems, read https://aka.ms/dotnet-core-uninstall.
393+
To avoid breaking Visual Studio or other problems, read https://aka.ms/dotnet-core-uninstall-docs.
394394

395395
Do you want to continue? [y/n] </source>
396396
<target state="new">The following items will be removed:
397397
{0}
398398

399-
To avoid breaking Visual Studio or other problems, read https://aka.ms/dotnet-core-uninstall.
399+
To avoid breaking Visual Studio or other problems, read https://aka.ms/dotnet-core-uninstall-docs.
400400

401401
Do you want to continue? [y/n] </target>
402402
<note />
@@ -407,15 +407,15 @@ Specified versions:
407407
{0}
408408
*** END DRY RUN OUTPUT
409409

410-
To avoid breaking Visual Studio or other problems, read https://aka.ms/dotnet-core-uninstall.
410+
To avoid breaking Visual Studio or other problems, read https://aka.ms/dotnet-core-uninstall-docs.
411411

412412
Run as administrator and use the remove command to uninstall these items.</source>
413413
<target state="new">*** DRY RUN OUTPUT
414414
Specified versions:
415415
{0}
416416
*** END DRY RUN OUTPUT
417417

418-
To avoid breaking Visual Studio or other problems, read https://aka.ms/dotnet-core-uninstall.
418+
To avoid breaking Visual Studio or other problems, read https://aka.ms/dotnet-core-uninstall-docs.
419419

420420
Run as administrator and use the remove command to uninstall these items.</target>
421421
<note />

0 commit comments

Comments
 (0)