Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Signing/SignScripts.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</ItemGroup>

<Target Name="CopyBeforeSign" BeforeTargets="SignFiles">
<!-- MicroBuild signing overwrites original file. As we have detached signature for Bash script, we will create a copy that will be rewriten. -->
<!-- MicroBuild signing overwrites original file. As we have detached signature for Bash script, we will create a copy that will be rewritten. -->
<Copy SourceFiles="$(OutDir)\dotnet-install.sh" DestinationFiles="$(OutDir)\dotnet-install.sig"/>
</Target>

Expand Down
6 changes: 3 additions & 3 deletions src/dotnet-install.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 verbose for the purpose of the function, let's write one line with error style settings.
$Host.UI.WriteErrorLine("dotnet-install: $str")
}
catch {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand All @@ -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:");
Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -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:");
Expand All @@ -311,15 +311,15 @@ 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:");
commandResult.Should().HaveStdOutMatching(@"URL\s#0\s-\s(legacy|primary|aka\.ms):\shttps://");

// -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))
Expand Down
2 changes: 1 addition & 1 deletion tests/Install-Scripts.Test/TestBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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")) { }
}
Expand Down