Skip to content

Commit

Permalink
Merge pull request #99 from OctopusDeploy/bug-pkgscriptvars
Browse files Browse the repository at this point in the history 
Scripts from Packages should behave the same as Inline scripts
  • Loading branch information
@michaelnoonan
michaelnoonan committed Mar 29, 2016
2 parents 6842074 + 4197853 commit 755501e
Show file tree
Hide file tree
Showing 69 changed files with 144 additions and 151 deletions.
1 change: 0 additions & 1 deletion ...mari.Azure.Tests/Conventions/ChooseAzureCloudServiceConfigurationFileConventionFixture.cs
View file
Expand Up @@ -6,7 +6,6 @@
using Calamari.Tests.Helpers;
using NSubstitute;
using NUnit.Framework;
using Octostache;

namespace Calamari.Azure.Tests.Conventions
{
Expand Down
1 change: 0 additions & 1 deletion source/Calamari.Azure.Tests/Conventions/ConfigureAzureCloudServiceConventionFixture.cs
View file
Expand Up @@ -13,7 +13,6 @@
using Microsoft.WindowsAzure.Management.Compute.Models;
using NSubstitute;
using NUnit.Framework;
using Octostache;

namespace Calamari.Azure.Tests.Conventions
{
Expand Down
1 change: 0 additions & 1 deletion source/Calamari.Azure.Tests/Conventions/UploadAzureCloudServicePackageConventionFixture.cs
View file
Expand Up @@ -10,7 +10,6 @@
using Microsoft.WindowsAzure;
using NSubstitute;
using NUnit.Framework;
using Octostache;

namespace Calamari.Azure.Tests.Conventions
{
Expand Down
1 change: 0 additions & 1 deletion source/Calamari.Azure.Tests/PowerShell/AzurePowerShellContextFixture.cs
View file
Expand Up @@ -6,7 +6,6 @@
using Calamari.Integration.Scripting;
using NSubstitute;
using NUnit.Framework;
using Octostache;

namespace Calamari.Azure.Tests.PowerShell
{
Expand Down
3 changes: 1 addition & 2 deletions source/Calamari.Azure/Commands/DeployAzureCloudServiceCommand.cs
View file
Expand Up @@ -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
{
Expand Down
3 changes: 1 addition & 2 deletions source/Calamari.Azure/Commands/DeployAzureWebCommand.cs
View file
Expand Up @@ -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
{
Expand Down
1 change: 0 additions & 1 deletion source/Calamari.Azure/Commands/ExtractAzureCloudServicePackageCommand.cs
View file
Expand Up @@ -6,7 +6,6 @@
using Calamari.Deployment.Conventions;
using Calamari.Integration.FileSystem;
using Calamari.Integration.Processes;
using Octostache;

namespace Calamari.Azure.Commands
{
Expand Down
2 changes: 1 addition & 1 deletion source/Calamari.Azure/Deployment/Conventions/AzureWebAppConvention.cs
View file
@@ -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;
Expand Down
6 changes: 1 addition & 5 deletions source/Calamari.Azure/Deployment/Conventions/SwapAzureDeploymentConvention.cs
View file
@@ -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;
Expand Down
1 change: 0 additions & 1 deletion ...e/Calamari.Azure/Integration/Websites/Publishing/ResourceManagerPublishProfileProvider.cs
View file
@@ -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;
Expand Down
3 changes: 3 additions & 0 deletions source/Calamari.Tests/Calamari.Tests.csproj
View file
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion source/Calamari.Tests/Fixtures/ApplyDelta/ApplyDeltaFixture.cs
View file
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.IO;
using Calamari.Integration.FileSystem;
using Calamari.Integration.ServiceMessages;
Expand Down
3 changes: 0 additions & 3 deletions source/Calamari.Tests/Fixtures/Bash/BashFixture.cs
View file
@@ -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;
Expand Down
2 changes: 0 additions & 2 deletions source/Calamari.Tests/Fixtures/Conventions/AlreadyInstalledConventionFixture.cs
View file
Expand Up @@ -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
{
Expand Down
2 changes: 0 additions & 2 deletions source/Calamari.Tests/Fixtures/Conventions/ConfigurationVariablesConventionFixture.cs
View file
Expand Up @@ -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
{
Expand Down
2 changes: 0 additions & 2 deletions ...ce/Calamari.Tests/Fixtures/Conventions/ContributePreviousInstallationConventionFixture.cs
View file
Expand Up @@ -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
{
Expand Down
2 changes: 0 additions & 2 deletions ...i.Tests/Fixtures/Conventions/CopyPackageToCustomInstallationDirectoryConventionFixture.cs
View file
Expand Up @@ -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
{
Expand Down
1 change: 0 additions & 1 deletion ...amari.Tests/Fixtures/Conventions/ExtractPackageToApplicationDirectoryConventionFixture.cs
View file
Expand Up @@ -7,7 +7,6 @@
using Calamari.Tests.Helpers;
using NSubstitute;
using NUnit.Framework;
using Octostache;

namespace Calamari.Tests.Fixtures.Conventions
{
Expand Down
2 changes: 0 additions & 2 deletions source/Calamari.Tests/Fixtures/Conventions/FeatureScriptConventionFixture.cs
View file
Expand Up @@ -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
{
Expand Down
4 changes: 1 addition & 3 deletions source/Calamari.Tests/Fixtures/Conventions/JsonConfigurationVariablesConventionFixture.cs
View file
@@ -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;
Expand Down
1 change: 0 additions & 1 deletion source/Calamari.Tests/Fixtures/Conventions/LegacyIisWebSiteConventionFixture.cs
View file
Expand Up @@ -6,7 +6,6 @@
using Calamari.Integration.Processes;
using NSubstitute;
using NUnit.Framework;
using Octostache;

namespace Calamari.Tests.Fixtures.Conventions
{
Expand Down
1 change: 0 additions & 1 deletion source/Calamari.Tests/Fixtures/Conventions/PackagedScriptConventionFixture.cs
View file
Expand Up @@ -6,7 +6,6 @@
using Calamari.Tests.Helpers;
using NSubstitute;
using NUnit.Framework;
using Octostache;

namespace Calamari.Tests.Fixtures.Conventions
{
Expand Down
2 changes: 0 additions & 2 deletions source/Calamari.Tests/Fixtures/Conventions/RunningDeploymentFixture.cs
View file
@@ -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
{
Expand Down
4 changes: 1 addition & 3 deletions source/Calamari.Tests/Fixtures/Conventions/SubstituteInFilesConventionFixture.cs
View file
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion source/Calamari.Tests/Fixtures/Deployment/DeployPackageFixture.cs
View file
Expand Up @@ -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;
Expand Down
4 changes: 0 additions & 4 deletions source/Calamari.Tests/Fixtures/Deployment/Packages/PackageBuilder.cs
View file
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions source/Calamari.Tests/Fixtures/Integration/FileSystem/PackageStoreFixture.cs
View file
Expand Up @@ -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
{
Expand Down
4 changes: 2 additions & 2 deletions source/Calamari.Tests/Fixtures/Integration/FileSystem/WindowsPhysicalFileSystemFixture.cs
View file
@@ -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
{
Expand Down
2 changes: 0 additions & 2 deletions source/Calamari.Tests/Fixtures/Integration/Packages/PackageExtractorFixture.cs
View file
@@ -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;
Expand Down
2 changes: 0 additions & 2 deletions source/Calamari.Tests/Fixtures/Integration/Process/CalamariVariableDictionaryFixture.cs
View file
@@ -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;
Expand Down
3 changes: 1 addition & 2 deletions source/Calamari.Tests/Fixtures/JsonVariables/JsonConfigurationVariableReplacerFixture.cs
View file
@@ -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;

Expand Down
3 changes: 0 additions & 3 deletions source/Calamari.Tests/Fixtures/PackageDownload/PackageDownloadFixture.cs
View file
@@ -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;
Expand Down
Binary file added source/Calamari.Tests/Fixtures/PowerShell/Packages/PackagedScript.1.0.0.zip
View file
Binary file not shown.

0 comments on commit 755501e

Please sign in to comment.