Skip to content
Closed
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
4 changes: 2 additions & 2 deletions build/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ partial class Build : NukeBuild

[Parameter] readonly bool SignBinaries;

// When building locally signing isn't really necessary and it could take
// When building locally signing isn't really necessary, and it could take
// up to 3-4 minutes to sign all the binaries as we build for many, many
// different runtimes so disabling it locally means quicker turn around
// when doing local development.
Expand Down Expand Up @@ -438,7 +438,7 @@ void CompressCalamariProject(Project project)
}

Target PublishAzureWebAppNetCoreShim =>
_ => _.DependsOn(Restore)
td => td.DependsOn(Restore)
.Executes(() =>
{
if (!OperatingSystem.IsWindows())
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
using System;
using System.IO;
using System.Security.Cryptography.X509Certificates;
using Calamari.Common.Plumbing.Extensions;
using Calamari.Common.Plumbing.FileSystem;
using Calamari.Common.Plumbing.Variables;
using Calamari.Deployment;
using Calamari.Testing;
using Calamari.Testing.Helpers;
using Calamari.Testing.Requirements;
using Calamari.Tests.Helpers;
using Calamari.Tests.Helpers.Certificates;
using NUnit.Framework;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Security.AccessControl;
using System.Security.Cryptography.X509Certificates;
using System.Security.Principal;
using System.Threading;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System;
using System.IO;
using System.Linq;
using System.Security.AccessControl;
using System.Security.Cryptography.X509Certificates;
using System.Security.Principal;
using Calamari.Common.Plumbing.FileSystem;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using System.Security.Cryptography;
using System.Text;
using Calamari.Common.Features.Processes;
using Calamari.Common.Plumbing;
using Calamari.Common.Plumbing.Extensions;
using Calamari.Common.Plumbing.FileSystem;
using Calamari.Common.Plumbing.Variables;
Expand All @@ -14,7 +13,6 @@
using Calamari.Testing.Helpers;
using Calamari.Tests.Helpers;
using FluentAssertions;
using Newtonsoft.Json;
using NUnit.Framework;

namespace Calamari.Tests.Fixtures.PowerShell
Expand Down Expand Up @@ -234,7 +232,7 @@ public void ShouldWriteServiceMessageForUpdateProgressFromPipeline()
[Test]
public void ShouldWriteServiceMessageForPipedArtifacts()
{
var tempPath = Path.GetTempPath(); // There is no nice platform agnostic way to do this until powershell 7 ships and is on all our test agents (this introduces a new "TEMP" drive)
var tempPath = Path.GetTempPath(); // There is no nice platform-agnostic way to do this until powershell 7 ships and is on all our test agents (this introduces a new "TEMP" drive)
var artifacts = Enumerable.Range(0, 3).Select(i =>
new Artifact(Path.Combine(tempPath, $"CanCreateArtifactPipedTestFile{i}.artifact"))).ToList();
foreach (var artifact in artifacts)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Security.AccessControl;
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
using System.Security.Principal;
using Calamari.Integration.Certificates;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ static IdentityReference GetIdentityForApplicationPoolIdentity(ApplicationPoolId

static string StripLocalAccountIdentifierFromUsername(string username)
{
//The NTAccount class doesnt work with local accounts represented in the format of .\username
//The NTAccount class doesn't work with local accounts represented in the format of .\username
//an exception is thrown when attempting to call NTAccount.Translate().
//The following expression is to remove .\ from the beginning of usernames, we still allow for usernames in the format of machine\user or domain\user
return Regex.Replace(username, "\\.\\\\(.*)", "$1", RegexOptions.None);
Expand Down