Skip to content

Commit 755501e

Browse files
michaelnoonanmichaelnoonan
committed
Merge pull request #99 from OctopusDeploy/bug-pkgscriptvars
Scripts from Packages should behave the same as Inline scripts
2 parents 6842074 + 4197853 commit 755501e

File tree

69 files changed

+144
-151
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+144
-151
lines changed

‎source/Calamari.Azure.Tests/Conventions/ChooseAzureCloudServiceConfigurationFileConventionFixture.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using Calamari.Tests.Helpers;
77
using NSubstitute;
88
using NUnit.Framework;
9-
using Octostache;
109

1110
namespace Calamari.Azure.Tests.Conventions
1211
{

‎source/Calamari.Azure.Tests/Conventions/ConfigureAzureCloudServiceConventionFixture.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
using Microsoft.WindowsAzure.Management.Compute.Models;
1414
using NSubstitute;
1515
using NUnit.Framework;
16-
using Octostache;
1716

1817
namespace Calamari.Azure.Tests.Conventions
1918
{

‎source/Calamari.Azure.Tests/Conventions/UploadAzureCloudServicePackageConventionFixture.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
using Microsoft.WindowsAzure;
1111
using NSubstitute;
1212
using NUnit.Framework;
13-
using Octostache;
1413

1514
namespace Calamari.Azure.Tests.Conventions
1615
{

‎source/Calamari.Azure.Tests/PowerShell/AzurePowerShellContextFixture.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using Calamari.Integration.Scripting;
77
using NSubstitute;
88
using NUnit.Framework;
9-
using Octostache;
109

1110
namespace Calamari.Azure.Tests.PowerShell
1211
{

‎source/Calamari.Azure/Commands/DeployAzureCloudServiceCommand.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,17 @@
55
using Calamari.Commands.Support;
66
using Calamari.Deployment;
77
using Calamari.Deployment.Conventions;
8-
using Calamari.Integration.JsonVariables;
98
using Calamari.Integration.Certificates;
109
using Calamari.Integration.ConfigurationTransforms;
1110
using Calamari.Integration.ConfigurationVariables;
1211
using Calamari.Integration.EmbeddedResources;
1312
using Calamari.Integration.FileSystem;
13+
using Calamari.Integration.JsonVariables;
1414
using Calamari.Integration.Packages;
1515
using Calamari.Integration.Processes;
1616
using Calamari.Integration.Scripting;
1717
using Calamari.Integration.ServiceMessages;
1818
using Calamari.Integration.Substitutions;
19-
using Octostache;
2019

2120
namespace Calamari.Azure.Commands
2221
{

‎source/Calamari.Azure/Commands/DeployAzureWebCommand.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@
44
using Calamari.Commands.Support;
55
using Calamari.Deployment;
66
using Calamari.Deployment.Conventions;
7-
using Calamari.Integration.JsonVariables;
87
using Calamari.Integration.ConfigurationTransforms;
98
using Calamari.Integration.ConfigurationVariables;
109
using Calamari.Integration.FileSystem;
10+
using Calamari.Integration.JsonVariables;
1111
using Calamari.Integration.Packages;
1212
using Calamari.Integration.Processes;
1313
using Calamari.Integration.Scripting;
1414
using Calamari.Integration.ServiceMessages;
1515
using Calamari.Integration.Substitutions;
16-
using Octostache;
1716

1817
namespace Calamari.Azure.Commands
1918
{

‎source/Calamari.Azure/Commands/ExtractAzureCloudServicePackageCommand.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using Calamari.Deployment.Conventions;
77
using Calamari.Integration.FileSystem;
88
using Calamari.Integration.Processes;
9-
using Octostache;
109

1110
namespace Calamari.Azure.Commands
1211
{

‎source/Calamari.Azure/Deployment/Conventions/AzureWebAppConvention.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System;
2-
using Calamari.Azure.Integration.Websites.Publishing;
32
using System.Diagnostics;
3+
using Calamari.Azure.Integration.Websites.Publishing;
44
using Calamari.Commands.Support;
55
using Calamari.Deployment;
66
using Calamari.Deployment.Conventions;

‎source/Calamari.Azure/Deployment/Conventions/SwapAzureDeploymentConvention.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.IO;
4-
using System.Linq;
5-
using System.Text;
1+
using System.IO;
62
using Calamari.Commands.Support;
73
using Calamari.Deployment;
84
using Calamari.Deployment.Conventions;

‎source/Calamari.Azure/Integration/Websites/Publishing/ResourceManagerPublishProfileProvider.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Linq;
33
using System.Net.Http;
4-
using System.Text.RegularExpressions;
54
using System.Threading;
65
using System.Threading.Tasks;
76
using Calamari.Azure.Integration.Security;

0 commit comments

Comments
 (0)