Merge pull request #99 from OctopusDeploy/bug-pkgscriptvars

Scripts from Packages should behave the same as Inline scripts
OctopusDeploy · Mar 29, 2016 · 755501e · 755501e
2 parents 6842074 + 4197853
commit 755501e
Show file tree

Hide file tree

Showing 69 changed files with 144 additions and 151 deletions.
diff --git a/...mari.Azure.Tests/Conventions/ChooseAzureCloudServiceConfigurationFileConventionFixture.cs b/...mari.Azure.Tests/Conventions/ChooseAzureCloudServiceConfigurationFileConventionFixture.cs
@@ -6,7 +6,6 @@
 using Calamari.Tests.Helpers;
 using NSubstitute;
 using NUnit.Framework;
-using Octostache;
 
 namespace Calamari.Azure.Tests.Conventions
 {

diff --git a/source/Calamari.Azure.Tests/Conventions/ConfigureAzureCloudServiceConventionFixture.cs b/source/Calamari.Azure.Tests/Conventions/ConfigureAzureCloudServiceConventionFixture.cs
@@ -13,7 +13,6 @@
 using Microsoft.WindowsAzure.Management.Compute.Models;
 using NSubstitute;
 using NUnit.Framework;
-using Octostache;
 
 namespace Calamari.Azure.Tests.Conventions
 {

diff --git a/source/Calamari.Azure.Tests/Conventions/UploadAzureCloudServicePackageConventionFixture.cs b/source/Calamari.Azure.Tests/Conventions/UploadAzureCloudServicePackageConventionFixture.cs
@@ -10,7 +10,6 @@
 using Microsoft.WindowsAzure;
 using NSubstitute;
 using NUnit.Framework;
-using Octostache;
 
 namespace Calamari.Azure.Tests.Conventions
 {

diff --git a/source/Calamari.Azure.Tests/PowerShell/AzurePowerShellContextFixture.cs b/source/Calamari.Azure.Tests/PowerShell/AzurePowerShellContextFixture.cs
@@ -6,7 +6,6 @@
 using Calamari.Integration.Scripting;
 using NSubstitute;
 using NUnit.Framework;
-using Octostache;
 
 namespace Calamari.Azure.Tests.PowerShell
 {

diff --git a/source/Calamari.Azure/Commands/DeployAzureCloudServiceCommand.cs b/source/Calamari.Azure/Commands/DeployAzureCloudServiceCommand.cs
@@ -5,18 +5,17 @@
 using Calamari.Commands.Support;
 using Calamari.Deployment;
 using Calamari.Deployment.Conventions;
-using Calamari.Integration.JsonVariables;
 using Calamari.Integration.Certificates;
 using Calamari.Integration.ConfigurationTransforms;
 using Calamari.Integration.ConfigurationVariables;
 using Calamari.Integration.EmbeddedResources;
 using Calamari.Integration.FileSystem;
+using Calamari.Integration.JsonVariables;
 using Calamari.Integration.Packages;
 using Calamari.Integration.Processes;
 using Calamari.Integration.Scripting;
 using Calamari.Integration.ServiceMessages;
 using Calamari.Integration.Substitutions;
-using Octostache;
 
 namespace Calamari.Azure.Commands
 {

diff --git a/source/Calamari.Azure/Commands/DeployAzureWebCommand.cs b/source/Calamari.Azure/Commands/DeployAzureWebCommand.cs
@@ -4,16 +4,15 @@
 using Calamari.Commands.Support;
 using Calamari.Deployment;
 using Calamari.Deployment.Conventions;
-using Calamari.Integration.JsonVariables;
 using Calamari.Integration.ConfigurationTransforms;
 using Calamari.Integration.ConfigurationVariables;
 using Calamari.Integration.FileSystem;
+using Calamari.Integration.JsonVariables;
 using Calamari.Integration.Packages;
 using Calamari.Integration.Processes;
 using Calamari.Integration.Scripting;
 using Calamari.Integration.ServiceMessages;
 using Calamari.Integration.Substitutions;
-using Octostache;
 
 namespace Calamari.Azure.Commands
 {

diff --git a/source/Calamari.Azure/Commands/ExtractAzureCloudServicePackageCommand.cs b/source/Calamari.Azure/Commands/ExtractAzureCloudServicePackageCommand.cs
@@ -6,7 +6,6 @@
 using Calamari.Deployment.Conventions;
 using Calamari.Integration.FileSystem;
 using Calamari.Integration.Processes;
-using Octostache;
 
 namespace Calamari.Azure.Commands
 {

diff --git a/source/Calamari.Azure/Deployment/Conventions/AzureWebAppConvention.cs b/source/Calamari.Azure/Deployment/Conventions/AzureWebAppConvention.cs
@@ -1,6 +1,6 @@
 using System;
-using Calamari.Azure.Integration.Websites.Publishing;
 using System.Diagnostics;
+using Calamari.Azure.Integration.Websites.Publishing;
 using Calamari.Commands.Support;
 using Calamari.Deployment;
 using Calamari.Deployment.Conventions;

diff --git a/source/Calamari.Azure/Deployment/Conventions/SwapAzureDeploymentConvention.cs b/source/Calamari.Azure/Deployment/Conventions/SwapAzureDeploymentConvention.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
+using System.IO;
 using Calamari.Commands.Support;
 using Calamari.Deployment;
 using Calamari.Deployment.Conventions;

diff --git a/...e/Calamari.Azure/Integration/Websites/Publishing/ResourceManagerPublishProfileProvider.cs b/...e/Calamari.Azure/Integration/Websites/Publishing/ResourceManagerPublishProfileProvider.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using System.Net.Http;
-using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using Calamari.Azure.Integration.Security;

diff --git a/source/Calamari.Tests/Calamari.Tests.csproj b/source/Calamari.Tests/Calamari.Tests.csproj
@@ -379,6 +379,9 @@
     <None Include="Fixtures\Integration\Packages\Samples\Acme.Core.1.0.0.0-bugfix.zip">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="Fixtures\PowerShell\Packages\PackagedScript.1.0.0.zip">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Fixtures\PowerShell\Scripts\CanCreateArtifact.ps1">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

diff --git a/source/Calamari.Tests/Fixtures/ApplyDelta/ApplyDeltaFixture.cs b/source/Calamari.Tests/Fixtures/ApplyDelta/ApplyDeltaFixture.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using Calamari.Integration.FileSystem;
 using Calamari.Integration.ServiceMessages;

diff --git a/source/Calamari.Tests/Fixtures/Bash/BashFixture.cs b/source/Calamari.Tests/Fixtures/Bash/BashFixture.cs
@@ -1,8 +1,5 @@
 using System.IO;
 using Calamari.Integration.FileSystem;
-using Calamari.Integration.Processes;
-using Calamari.Integration.Scripting.Bash;
-using Calamari.Integration.ServiceMessages;
 using Calamari.Tests.Helpers;
 using NUnit.Framework;
 using Octostache;

diff --git a/source/Calamari.Tests/Fixtures/Conventions/AlreadyInstalledConventionFixture.cs b/source/Calamari.Tests/Fixtures/Conventions/AlreadyInstalledConventionFixture.cs
@@ -3,10 +3,8 @@
 using Calamari.Deployment.Conventions;
 using Calamari.Deployment.Journal;
 using Calamari.Integration.Processes;
-using Calamari.Tests.Helpers;
 using NSubstitute;
 using NUnit.Framework;
-using Octostache;
 
 namespace Calamari.Tests.Fixtures.Conventions
 {

diff --git a/source/Calamari.Tests/Fixtures/Conventions/ConfigurationVariablesConventionFixture.cs b/source/Calamari.Tests/Fixtures/Conventions/ConfigurationVariablesConventionFixture.cs
@@ -3,10 +3,8 @@
 using Calamari.Integration.ConfigurationVariables;
 using Calamari.Integration.FileSystem;
 using Calamari.Integration.Processes;
-using Calamari.Tests.Helpers;
 using NSubstitute;
 using NUnit.Framework;
-using Octostache;
 
 namespace Calamari.Tests.Fixtures.Conventions
 {

diff --git a/...ce/Calamari.Tests/Fixtures/Conventions/ContributePreviousInstallationConventionFixture.cs b/...ce/Calamari.Tests/Fixtures/Conventions/ContributePreviousInstallationConventionFixture.cs
@@ -3,10 +3,8 @@
 using Calamari.Deployment.Conventions;
 using Calamari.Deployment.Journal;
 using Calamari.Integration.Processes;
-using Calamari.Tests.Helpers;
 using NSubstitute;
 using NUnit.Framework;
-using Octostache;
 
 namespace Calamari.Tests.Fixtures.Conventions
 {

diff --git a/...i.Tests/Fixtures/Conventions/CopyPackageToCustomInstallationDirectoryConventionFixture.cs b/...i.Tests/Fixtures/Conventions/CopyPackageToCustomInstallationDirectoryConventionFixture.cs
@@ -2,10 +2,8 @@
 using Calamari.Deployment.Conventions;
 using Calamari.Integration.FileSystem;
 using Calamari.Integration.Processes;
-using Calamari.Tests.Helpers;
 using NSubstitute;
 using NUnit.Framework;
-using Octostache;
 
 namespace Calamari.Tests.Fixtures.Conventions
 {

diff --git a/...amari.Tests/Fixtures/Conventions/ExtractPackageToApplicationDirectoryConventionFixture.cs b/...amari.Tests/Fixtures/Conventions/ExtractPackageToApplicationDirectoryConventionFixture.cs
@@ -7,7 +7,6 @@
 using Calamari.Tests.Helpers;
 using NSubstitute;
 using NUnit.Framework;
-using Octostache;
 
 namespace Calamari.Tests.Fixtures.Conventions
 {

diff --git a/source/Calamari.Tests/Fixtures/Conventions/FeatureScriptConventionFixture.cs b/source/Calamari.Tests/Fixtures/Conventions/FeatureScriptConventionFixture.cs
@@ -6,10 +6,8 @@
 using Calamari.Integration.FileSystem;
 using Calamari.Integration.Processes;
 using Calamari.Integration.Scripting;
-using Calamari.Tests.Helpers;
 using NSubstitute;
 using NUnit.Framework;
-using Octostache;
 
 namespace Calamari.Tests.Fixtures.Conventions
 {

diff --git a/source/Calamari.Tests/Fixtures/Conventions/JsonConfigurationVariablesConventionFixture.cs b/source/Calamari.Tests/Fixtures/Conventions/JsonConfigurationVariablesConventionFixture.cs
@@ -1,11 +1,9 @@
 using System;
-using System.Configuration;
-using System.IO;
 using System.Linq;
 using Calamari.Deployment;
 using Calamari.Deployment.Conventions;
-using Calamari.Integration.JsonVariables;
 using Calamari.Integration.FileSystem;
+using Calamari.Integration.JsonVariables;
 using Calamari.Integration.Processes;
 using Calamari.Tests.Helpers;
 using NSubstitute;

diff --git a/source/Calamari.Tests/Fixtures/Conventions/LegacyIisWebSiteConventionFixture.cs b/source/Calamari.Tests/Fixtures/Conventions/LegacyIisWebSiteConventionFixture.cs
@@ -6,7 +6,6 @@
 using Calamari.Integration.Processes;
 using NSubstitute;
 using NUnit.Framework;
-using Octostache;
 
 namespace Calamari.Tests.Fixtures.Conventions
 {

diff --git a/source/Calamari.Tests/Fixtures/Conventions/PackagedScriptConventionFixture.cs b/source/Calamari.Tests/Fixtures/Conventions/PackagedScriptConventionFixture.cs
@@ -6,7 +6,6 @@
 using Calamari.Tests.Helpers;
 using NSubstitute;
 using NUnit.Framework;
-using Octostache;
 
 namespace Calamari.Tests.Fixtures.Conventions
 {

diff --git a/source/Calamari.Tests/Fixtures/Conventions/RunningDeploymentFixture.cs b/source/Calamari.Tests/Fixtures/Conventions/RunningDeploymentFixture.cs
@@ -1,8 +1,6 @@
 using Calamari.Deployment;
 using Calamari.Integration.Processes;
-using Calamari.Tests.Helpers;
 using NUnit.Framework;
-using Octostache;
 
 namespace Calamari.Tests.Fixtures.Conventions
 {

diff --git a/source/Calamari.Tests/Fixtures/Conventions/SubstituteInFilesConventionFixture.cs b/source/Calamari.Tests/Fixtures/Conventions/SubstituteInFilesConventionFixture.cs
@@ -1,6 +1,4 @@
-using System;
-using System.IO;
-using System.Linq;
+using System.IO;
 using Calamari.Deployment;
 using Calamari.Deployment.Conventions;
 using Calamari.Integration.FileSystem;

diff --git a/source/Calamari.Tests/Fixtures/Deployment/DeployPackageFixture.cs b/source/Calamari.Tests/Fixtures/Deployment/DeployPackageFixture.cs
@@ -7,8 +7,8 @@
 using Calamari.Deployment;
 using Calamari.Deployment.Conventions;
 using Calamari.Integration.FileSystem;
-using Calamari.Integration.Processes;
 using Calamari.Integration.Iis;
+using Calamari.Integration.Processes;
 using Calamari.Tests.Fixtures.Deployment.Packages;
 using Calamari.Tests.Helpers;
 using NUnit.Framework;

diff --git a/source/Calamari.Tests/Fixtures/Deployment/Packages/PackageBuilder.cs b/source/Calamari.Tests/Fixtures/Deployment/Packages/PackageBuilder.cs
@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using Calamari.Deployment;
 using Calamari.Integration.Processes;
 using Calamari.Tests.Helpers;
 using NUnit.Framework;

diff --git a/source/Calamari.Tests/Fixtures/Integration/FileSystem/PackageStoreFixture.cs b/source/Calamari.Tests/Fixtures/Integration/FileSystem/PackageStoreFixture.cs
@@ -4,9 +4,9 @@
 using Calamari.Integration.FileSystem;
 using Calamari.Integration.Packages;
 using Calamari.Tests.Helpers;
-using Calamari.Tests.Fixtures.Deployment.Packages;
+using NuGet;
 using NUnit.Framework;
-using SemanticVersion = NuGet.SemanticVersion;
+using PackageBuilder = Calamari.Tests.Fixtures.Deployment.Packages.PackageBuilder;
 
 namespace Calamari.Tests.Fixtures.Integration.FileSystem
 {

diff --git a/source/Calamari.Tests/Fixtures/Integration/FileSystem/WindowsPhysicalFileSystemFixture.cs b/source/Calamari.Tests/Fixtures/Integration/FileSystem/WindowsPhysicalFileSystemFixture.cs
@@ -1,6 +1,6 @@
-using NUnit.Framework;
-using Calamari.Integration.FileSystem;
+using Calamari.Integration.FileSystem;
 using Calamari.Tests.Helpers;
+using NUnit.Framework;
 
 namespace Calamari.Tests.Fixtures.Integration.FileSystem
 {

diff --git a/source/Calamari.Tests/Fixtures/Integration/Packages/PackageExtractorFixture.cs b/source/Calamari.Tests/Fixtures/Integration/Packages/PackageExtractorFixture.cs
@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Text;
 using Calamari.Integration.Packages;
 using Calamari.Tests.Helpers;
 using NUnit.Framework;

diff --git a/source/Calamari.Tests/Fixtures/Integration/Process/CalamariVariableDictionaryFixture.cs b/source/Calamari.Tests/Fixtures/Integration/Process/CalamariVariableDictionaryFixture.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Security.Cryptography;
-using System.Text;
 using Calamari.Commands.Support;
 using Calamari.Integration.FileSystem;
 using Calamari.Integration.Processes;

diff --git a/source/Calamari.Tests/Fixtures/JsonVariables/JsonConfigurationVariableReplacerFixture.cs b/source/Calamari.Tests/Fixtures/JsonVariables/JsonConfigurationVariableReplacerFixture.cs
@@ -1,11 +1,10 @@
 using System;
 using System.IO;
-using Calamari.Integration.JsonVariables;
 using Calamari.Integration.FileSystem;
+using Calamari.Integration.JsonVariables;
 using Calamari.Tests.Helpers;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using NSubstitute.Core;
 using NUnit.Framework;
 using Octostache;
 

diff --git a/source/Calamari.Tests/Fixtures/PackageDownload/PackageDownloadFixture.cs b/source/Calamari.Tests/Fixtures/PackageDownload/PackageDownloadFixture.cs
@@ -1,10 +1,7 @@
 using System;
 using System.Globalization;
 using System.IO;
-using System.Runtime.CompilerServices;
-using System.Security.Policy;
 using Calamari.Integration.FileSystem;
-using Calamari.Integration.Processes;
 using Calamari.Tests.Fixtures.Deployment.Packages;
 using Calamari.Tests.Helpers;
 using NUnit.Framework;

diff --git a/source/Calamari.Tests/Fixtures/PowerShell/Packages/PackagedScript.1.0.0.zip b/source/Calamari.Tests/Fixtures/PowerShell/Packages/PackagedScript.1.0.0.zip