From b997b45a6fdd8724cf3de7fe417db04000eb6b53 Mon Sep 17 00:00:00 2001 From: PhilippNaused Date: Fri, 7 Nov 2025 19:30:29 +0100 Subject: [PATCH 1/2] Fix some typos --- src/Signing/SignScripts.csproj | 2 +- src/dotnet-install.ps1 | 6 +++--- .../GivenThatIWantToGetTheSdkLinksFromAScript.cs | 16 ++++++++-------- tests/Install-Scripts.Test/TestBase.cs | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Signing/SignScripts.csproj b/src/Signing/SignScripts.csproj index 4c6bdf2ef0..6b23720cae 100644 --- a/src/Signing/SignScripts.csproj +++ b/src/Signing/SignScripts.csproj @@ -32,7 +32,7 @@ - + diff --git a/src/dotnet-install.ps1 b/src/dotnet-install.ps1 index 57cb6cfc38..383fcaadef 100644 --- a/src/dotnet-install.ps1 +++ b/src/dotnet-install.ps1 @@ -64,7 +64,7 @@ .PARAMETER DryRun If set it will not perform installation but instead display what command line to use to consistently install currently requested version of dotnet cli. In example if you specify version 'latest' it will display a link - with specific version so that this command can be used deterministicly in a build script. + with specific version so that this command can be used deterministically in a build script. It also displays binaries location if you prefer to install or download it yourself. .PARAMETER NoPath By default this script will set environment variable PATH for the current process to the binaries folder inside installation folder. @@ -92,7 +92,7 @@ Determines the SDK version from a user specified global.json file Note: global.json must have a value for 'SDK:Version' .PARAMETER DownloadTimeout - Determines timeout duration in seconds for dowloading of the SDK file + Determines timeout duration in seconds for downloading of the SDK file Default: 1200 seconds (20 minutes) .PARAMETER KeepZip If set, downloaded file is kept @@ -160,7 +160,7 @@ function Say-Warning($str) { # Use this function to show a human-readable comment along with an exception. function Say-Error($str) { try { - # Write-Error is quite oververbose for the purpose of the function, let's write one line with error style settings. + # Write-Error is quite overly verbose for the purpose of the function, let's write one line with error style settings. $Host.UI.WriteErrorLine("dotnet-install: $str") } catch { diff --git a/tests/Install-Scripts.Test/GivenThatIWantToGetTheSdkLinksFromAScript.cs b/tests/Install-Scripts.Test/GivenThatIWantToGetTheSdkLinksFromAScript.cs index 04dcec473e..5864759112 100644 --- a/tests/Install-Scripts.Test/GivenThatIWantToGetTheSdkLinksFromAScript.cs +++ b/tests/Install-Scripts.Test/GivenThatIWantToGetTheSdkLinksFromAScript.cs @@ -55,13 +55,13 @@ public void WhenVariousParametersArePassedToInstallScripts(string parameter, str var commandResult = TestUtils.CreateInstallCommand(args).ExecuteInstallation(); - // Standard 'dryrun' criterium + // Standard 'dryrun' criterion commandResult.Should().Pass(); commandResult.Should().NotHaveStdOutContaining("dryrun"); commandResult.Should().HaveStdOutContaining("Repeatable invocation:"); commandResult.Should().HaveStdOutMatching(@"URL\s#0\s-\s(legacy|primary|aka\.ms):\shttps://"); - // Non-dynamic input parameters should always be on the ouput line + // Non-dynamic input parameters should always be on the output line commandResult.Should().HaveStdOutContainingIgnoreCase(parameter); } @@ -79,7 +79,7 @@ public void WhenRuntimeParametersArePassedToInstallScripts(string runtime, strin var commandResult = TestUtils.CreateInstallCommand(args).ExecuteInstallation(); - // Standard 'dryrun' criterium + // Standard 'dryrun' criterion commandResult.Should().Pass(); commandResult.Should().NotHaveStdOutContaining("dryrun"); commandResult.Should().HaveStdOutContaining("Repeatable invocation:"); @@ -177,7 +177,7 @@ public void WhenChannelResolvesToASpecificRuntimeVersion(string channel, string var commandResult = TestUtils.CreateInstallCommand(args).ExecuteInstallation(); - // Standard 'dryrun' criterium + // Standard 'dryrun' criterion commandResult.Should().Pass(); commandResult.Should().NotHaveStdErr(); commandResult.Should().NotHaveStdOutContaining("dryrun"); @@ -254,7 +254,7 @@ public void WhenChannelResolvesToASpecificSDKVersion(string channel, bool useFee var commandResult = TestUtils.CreateInstallCommand(args).ExecuteInstallation(); - // Standard 'dryrun' criterium + // Standard 'dryrun' criterion commandResult.Should().Pass(); commandResult.Should().NotHaveStdErr(); commandResult.Should().NotHaveStdOutContaining("dryrun"); @@ -298,7 +298,7 @@ public void WhenInvalidChannelWasUsed(string channel) var commandResult = TestUtils.CreateInstallCommand(args).ExecuteInstallation(); - // Standard 'dryrun' criterium + // Standard 'dryrun' criterion commandResult.Should().Fail(); commandResult.Should().HaveStdErrContaining("Failed to resolve the exact version number."); commandResult.Should().NotHaveStdOutContaining("Repeatable invocation:"); @@ -311,7 +311,7 @@ public void WhenInstallDirAliasIsUsed() { var commandResult = TestUtils.CreateInstallCommand(new[] { "-DryRun", "-i", "installation_path" }).ExecuteInstallation(); - // Standard 'dryrun' criterium + // Standard 'dryrun' criterion commandResult.Should().Pass(); commandResult.Should().NotHaveStdOutContaining("dryrun"); commandResult.Should().HaveStdOutContaining("Repeatable invocation:"); @@ -319,7 +319,7 @@ public void WhenInstallDirAliasIsUsed() // -i shouldn't be considered ambiguous on powershell. commandResult.Should().NotHaveStdOutContaining("the parameter name 'i' is ambiguous"); - // bash doesn't give error on ambiguity. The first occurance of the alias wins. + // bash doesn't give error on ambiguity. The first occurrence of the alias wins. // -i should translate to -InstallDir if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) diff --git a/tests/Install-Scripts.Test/TestBase.cs b/tests/Install-Scripts.Test/TestBase.cs index 7669cc33de..eaa882247c 100644 --- a/tests/Install-Scripts.Test/TestBase.cs +++ b/tests/Install-Scripts.Test/TestBase.cs @@ -7,7 +7,7 @@ namespace Microsoft.DotNet.InstallationScript.Tests { public abstract class TestBase : VerifyBase { - // It's needed to resolve the path to test assest for verification. + // It's needed to resolve the path to test assets for verification. protected TestBase(VerifySettings? settings = null, [CallerFilePath] string sourceFile = "") : base(settings, Path.Combine(Path.GetDirectoryName(sourceFile) ?? "", "Assets", "foo.cs")) { } } From 47a164a6fc4d5dcf0edf619721641b952623dcef Mon Sep 17 00:00:00 2001 From: Philipp Naused <32966607+PhilippNaused@users.noreply.github.com> Date: Fri, 7 Nov 2025 20:16:22 +0100 Subject: [PATCH 2/2] Update src/dotnet-install.ps1 Co-authored-by: Michael Simons --- src/dotnet-install.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dotnet-install.ps1 b/src/dotnet-install.ps1 index 383fcaadef..e62264b16e 100644 --- a/src/dotnet-install.ps1 +++ b/src/dotnet-install.ps1 @@ -160,7 +160,7 @@ function Say-Warning($str) { # Use this function to show a human-readable comment along with an exception. function Say-Error($str) { try { - # Write-Error is quite overly verbose for the purpose of the function, let's write one line with error style settings. + # Write-Error is quite verbose for the purpose of the function, let's write one line with error style settings. $Host.UI.WriteErrorLine("dotnet-install: $str") } catch {