diff --git a/build.proj b/build.proj index ae1feb5faba9..4765ebff2a36 100644 --- a/build.proj +++ b/build.proj @@ -45,13 +45,15 @@ all - + Condition=" '$(Scope)' == 'ServiceManagement'"/> + diff --git a/setup/azurecmd.wxs b/setup/azurecmd.wxs index 303600c11759..8fbe4a67f0df 100644 --- a/setup/azurecmd.wxs +++ b/setup/azurecmd.wxs @@ -75,7 +75,7 @@ - + diff --git a/setup/azurecmdfiles.wxi b/setup/azurecmdfiles.wxi index f0055cc5f0a1..5a46d0a8e517 100644 --- a/setup/azurecmdfiles.wxi +++ b/setup/azurecmdfiles.wxi @@ -4,116 +4,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3036,116 +2926,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3249,9 +3029,6 @@ - - - @@ -3315,9 +3092,6 @@ - - - @@ -4779,9 +4553,6 @@ - - - @@ -4966,46 +4737,119 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5958,42 +5802,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6028,7 +5836,6 @@ - @@ -6050,7 +5857,6 @@ - @@ -6512,7 +6318,6 @@ - @@ -6572,6 +6377,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Common/Commands.Common.Storage/WindowsAzureSubscriptionExtensions.cs b/src/Common/Commands.Common.Storage/WindowsAzureSubscriptionExtensions.cs index b4656f889962..b822a73ca05b 100644 --- a/src/Common/Commands.Common.Storage/WindowsAzureSubscriptionExtensions.cs +++ b/src/Common/Commands.Common.Storage/WindowsAzureSubscriptionExtensions.cs @@ -30,8 +30,8 @@ public static class WindowsAzureSubscriptionExtensions /// /// Get storage account details from the current storage account /// - /// The subscription continign the account. - /// The profile continaing the subscription. + /// The subscription containing the account. + /// The profile continuing the subscription. /// Storage account details, usable with the windows azure storage data plane library. public static CloudStorageAccount GetCloudStorageAccount(this AzureSubscription subscription, AzureSMProfile profile) { diff --git a/src/Common/Commands.Common/CmdletExtensions.cs b/src/Common/Commands.Common/CmdletExtensions.cs index c1cb970e42a3..77d48a7528d9 100644 --- a/src/Common/Commands.Common/CmdletExtensions.cs +++ b/src/Common/Commands.Common/CmdletExtensions.cs @@ -12,8 +12,10 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using System; using System.Collections.Generic; using System.Collections.ObjectModel; +using System.IO; using System.Management.Automation; using System.Reflection; @@ -21,6 +23,11 @@ namespace Microsoft.WindowsAzure.Commands.Utilities.Common { public static class CmdletExtensions { + public static string AsAbsoluteLocation(this string realtivePath) + { + return Path.GetFullPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, realtivePath)); + } + public static string TryResolvePath(this PSCmdlet psCmdlet, string path) { try diff --git a/src/Common/Commands.ScenarioTests.Common/EnvironmentSetupHelper.cs b/src/Common/Commands.ScenarioTests.Common/EnvironmentSetupHelper.cs index 7b45c5eeeff5..8b2417b26abf 100644 --- a/src/Common/Commands.ScenarioTests.Common/EnvironmentSetupHelper.cs +++ b/src/Common/Commands.ScenarioTests.Common/EnvironmentSetupHelper.cs @@ -27,6 +27,7 @@ using System.Management.Automation; using System.Security.Cryptography.X509Certificates; using Microsoft.Azure.ServiceManagemenet.Common; +using System.Text; namespace Microsoft.WindowsAzure.Commands.ScenarioTest { @@ -41,7 +42,7 @@ public class EnvironmentSetupHelper private AzureAccount testAccount; private const string PackageDirectoryFromCommon = @"..\..\..\..\Package\Debug"; - private const string PackageDirectory = @"..\..\..\..\..\Package\Debug"; + public const string PackageDirectory = @"..\..\..\..\..\Package\Debug"; protected List modules; @@ -210,11 +211,15 @@ public void SetupModules(AzureModule mode, params string[] modules) this.modules = new List(); if (mode == AzureModule.AzureProfile) { + this.modules.Add(Path.Combine(PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1")); + this.modules.Add(Path.Combine(PackageDirectory, @"Storage\Azure.Storage\Azure.Storage.psd1")); this.modules.Add(Path.Combine(PackageDirectory, @"ServiceManagement\Azure\Azure.psd1")); this.modules.Add(Path.Combine(PackageDirectory, @"ResourceManager\AzureResourceManager\AzureResourceManager.psd1")); } else if (mode == AzureModule.AzureServiceManagement) { + this.modules.Add(Path.Combine(PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1")); + this.modules.Add(Path.Combine(PackageDirectory, @"Storage\Azure.Storage\Azure.Storage.psd1")); this.modules.Add(Path.Combine(PackageDirectory, @"ServiceManagement\Azure\Azure.psd1")); } else if (mode == AzureModule.AzureResourceManager) @@ -235,11 +240,15 @@ public void SetupModulesFromCommon(AzureModule mode, params string[] modules) this.modules = new List(); if (mode == AzureModule.AzureProfile) { + this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1")); + this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"Storage\Azure.Storage\Azure.Storage.psd1")); this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ServiceManagement\Azure\Azure.psd1")); this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureResourceManager.psd1")); } else if (mode == AzureModule.AzureServiceManagement) { + this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1")); + this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"Storage\Azure.Storage\Azure.Storage.psd1")); this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ServiceManagement\Azure\Azure.psd1")); } else if (mode == AzureModule.AzureResourceManager) @@ -263,53 +272,85 @@ public void SetupModules(params string[] modules) this.modules.AddRange(modules); } + public virtual Collection RunPowerShellTest(params string[] scripts) { using (var powershell = System.Management.Automation.PowerShell.Create(RunspaceMode.NewRunspace)) { - SetupPowerShellModules(powershell); + return ExecuteShellTest(powershell, null, scripts); + } + } + public virtual Collection RunPowerShellTest(IEnumerable setupScripts, IEnumerable scripts) + { + using (var powershell = System.Management.Automation.PowerShell.Create(RunspaceMode.NewRunspace)) + { + return ExecuteShellTest(powershell, setupScripts, scripts); + } + } - Collection output = null; - for (int i = 0; i < scripts.Length; ++i) - { - Console.WriteLine(scripts[i]); - powershell.AddScript(scripts[i]); - } - try + private Collection ExecuteShellTest( + System.Management.Automation.PowerShell powershell, + IEnumerable setupScripts, + IEnumerable scripts) + { + SetupPowerShellModules(powershell, null); + + Collection output = null; + + foreach (var script in scripts) + { + Console.WriteLine(script); + powershell.AddScript(script); + } + try + { + powershell.Runspace.Events.Subscribers.Clear(); + powershell.Streams.Error.Clear(); + output = powershell.Invoke(); + + if (powershell.Streams.Error.Count > 0) { - powershell.Runspace.Events.Subscribers.Clear(); - output = powershell.Invoke(); + var sb = new StringBuilder(); - if (powershell.Streams.Error.Count > 0) + sb.AppendLine("Test failed due to a non-empty error stream, check the error stream in the test log for more details."); + sb.AppendLine(string.Format("{0} total Errors", powershell.Streams.Error.Count)); + foreach (var error in powershell.Streams.Error) { - throw new RuntimeException( - "Test failed due to a non-empty error stream, check the error stream in the test log for more details."); + sb.AppendLine(error.Exception.ToString()); } - return output; - } - catch (Exception psException) - { - powershell.LogPowerShellException(psException); - throw; - } - finally - { - powershell.LogPowerShellResults(output); - powershell.Streams.Error.Clear(); + throw new RuntimeException(sb.ToString()); } + + return output; + } + catch (Exception psException) + { + powershell.LogPowerShellException(psException); + throw; + } + finally + { + powershell.LogPowerShellResults(output); + powershell.Streams.Error.Clear(); } } - private void SetupPowerShellModules(System.Management.Automation.PowerShell powershell) + private void SetupPowerShellModules(System.Management.Automation.PowerShell powershell, IEnumerable setupScripts) { powershell.AddScript("$error.clear()"); powershell.AddScript(string.Format("cd \"{0}\"", AppDomain.CurrentDomain.BaseDirectory)); + if (setupScripts != null) + { + foreach(var script in setupScripts) + { + powershell.AddScript(script); + } + } foreach (string moduleName in modules) { - powershell.AddScript(string.Format("Import-Module \"{0}\"", - Path.Combine(AppDomain.CurrentDomain.BaseDirectory, moduleName))); + powershell.AddScript(string.Format("Import-Module \"{0}\"", moduleName.AsAbsoluteLocation())); } powershell.AddScript( diff --git a/src/Common/Storage/Commands.Storage/PostBuild.ps1 b/src/Common/Storage/Commands.Storage/PostBuild.ps1 deleted file mode 100644 index 1e007b7327f0..000000000000 --- a/src/Common/Storage/Commands.Storage/PostBuild.ps1 +++ /dev/null @@ -1,27 +0,0 @@ -# ---------------------------------------------------------------------------------- -# -# Copyright Microsoft Corporation -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ---------------------------------------------------------------------------------- - -Write-Output -InputObject 'Starting post-build script'; - -$destDir = $args[0]; -Write-Output -InputObject $destDir; - -$sourcePath = "." - -if (Test-Path -Path $sourcePath) { - Write-Output -InputObject "Copying '$sourcePath' to directory '$destDir'"; - Copy-Item -Path $sourcePath -Destination $destDir -Recurse -Force; -} - -Write-Output -InputObject 'Finished post-build script'; \ No newline at end of file diff --git a/src/ResourceManager/ApiManagement/ApiManagement.sln b/src/ResourceManager/ApiManagement/ApiManagement.sln index 5551f56475ea..346c6736fc7b 100644 --- a/src/ResourceManager/ApiManagement/ApiManagement.sln +++ b/src/ResourceManager/ApiManagement/ApiManagement.sln @@ -26,7 +26,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Management.Storage EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources.Rest", "..\Resources\Commands.ResourceManager\Cmdlets\Commands.Resources.Rest.csproj", "{8058D403-06E3-4BED-8924-D166CE303961}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage", "..\..\Common\Storage\Commands.Storage\Commands.Storage.csproj", "{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage", "..\..\Storage\Commands.Storage\Commands.Storage.csproj", "{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}" EndProject diff --git a/src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1 b/src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1 index 627b98a81152..e6d8d97586cd 100644 --- a/src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1 +++ b/src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1 @@ -45,7 +45,7 @@ CLRVersion='4.0' ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'}) +RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'}) # Assemblies that must be loaded prior to importing this module RequiredAssemblies = @() diff --git a/src/ResourceManager/Automation/AzureRM.Automation.psd1 b/src/ResourceManager/Automation/AzureRM.Automation.psd1 index f3dab229fc07..e3911c126bf1 100644 --- a/src/ResourceManager/Automation/AzureRM.Automation.psd1 +++ b/src/ResourceManager/Automation/AzureRM.Automation.psd1 @@ -45,7 +45,7 @@ CLRVersion='4.0' ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'}) +RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'}) # Assemblies that must be loaded prior to importing this module RequiredAssemblies = @() diff --git a/src/ResourceManager/AzureBackup/AzureRM.Backup.psd1 b/src/ResourceManager/AzureBackup/AzureRM.Backup.psd1 index d0aa8ca47883..56fd0e5e3098 100644 --- a/src/ResourceManager/AzureBackup/AzureRM.Backup.psd1 +++ b/src/ResourceManager/AzureBackup/AzureRM.Backup.psd1 @@ -45,7 +45,7 @@ CLRVersion='4.0' ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'}) +RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'}) # Assemblies that must be loaded prior to importing this module RequiredAssemblies = @() diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/SessionRecords/Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupVaultTests/AzureBackupVaultScenarioTests.json b/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/SessionRecords/Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupVaultTests/AzureBackupVaultScenarioTests.json index dbc0d19311a6..1a4a13c42846 100644 --- a/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/SessionRecords/Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupVaultTests/AzureBackupVaultScenarioTests.json +++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/SessionRecords/Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupVaultTests/AzureBackupVaultScenarioTests.json @@ -84,9 +84,6 @@ "x-ms-client-request-id": [ "ff97c9dd-5838-4ec9-802a-dc1f5f06a3bf-2015-08-16 19:16:03Z-PS" ], - "x-ms-version": [ - "2013-03-01" - ], "User-Agent": [ "Microsoft.Azure.Management.BackupServices.BackupVaultServicesManagementClient/0.0.0.0" ] @@ -148,9 +145,6 @@ "x-ms-client-request-id": [ "fd70aa7c-a1db-42ed-8295-5cec7663d72d-2015-08-16 19:16:19Z-PS" ], - "x-ms-version": [ - "2013-03-01" - ], "User-Agent": [ "Microsoft.Azure.Management.BackupServices.BackupVaultServicesManagementClient/0.0.0.0" ] @@ -515,9 +509,6 @@ "x-ms-client-request-id": [ "43cf16e7-e7a0-4d56-8eb5-66f9ecee0ff4-2015-08-16 19:16:15Z-PS" ], - "x-ms-version": [ - "2013-03-01" - ], "User-Agent": [ "Microsoft.Azure.Management.BackupServices.BackupVaultServicesManagementClient/0.0.0.0" ] diff --git a/src/ResourceManager/AzureBatch/AzureRM.Batch.psd1 b/src/ResourceManager/AzureBatch/AzureRM.Batch.psd1 index 780c3602278a..ba5640504fe7 100644 --- a/src/ResourceManager/AzureBatch/AzureRM.Batch.psd1 +++ b/src/ResourceManager/AzureBatch/AzureRM.Batch.psd1 @@ -45,7 +45,7 @@ CLRVersion='4.0' ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'}) +RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'}) # Assemblies that must be loaded prior to importing this module RequiredAssemblies = @() diff --git a/src/ResourceManager/AzureStackAdmin/AzureRM.AzureStackAdmin.psd1 b/src/ResourceManager/AzureStackAdmin/AzureRM.AzureStackAdmin.psd1 index 1eeb878e6b4e..0d86501b0e7d 100644 --- a/src/ResourceManager/AzureStackAdmin/AzureRM.AzureStackAdmin.psd1 +++ b/src/ResourceManager/AzureStackAdmin/AzureRM.AzureStackAdmin.psd1 @@ -48,7 +48,7 @@ CLRVersion = '4.0' ProcessorArchitecture = '' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.4'}) +RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.4'}) # Assemblies that must be loaded prior to importing this module # RequiredAssemblies = @() diff --git a/src/ResourceManager/AzureStackStorage/AzureRM.AzureStackStorage.psd1 b/src/ResourceManager/AzureStackStorage/AzureRM.AzureStackStorage.psd1 index 521ee58c2df9..183974514663 100644 --- a/src/ResourceManager/AzureStackStorage/AzureRM.AzureStackStorage.psd1 +++ b/src/ResourceManager/AzureStackStorage/AzureRM.AzureStackStorage.psd1 @@ -45,7 +45,7 @@ CLRVersion='4.0' ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.4'}) +RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.4'}) # Assemblies that must be loaded prior to importing this module RequiredAssemblies = @() diff --git a/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/EnvironmentSetupHelper.cs b/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/EnvironmentSetupHelper.cs index e141f73500ab..a3faf5892531 100644 --- a/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/EnvironmentSetupHelper.cs +++ b/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/EnvironmentSetupHelper.cs @@ -107,7 +107,7 @@ public string RMStorageDataPlaneModule get { return Path.Combine(this.PackageDirectory, - @"ResourceManager\AzureResourceManager\Azure.Storage\Azure.Storage.psd1"); + @"Storage\Azure.Storage\Azure.Storage.psd1"); } } diff --git a/src/ResourceManager/Compute/AzureRM.Compute.psd1 b/src/ResourceManager/Compute/AzureRM.Compute.psd1 index 69385352aeae..c0048fb3eefb 100644 --- a/src/ResourceManager/Compute/AzureRM.Compute.psd1 +++ b/src/ResourceManager/Compute/AzureRM.Compute.psd1 @@ -45,7 +45,7 @@ CLRVersion='4.0' ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'}) +RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'}) # Assemblies that must be loaded prior to importing this module RequiredAssemblies = @() diff --git a/src/ResourceManager/Compute/Compute.sln b/src/ResourceManager/Compute/Compute.sln index 54a0bc59a45d..137b1d5d09d5 100644 --- a/src/ResourceManager/Compute/Compute.sln +++ b/src/ResourceManager/Compute/Compute.sln @@ -32,7 +32,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Co EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources.Rest", "..\Resources\Commands.ResourceManager\Cmdlets\Commands.Resources.Rest.csproj", "{8058D403-06E3-4BED-8924-D166CE303961}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage", "..\..\Common\Storage\Commands.Storage\Commands.Storage.csproj", "{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage", "..\..\Storage\Commands.Storage\Commands.Storage.csproj", "{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement.Common", "..\..\ServiceManagement\Common\Commands.ServiceManagement.Common\Commands.ServiceManagement.Common.csproj", "{CFF09E81-1E31-444E-B4D4-A21E946C29E2}" EndProject diff --git a/src/ResourceManager/DataFactories/AzureRM.DataFactories.psd1 b/src/ResourceManager/DataFactories/AzureRM.DataFactories.psd1 index 070d98bed2c8..b7fb5cac4843 100644 --- a/src/ResourceManager/DataFactories/AzureRM.DataFactories.psd1 +++ b/src/ResourceManager/DataFactories/AzureRM.DataFactories.psd1 @@ -45,7 +45,7 @@ CLRVersion='4.0' ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'}) +RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'}) # Assemblies that must be loaded prior to importing this module RequiredAssemblies = @() diff --git a/src/ResourceManager/DataLakeAnalytics/AzureRM.DataLakeAnalytics.psd1 b/src/ResourceManager/DataLakeAnalytics/AzureRM.DataLakeAnalytics.psd1 index b12229ba7687..c12bcdd525d3 100644 --- a/src/ResourceManager/DataLakeAnalytics/AzureRM.DataLakeAnalytics.psd1 +++ b/src/ResourceManager/DataLakeAnalytics/AzureRM.DataLakeAnalytics.psd1 @@ -45,7 +45,7 @@ CLRVersion='4.0' ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5' }) +RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5' }) # Assemblies that must be loaded prior to importing this module RequiredAssemblies = @() diff --git a/src/ResourceManager/DataLakeStore/AzureRM.DataLakeStore.psd1 b/src/ResourceManager/DataLakeStore/AzureRM.DataLakeStore.psd1 index 3d7f9522bbb7..6114c6c1a1d6 100644 --- a/src/ResourceManager/DataLakeStore/AzureRM.DataLakeStore.psd1 +++ b/src/ResourceManager/DataLakeStore/AzureRM.DataLakeStore.psd1 @@ -45,7 +45,7 @@ CLRVersion='4.0' ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5' }) +RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5' }) # Assemblies that must be loaded prior to importing this module RequiredAssemblies = @() diff --git a/src/ResourceManager/Dns/AzureRM.Dns.psd1 b/src/ResourceManager/Dns/AzureRM.Dns.psd1 index fac1ca7c0eaf..6d91df361049 100644 --- a/src/ResourceManager/Dns/AzureRM.Dns.psd1 +++ b/src/ResourceManager/Dns/AzureRM.Dns.psd1 @@ -45,7 +45,7 @@ CLRVersion='4.0' ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'}) +RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'}) # Assemblies that must be loaded prior to importing this module RequiredAssemblies = @() diff --git a/src/ResourceManager/HDInsight/AzureRM.HDInsight.psd1 b/src/ResourceManager/HDInsight/AzureRM.HDInsight.psd1 index 167b01feda40..c98ff2ff95b4 100644 --- a/src/ResourceManager/HDInsight/AzureRM.HDInsight.psd1 +++ b/src/ResourceManager/HDInsight/AzureRM.HDInsight.psd1 @@ -45,7 +45,7 @@ CLRVersion='4.0' ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'}) +RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'}) # Assemblies that must be loaded prior to importing this module RequiredAssemblies = @() diff --git a/src/ResourceManager/Insights/AzureRM.Insights.psd1 b/src/ResourceManager/Insights/AzureRM.Insights.psd1 index 1cf78d7d5531..85a521d1b431 100644 --- a/src/ResourceManager/Insights/AzureRM.Insights.psd1 +++ b/src/ResourceManager/Insights/AzureRM.Insights.psd1 @@ -45,7 +45,7 @@ CLRVersion='4.0' ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'}) +RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'}) # Assemblies that must be loaded prior to importing this module RequiredAssemblies = @() diff --git a/src/ResourceManager/Intune/AzureRM.Intune.psd1 b/src/ResourceManager/Intune/AzureRM.Intune.psd1 index 23a3270a237b..e186dfa9fa94 100644 --- a/src/ResourceManager/Intune/AzureRM.Intune.psd1 +++ b/src/ResourceManager/Intune/AzureRM.Intune.psd1 @@ -48,7 +48,7 @@ CLRVersion='4.0' # ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'}) +RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'}) # Assemblies that must be loaded prior to importing this module # RequiredAssemblies = @() diff --git a/src/ResourceManager/KeyVault/AzureRM.KeyVault.psd1 b/src/ResourceManager/KeyVault/AzureRM.KeyVault.psd1 index 2dcbfe897ec4..9956d573fdb6 100644 --- a/src/ResourceManager/KeyVault/AzureRM.KeyVault.psd1 +++ b/src/ResourceManager/KeyVault/AzureRM.KeyVault.psd1 @@ -45,7 +45,7 @@ CLRVersion='4.0' ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'}) +RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'}) # Assemblies that must be loaded prior to importing this module RequiredAssemblies = @() diff --git a/src/ResourceManager/LogicApp/AzureRM.LogicApp.psd1 b/src/ResourceManager/LogicApp/AzureRM.LogicApp.psd1 index 76b27b3ed3de..cfcd0e428410 100644 --- a/src/ResourceManager/LogicApp/AzureRM.LogicApp.psd1 +++ b/src/ResourceManager/LogicApp/AzureRM.LogicApp.psd1 @@ -45,7 +45,7 @@ CLRVersion='4.0' ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'} ) +RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'} ) # Assemblies that must be loaded prior to importing this module RequiredAssemblies = @() diff --git a/src/ResourceManager/Network/AzureRM.Network.psd1 b/src/ResourceManager/Network/AzureRM.Network.psd1 index 390bef251567..682e7b720275 100644 --- a/src/ResourceManager/Network/AzureRM.Network.psd1 +++ b/src/ResourceManager/Network/AzureRM.Network.psd1 @@ -45,7 +45,7 @@ CLRVersion='4.0' ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'}) +RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'}) # Assemblies that must be loaded prior to importing this module RequiredAssemblies = @() diff --git a/src/ResourceManager/NotificationHubs/AzureRM.NotificationHubs.psd1 b/src/ResourceManager/NotificationHubs/AzureRM.NotificationHubs.psd1 index a38265b8a6b6..0db8f59423a5 100644 --- a/src/ResourceManager/NotificationHubs/AzureRM.NotificationHubs.psd1 +++ b/src/ResourceManager/NotificationHubs/AzureRM.NotificationHubs.psd1 @@ -45,7 +45,7 @@ CLRVersion='4.0' ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5' }) +RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5' }) # Assemblies that must be loaded prior to importing this module RequiredAssemblies = @() diff --git a/src/ResourceManager/OperationalInsights/AzureRM.OperationalInsights.psd1 b/src/ResourceManager/OperationalInsights/AzureRM.OperationalInsights.psd1 index 792a58c8d045..d5ac77c01624 100644 --- a/src/ResourceManager/OperationalInsights/AzureRM.OperationalInsights.psd1 +++ b/src/ResourceManager/OperationalInsights/AzureRM.OperationalInsights.psd1 @@ -45,7 +45,7 @@ CLRVersion='4.0' ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'}) +RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'}) # Assemblies that must be loaded prior to importing this module RequiredAssemblies = @() diff --git a/src/ResourceManager/RecoveryServices/AzureRM.RecoveryServices.psd1 b/src/ResourceManager/RecoveryServices/AzureRM.RecoveryServices.psd1 index 23d35b87680e..85284fc32e4c 100644 --- a/src/ResourceManager/RecoveryServices/AzureRM.RecoveryServices.psd1 +++ b/src/ResourceManager/RecoveryServices/AzureRM.RecoveryServices.psd1 @@ -45,7 +45,7 @@ CLRVersion='4.0' ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'}) +RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'}) # Assemblies that must be loaded prior to importing this module RequiredAssemblies = @() diff --git a/src/ResourceManager/RedisCache/AzureRM.RedisCache.psd1 b/src/ResourceManager/RedisCache/AzureRM.RedisCache.psd1 index 450f674e511a..e2c7d296d957 100644 --- a/src/ResourceManager/RedisCache/AzureRM.RedisCache.psd1 +++ b/src/ResourceManager/RedisCache/AzureRM.RedisCache.psd1 @@ -45,7 +45,7 @@ CLRVersion='4.0' ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'}) +RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'}) # Assemblies that must be loaded prior to importing this module RequiredAssemblies = @() diff --git a/src/ResourceManager/Resources/AzureRM.Resources.psd1 b/src/ResourceManager/Resources/AzureRM.Resources.psd1 index 94658a700a7b..625a7f6dac6c 100644 --- a/src/ResourceManager/Resources/AzureRM.Resources.psd1 +++ b/src/ResourceManager/Resources/AzureRM.Resources.psd1 @@ -45,7 +45,7 @@ CLRVersion='4.0' ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'}) +RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'}) # Assemblies that must be loaded prior to importing this module RequiredAssemblies = @() diff --git a/src/ResourceManager/SiteRecovery/AzureRM.SiteRecovery.psd1 b/src/ResourceManager/SiteRecovery/AzureRM.SiteRecovery.psd1 index 76e4a664eca0..392e7f06546f 100644 --- a/src/ResourceManager/SiteRecovery/AzureRM.SiteRecovery.psd1 +++ b/src/ResourceManager/SiteRecovery/AzureRM.SiteRecovery.psd1 @@ -45,7 +45,7 @@ CLRVersion='4.0' ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'}) +RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'}) # Assemblies that must be loaded prior to importing this module RequiredAssemblies = @() diff --git a/src/ResourceManager/Sql/AzureRM.Sql.psd1 b/src/ResourceManager/Sql/AzureRM.Sql.psd1 index 098d8ead8bad..1bda1f856ddd 100644 --- a/src/ResourceManager/Sql/AzureRM.Sql.psd1 +++ b/src/ResourceManager/Sql/AzureRM.Sql.psd1 @@ -45,7 +45,7 @@ CLRVersion='4.0' ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'}) +RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'}) # Assemblies that must be loaded prior to importing this module RequiredAssemblies = @() diff --git a/src/ResourceManager/Sql/Sql.sln b/src/ResourceManager/Sql/Sql.sln index 33f312fe6aa6..46c5b285c1fd 100644 --- a/src/ResourceManager/Sql/Sql.sln +++ b/src/ResourceManager/Sql/Sql.sln @@ -24,7 +24,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Tags", "..\Tags\Co EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Management.Storage", "..\Storage\Commands.Management.Storage\Commands.Management.Storage.csproj", "{A50AB133-5C04-4A17-9054-F8343683EC23}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage", "..\..\Common\Storage\Commands.Storage\Commands.Storage.csproj", "{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage", "..\..\Storage\Commands.Storage\Commands.Storage.csproj", "{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}" EndProject diff --git a/src/ResourceManager/Storage/AzureRM.Storage.psd1 b/src/ResourceManager/Storage/AzureRM.Storage.psd1 index 6f61fad43a1b..41934b359bb1 100644 --- a/src/ResourceManager/Storage/AzureRM.Storage.psd1 +++ b/src/ResourceManager/Storage/AzureRM.Storage.psd1 @@ -46,8 +46,8 @@ ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module RequiredModules = @( - @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'}, - @{ ModuleName = 'Azure.Storage'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'} + @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'}, + @{ ModuleName = 'Azure.Storage'; ModuleVersion = '1.0.5'} ) # Assemblies that must be loaded prior to importing this module diff --git a/src/ResourceManager/Storage/Storage.sln b/src/ResourceManager/Storage/Storage.sln index 732453752896..8f0ee6cd5af9 100644 --- a/src/ResourceManager/Storage/Storage.sln +++ b/src/ResourceManager/Storage/Storage.sln @@ -12,7 +12,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Storage", " EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage", "..\..\Common\Storage\Commands.Storage\Commands.Storage.csproj", "{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage", "..\..\Storage\Commands.Storage\Commands.Storage.csproj", "{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement.Common", "..\..\ServiceManagement\Common\Commands.ServiceManagement.Common\Commands.ServiceManagement.Common.csproj", "{CFF09E81-1E31-444E-B4D4-A21E946C29E2}" EndProject diff --git a/src/ResourceManager/StreamAnalytics/AzureRM.StreamAnalytics.psd1 b/src/ResourceManager/StreamAnalytics/AzureRM.StreamAnalytics.psd1 index 696e36e368a3..135abe863098 100644 --- a/src/ResourceManager/StreamAnalytics/AzureRM.StreamAnalytics.psd1 +++ b/src/ResourceManager/StreamAnalytics/AzureRM.StreamAnalytics.psd1 @@ -45,7 +45,7 @@ CLRVersion='4.0' ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'}) +RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'}) # Assemblies that must be loaded prior to importing this module RequiredAssemblies = @() diff --git a/src/ResourceManager/Tags/AzureRM.Tags.psd1 b/src/ResourceManager/Tags/AzureRM.Tags.psd1 index 8323fc16166f..1f7df96b3d16 100644 --- a/src/ResourceManager/Tags/AzureRM.Tags.psd1 +++ b/src/ResourceManager/Tags/AzureRM.Tags.psd1 @@ -45,7 +45,7 @@ CLRVersion='4.0' ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'}) +RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'}) # Assemblies that must be loaded prior to importing this module RequiredAssemblies = @() diff --git a/src/ResourceManager/TrafficManager/AzureRM.TrafficManager.psd1 b/src/ResourceManager/TrafficManager/AzureRM.TrafficManager.psd1 index eb3f06ca5f7e..53c26091e107 100644 --- a/src/ResourceManager/TrafficManager/AzureRM.TrafficManager.psd1 +++ b/src/ResourceManager/TrafficManager/AzureRM.TrafficManager.psd1 @@ -45,7 +45,7 @@ CLRVersion='4.0' ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'}) +RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'}) # Assemblies that must be loaded prior to importing this module RequiredAssemblies = @() diff --git a/src/ResourceManager/UsageAggregates/AzureRM.UsageAggregates.psd1 b/src/ResourceManager/UsageAggregates/AzureRM.UsageAggregates.psd1 index b7a6b32817f4..4a6070c86e06 100644 --- a/src/ResourceManager/UsageAggregates/AzureRM.UsageAggregates.psd1 +++ b/src/ResourceManager/UsageAggregates/AzureRM.UsageAggregates.psd1 @@ -45,7 +45,7 @@ CLRVersion='4.0' ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'}) +RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'}) # Assemblies that must be loaded prior to importing this module RequiredAssemblies = @() diff --git a/src/ResourceManager/Websites/AzureRM.Websites.psd1 b/src/ResourceManager/Websites/AzureRM.Websites.psd1 index 55b553ba9a77..3610a87d13e4 100644 --- a/src/ResourceManager/Websites/AzureRM.Websites.psd1 +++ b/src/ResourceManager/Websites/AzureRM.Websites.psd1 @@ -45,7 +45,7 @@ CLRVersion='4.0' ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'}) +RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'}) # Assemblies that must be loaded prior to importing this module RequiredAssemblies = @() diff --git a/src/ServiceManagement/Common/Commands.ScenarioTest/AutomationTests/AutomationTests.cs b/src/ServiceManagement/Common/Commands.ScenarioTest/AutomationTests/AutomationTests.cs index 33669ca6cbfd..ba38ed3da205 100644 --- a/src/ServiceManagement/Common/Commands.ScenarioTest/AutomationTests/AutomationTests.cs +++ b/src/ServiceManagement/Common/Commands.ScenarioTest/AutomationTests/AutomationTests.cs @@ -96,8 +96,7 @@ protected void RunPowerShellTest(params string[] scripts) SetupManagementClients(); - List modules = Directory.GetFiles("Resources\\Automation", "*.ps1").ToList(); - modules.Add("Common.ps1"); + List modules = Directory.GetFiles("Resources\\Automation".AsAbsoluteLocation(), "*.ps1").ToList(); helper.SetupEnvironment(AzureModule.AzureServiceManagement); helper.SetupModulesFromCommon(AzureModule.AzureServiceManagement, modules.ToArray()); diff --git a/src/ServiceManagement/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj b/src/ServiceManagement/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj index 95047a245a33..be7a7cbe3f4d 100644 --- a/src/ServiceManagement/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj +++ b/src/ServiceManagement/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj @@ -566,18 +566,10 @@ {58a78f29-8c0c-4a5e-893e-3953c0f29c8a} Commands.ServiceManagement.Test - - {492d2af2-950b-4f2e-8079-8794305313fd} - Commands.RemoteApp - {bc420543-c04e-4bf3-96e1-cd81b823bdd7} Commands.Test.Utilities - - {08cf7da7-0392-4a19-b79b-e1ff67cdb81a} - Commands.Storage - {E1CA72BA-8374-45F6-904D-FD34ECDF5B6F} Commands.ServiceManagement diff --git a/src/ServiceManagement/Common/Commands.ScenarioTest/Common/PowerShellTest.cs b/src/ServiceManagement/Common/Commands.ScenarioTest/Common/PowerShellTest.cs index 50226602f880..c684b7ff4336 100644 --- a/src/ServiceManagement/Common/Commands.ScenarioTest/Common/PowerShellTest.cs +++ b/src/ServiceManagement/Common/Commands.ScenarioTest/Common/PowerShellTest.cs @@ -39,6 +39,8 @@ public PowerShellTest(AzureModule commandMode, params string[] modules) this.modules = new List(); if (commandMode == AzureModule.AzureServiceManagement) { + this.modules.Add(FileUtilities.GetContentFilePath(@"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1")); + this.modules.Add(FileUtilities.GetContentFilePath(@"Storage\Azure.Storage\Azure.Storage.psd1")); this.modules.Add(FileUtilities.GetContentFilePath(@"ServiceManagement\Azure\Azure.psd1")); } else if (commandMode == AzureModule.AzureResourceManager) diff --git a/src/ServiceManagement/Common/Commands.ScenarioTest/CredentialTests/CredentialTestHelper.cs b/src/ServiceManagement/Common/Commands.ScenarioTest/CredentialTests/CredentialTestHelper.cs index 8fdca9d93b27..3a1578f6a871 100644 --- a/src/ServiceManagement/Common/Commands.ScenarioTest/CredentialTests/CredentialTestHelper.cs +++ b/src/ServiceManagement/Common/Commands.ScenarioTest/CredentialTests/CredentialTestHelper.cs @@ -42,12 +42,15 @@ public void SetupModules(AzureModule mode, params string[] testModules) switch (mode) { case AzureModule.AzureProfile: - modules.Add(@"ServiceManagement\Azure\Azure.psd1"); modules.Add(@"ResourceManager\AzureResourceManager\AzureResourceManager.psd1"); + modules.Add(@"Storage\Azure.Storage\Azure.Storage.psd1"); + modules.Add(@"ServiceManagement\Azure\Azure.psd1"); break; case AzureModule.AzureServiceManagement: - modules.Add(@"ServiceManagement\Azure\Azure.psd1"); + modules.Add(@"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"); + modules.Add(@"Storage\Azure.Storage\Azure.Storage.psd1"); + modules.Add(@"ServiceManagement\Azure\Azure.psd1"); break; case AzureModule.AzureResourceManager: diff --git a/src/ServiceManagement/Common/Commands.ScenarioTest/DiagnosticsExtension/DiagnosticsExtensionTests.cs b/src/ServiceManagement/Common/Commands.ScenarioTest/DiagnosticsExtension/DiagnosticsExtensionTests.cs index 80e8305051db..9d4c8c689001 100644 --- a/src/ServiceManagement/Common/Commands.ScenarioTest/DiagnosticsExtension/DiagnosticsExtensionTests.cs +++ b/src/ServiceManagement/Common/Commands.ScenarioTest/DiagnosticsExtension/DiagnosticsExtensionTests.cs @@ -19,6 +19,7 @@ using Microsoft.WindowsAzure.Management.Compute; using Microsoft.WindowsAzure.Management.Network; using Microsoft.WindowsAzure.Management.Storage; +using Microsoft.WindowsAzure.Commands.Utilities.Common; using System.Collections.Generic; using Xunit; @@ -54,22 +55,26 @@ protected void RunPowerShellTest(params string[] scripts) var modules = new List { - "Resources\\DiagnosticsExtension\\DiagnosticsExtensionTests.ps1", - "Resources\\ServiceManagement\\Common.ps1", - "Common.ps1", - @"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Azure.psd1", @"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Compute\AzurePreview.psd1", - @"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Compute\PIR.psd1" + @"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Compute\PIR.psd1", + "Resources\\ServiceManagement\\Common.ps1", + "Resources\\DiagnosticsExtension\\DiagnosticsExtensionTests.ps1" }; helper.SetupEnvironment(AzureModule.AzureServiceManagement); - helper.SetupModules(modules.ToArray()); + helper.SetupModules(AzureModule.AzureServiceManagement, modules.ToArray()); + + var scriptEnvPath = new List(); + scriptEnvPath.Add( + string.Format( + "$env:PSModulePath=\"{0};$env:PSModulePath\"", + @"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Compute".AsAbsoluteLocation())); - helper.RunPowerShellTest(scripts); + helper.RunPowerShellTest(scriptEnvPath, scripts); } } - [Fact] + [Fact(Skip = "#115980855")] [Trait(Category.Service, Category.DiagnosticsExtension)] [Trait(Category.AcceptanceType, Category.CheckIn)] [Trait(Category.AcceptanceType, Category.BVT)] @@ -78,7 +83,7 @@ public void TestAzureServiceDiagnosticsExtensionBasic() this.RunPowerShellTest("Test-AzureServiceDiagnosticsExtensionBasic"); } - [Fact] + [Fact(Skip = "#115980855")] [Trait(Category.Service, Category.DiagnosticsExtension)] [Trait(Category.AcceptanceType, Category.CheckIn)] [Trait(Category.AcceptanceType, Category.BVT)] diff --git a/src/ServiceManagement/Common/Commands.ScenarioTest/DscExtension/DscExtensionTests.cs b/src/ServiceManagement/Common/Commands.ScenarioTest/DscExtension/DscExtensionTests.cs index 807f85a8d325..6d83acf58a6e 100644 --- a/src/ServiceManagement/Common/Commands.ScenarioTest/DscExtension/DscExtensionTests.cs +++ b/src/ServiceManagement/Common/Commands.ScenarioTest/DscExtension/DscExtensionTests.cs @@ -16,11 +16,11 @@ using System.IO; using System.Linq; using Microsoft.Azure.Test; -using Microsoft.WindowsAzure.Commands.Storage.Common; using Microsoft.WindowsAzure.Management; using Microsoft.WindowsAzure.Management.Compute; using Microsoft.WindowsAzure.Management.Network; using Microsoft.WindowsAzure.Management.Storage; +using Microsoft.WindowsAzure.Commands.Utilities.Common; using Xunit; using Microsoft.Azure.Commands.Common.Authentication; @@ -30,7 +30,7 @@ public class DscExtensionTests { private EnvironmentSetupHelper helper = new EnvironmentSetupHelper(); - [Fact] + [Fact(Skip = "#115980855")] [Trait(Category.AcceptanceType, Category.CheckIn)] [Trait(Category.AcceptanceType, Category.BVT)] public void TestGetAzureVMDscExtension() @@ -65,15 +65,21 @@ protected void RunPowerShellTest(params string[] scripts) { "Resources\\DscExtension\\DscExtensionTests.ps1", "Resources\\ServiceManagement\\Common.ps1", - @"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Azure.psd1", @"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Compute\AzurePreview.psd1", @"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Compute\PIR.psd1" }; helper.SetupEnvironment(AzureModule.AzureServiceManagement); - helper.SetupModules(modules.ToArray()); + helper.SetupModules(AzureModule.AzureServiceManagement, modules.ToArray()); - helper.RunPowerShellTest(scripts); + + var scriptEnvPath = new List(); + scriptEnvPath.Add( + string.Format( + "$env:PSModulePath=\"{0};$env:PSModulePath\"", + @"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Compute".AsAbsoluteLocation())); + + helper.RunPowerShellTest(scriptEnvPath, scripts); } } } diff --git a/src/ServiceManagement/Common/Commands.ScenarioTest/Scheduler/SchedulerTests.cs b/src/ServiceManagement/Common/Commands.ScenarioTest/Scheduler/SchedulerTests.cs index d87e65142727..d8d4a3a19919 100644 --- a/src/ServiceManagement/Common/Commands.ScenarioTest/Scheduler/SchedulerTests.cs +++ b/src/ServiceManagement/Common/Commands.ScenarioTest/Scheduler/SchedulerTests.cs @@ -51,12 +51,10 @@ protected void RunPowerShellTest(params string[] scripts) SetupManagementClients(); - List modules = Directory.GetFiles(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Resources\\Scheduler"), "*.ps1").ToList(); - modules.Add("Common.ps1"); - modules.Add(@"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Azure.psd1"); + List modules = Directory.GetFiles("Resources\\Scheduler".AsAbsoluteLocation(), "*.ps1").ToList(); helper.SetupEnvironment(AzureModule.AzureServiceManagement); - helper.SetupModules(modules.ToArray()); + helper.SetupModules(AzureModule.AzureServiceManagement, modules.ToArray()); helper.RunPowerShellTest(scripts); } diff --git a/src/ServiceManagement/Common/Commands.ScenarioTest/ServiceManagement/ScenarioTests.cs b/src/ServiceManagement/Common/Commands.ScenarioTest/ServiceManagement/ScenarioTests.cs index 4118c51f2f6d..4be75265411f 100644 --- a/src/ServiceManagement/Common/Commands.ScenarioTest/ServiceManagement/ScenarioTests.cs +++ b/src/ServiceManagement/Common/Commands.ScenarioTest/ServiceManagement/ScenarioTests.cs @@ -18,7 +18,7 @@ namespace Microsoft.WindowsAzure.Commands.ScenarioTest { public partial class ServiceManagementTests { - [Fact] + [Fact(Skip = "#115980855")] [Trait(Category.Service, Category.ServiceManagement)] [Trait(Category.AcceptanceType, Category.CheckIn)] [Trait(Category.AcceptanceType, Category.BVT)] @@ -27,7 +27,7 @@ public void TestGetAzureVM() this.RunPowerShellTest("Test-GetAzureVM"); } - [Fact] + [Fact(Skip = "#115980855")] [Trait(Category.Service, Category.ServiceManagement)] [Trait(Category.AcceptanceType, Category.CheckIn)] [Trait(Category.AcceptanceType, Category.BVT)] @@ -36,7 +36,7 @@ public void TestGetAzureLocation() this.RunPowerShellTest("Test-GetAzureLocation"); } - [Fact] + [Fact(Skip = "#115980855")] [Trait(Category.Service, Category.ServiceManagement)] [Trait(Category.AcceptanceType, Category.CheckIn)] [Trait(Category.AcceptanceType, Category.BVT)] @@ -44,8 +44,8 @@ public void RunServiceManagementCloudExceptionTests() { this.RunPowerShellTest("Run-ServiceManagementCloudExceptionTests"); } - - [Fact] + + [Fact(Skip = "#115980855")] [Trait(Category.Service, Category.ServiceManagement)] [Trait(Category.AcceptanceType, Category.CheckIn)] [Trait(Category.AcceptanceType, Category.BVT)] @@ -54,7 +54,7 @@ public void RunStartAndStopMultipleVirtualMachinesTest() this.RunPowerShellTest("Run-StartAndStopMultipleVirtualMachinesTest"); } - [Fact] + [Fact(Skip = "#115980855")] [Trait(Category.Service, Category.ServiceManagement)] [Trait(Category.AcceptanceType, Category.CheckIn)] [Trait(Category.AcceptanceType, Category.BVT)] @@ -63,7 +63,7 @@ public void RunAutoGeneratedHostedServiceCmdletTests() this.RunPowerShellTest("Run-AutoGeneratedHostedServiceCmdletTests"); } - [Fact] + [Fact(Skip = "#115980855")] [Trait(Category.Service, Category.ServiceManagement)] [Trait(Category.AcceptanceType, Category.CheckIn)] [Trait(Category.AcceptanceType, Category.BVT)] @@ -72,7 +72,7 @@ public void RunAutoGeneratedVirtualMachineCmdletTests() this.RunPowerShellTest("Run-AutoGeneratedVirtualMachineCmdletTests"); } - [Fact] + [Fact(Skip = "#115980855")] [Trait(Category.Service, Category.ServiceManagement)] [Trait(Category.AcceptanceType, Category.CheckIn)] [Trait(Category.AcceptanceType, Category.BVT)] @@ -81,7 +81,7 @@ public void RunNewAzureComputeArgumentListTests() this.RunPowerShellTest("Run-NewAzureComputeArgumentListTests"); } - [Fact] + [Fact(Skip = "#115980855")] [Trait(Category.Service, Category.ServiceManagement)] [Trait(Category.AcceptanceType, Category.CheckIn)] [Trait(Category.AcceptanceType, Category.BVT)] @@ -90,7 +90,7 @@ public void RunNewAzureComputeParameterObjectTests() this.RunPowerShellTest("Run-NewAzureComputeParameterObjectTests"); } - [Fact] + [Fact(Skip = "#115980855")] [Trait(Category.Service, Category.ServiceManagement)] [Trait(Category.AcceptanceType, Category.CheckIn)] [Trait(Category.AcceptanceType, Category.BVT)] @@ -99,7 +99,7 @@ public void RunAzurePlatformVMImageNegativeTest() this.RunPowerShellTest("Run-AzurePlatformVMImageNegativeTest"); } - [Fact] + [Fact(Skip = "#115980855")] [Trait(Category.Service, Category.ServiceManagement)] [Trait(Category.AcceptanceType, Category.CheckIn)] [Trait(Category.AcceptanceType, Category.BVT)] @@ -108,7 +108,7 @@ public void RunAutoGeneratedServiceExtensionCmdletTests() this.RunPowerShellTest("Run-AutoGeneratedServiceExtensionCmdletTests"); } - [Fact] + [Fact(Skip = "#115980855")] [Trait(Category.Service, Category.ServiceManagement)] [Trait(Category.AcceptanceType, Category.CheckIn)] [Trait(Category.AcceptanceType, Category.BVT)] @@ -117,7 +117,7 @@ public void RunServiceExtensionSetCmdletTests() this.RunPowerShellTest("Run-ServiceExtensionSetCmdletTests"); } - [Fact] + [Fact(Skip = "#115980855")] [Trait(Category.Service, Category.ServiceManagement)] [Trait(Category.AcceptanceType, Category.CheckIn)] [Trait(Category.AcceptanceType, Category.BVT)] @@ -126,7 +126,7 @@ public void RunServiceDeploymentExtensionCmdletTests() this.RunPowerShellTest("Run-ServiceDeploymentExtensionCmdletTests"); } - [Fact] + [Fact(Skip = "#115980855")] [Trait(Category.Service, Category.ServiceManagement)] [Trait(Category.AcceptanceType, Category.CheckIn)] [Trait(Category.AcceptanceType, Category.BVT)] diff --git a/src/ServiceManagement/Common/Commands.ScenarioTest/ServiceManagement/ServiceManagementTests.cs b/src/ServiceManagement/Common/Commands.ScenarioTest/ServiceManagement/ServiceManagementTests.cs index 3791840ee312..8a68e38e682c 100644 --- a/src/ServiceManagement/Common/Commands.ScenarioTest/ServiceManagement/ServiceManagementTests.cs +++ b/src/ServiceManagement/Common/Commands.ScenarioTest/ServiceManagement/ServiceManagementTests.cs @@ -18,6 +18,7 @@ using Microsoft.WindowsAzure.Management.Compute; using Microsoft.WindowsAzure.Management.Network; using Microsoft.WindowsAzure.Management.Storage; +using Microsoft.WindowsAzure.Commands.Utilities.Common; using System; using System.Collections.Generic; using System.IO; @@ -52,16 +53,22 @@ protected void RunPowerShellTest(params string[] scripts) SetupManagementClients(); - List modules = Directory.GetFiles(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"Resources\ServiceManagement"), "*.ps1").ToList(); - modules.Add("Common.ps1"); - modules.Add(@"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Azure.psd1"); - modules.Add(@"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Compute\AzurePreview.psd1"); - modules.Add(@"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Compute\PIR.psd1"); + List modules = new List(); + + modules.Add(Path.Combine(EnvironmentSetupHelper.PackageDirectory,@"ServiceManagement\Azure\Compute\AzurePreview.psd1")); + modules.Add(Path.Combine(EnvironmentSetupHelper.PackageDirectory,@"ServiceManagement\Azure\Compute\PIR.psd1")); + modules.AddRange(Directory.GetFiles(@"Resources\ServiceManagement".AsAbsoluteLocation(), "*.ps1").ToList()); helper.SetupEnvironment(AzureModule.AzureServiceManagement); - helper.SetupModules(modules.ToArray()); + helper.SetupModules(AzureModule.AzureServiceManagement, modules.ToArray()); - helper.RunPowerShellTest(scripts); + var scriptEnvPath = new List(); + scriptEnvPath.Add( + string.Format( + "$env:PSModulePath=\"{0};$env:PSModulePath\"", + Path.Combine(EnvironmentSetupHelper.PackageDirectory, @"ServiceManagement\Azure\Compute").AsAbsoluteLocation())); + + helper.RunPowerShellTest(scriptEnvPath.ToArray(), scripts); } } } diff --git a/src/ServiceManagement/Common/Commands.ScenarioTest/TrafficManagerTests/TrafficManagerTests.cs b/src/ServiceManagement/Common/Commands.ScenarioTest/TrafficManagerTests/TrafficManagerTests.cs index b9a72630e9e5..01ab06919c85 100644 --- a/src/ServiceManagement/Common/Commands.ScenarioTest/TrafficManagerTests/TrafficManagerTests.cs +++ b/src/ServiceManagement/Common/Commands.ScenarioTest/TrafficManagerTests/TrafficManagerTests.cs @@ -273,12 +273,10 @@ protected void RunPowerShellTest(params string[] scripts) SetupManagementClients(); - List modules = Directory.GetFiles(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Resources\\TrafficManager"), "*.ps1").ToList(); - modules.Add("Common.ps1"); - modules.Add(@"..\..\..\..\..\Package\Debug\ServiceManagement\Azure\Azure.psd1"); + List modules = Directory.GetFiles("Resources\\TrafficManager".AsAbsoluteLocation(), "*.ps1").ToList(); helper.SetupEnvironment(AzureModule.AzureServiceManagement); - helper.SetupModules(modules.ToArray()); + helper.SetupModules(AzureModule.AzureServiceManagement, modules.ToArray()); helper.RunPowerShellTest(scripts); } diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj index 2c668a30adc3..1a0d14a851d3 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj @@ -618,6 +618,10 @@ {65c3a86a-716d-4e7d-ab67-1db00b3bf72d} Commands.Common.Storage + + {08cf7da7-0392-4a19-b79b-e1ff67cdb81a} + Commands.Storage + {cff09e81-1e31-444e-b4d4-a21e946c29e2} Commands.ServiceManagement.Common @@ -650,10 +654,6 @@ {E1CA72BA-8374-45F6-904D-FD34ECDF5B6F} Commands.ServiceManagement - - {08cf7da7-0392-4a19-b79b-e1ff67cdb81a} - Commands.Storage - {bc420543-c04e-4bf3-96e1-cd81b823bdd7} Commands.Test.Utilities diff --git a/src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/IPForwarding/IPForwardingScenarioTests.cs b/src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/IPForwarding/IPForwardingScenarioTests.cs index f65fd46c8f84..667cb0fdb905 100644 --- a/src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/IPForwarding/IPForwardingScenarioTests.cs +++ b/src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/IPForwarding/IPForwardingScenarioTests.cs @@ -19,6 +19,7 @@ namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.Scenari using Microsoft.WindowsAzure.Commands.ScenarioTest; using Microsoft.WindowsAzure.Management; using Microsoft.WindowsAzure.Management.Network; + using Microsoft.WindowsAzure.Commands.Utilities.Common; using System.Collections.Generic; using System.IO; using System.Linq; @@ -58,9 +59,8 @@ protected void RunPowerShellTest(params string[] scripts) { context.Start(TestUtilities.GetCallingClass(2), TestUtilities.GetCurrentMethodName(2)); - List modules = Directory.GetFiles("ScenarioTests\\IPForwarding", "*.ps1").ToList(); - modules.AddRange(Directory.GetFiles("ScenarioTests", "*.ps1")); - modules.Add("Common.ps1"); + List modules = Directory.GetFiles("ScenarioTests\\IPForwarding".AsAbsoluteLocation(), "*.ps1").ToList(); + modules.AddRange(Directory.GetFiles("ScenarioTests".AsAbsoluteLocation(), "*.ps1")); SetupManagementClients(); diff --git a/src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/MultiVip/MultiVip.cs b/src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/MultiVip/MultiVip.cs index 44970d77cfb3..b717f5718c92 100644 --- a/src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/MultiVip/MultiVip.cs +++ b/src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/MultiVip/MultiVip.cs @@ -22,6 +22,7 @@ namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.Scenari using Microsoft.WindowsAzure.Management.Compute; using Microsoft.WindowsAzure.Management.Network; using Microsoft.WindowsAzure.Management.Storage; + using Microsoft.WindowsAzure.Commands.Utilities.Common; using System; using System.Collections.Generic; using System.IO; @@ -81,9 +82,8 @@ protected void RunPowerShellTest(params string[] scripts) { context.Start(TestUtilities.GetCallingClass(2), TestUtilities.GetCurrentMethodName(2)); - List modules = Directory.GetFiles(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ScenarioTests\\MultiVip"), "*.ps1").ToList(); - modules.AddRange(Directory.GetFiles(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ScenarioTests"), "*.ps1")); - modules.Add("Common.ps1"); + List modules = Directory.GetFiles("ScenarioTests\\MultiVip".AsAbsoluteLocation(), "*.ps1").ToList(); + modules.AddRange(Directory.GetFiles("ScenarioTests".AsAbsoluteLocation(), "*.ps1")); SetupManagementClients(); diff --git a/src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/NetworkSecurityGroup/NSGScenarioTests.cs b/src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/NetworkSecurityGroup/NSGScenarioTests.cs index 0ab3a1539b29..ea4ba15862ea 100644 --- a/src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/NetworkSecurityGroup/NSGScenarioTests.cs +++ b/src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/NetworkSecurityGroup/NSGScenarioTests.cs @@ -133,9 +133,8 @@ protected void RunPowerShellTest(params string[] scripts) { context.Start(TestUtilities.GetCallingClass(2), TestUtilities.GetCurrentMethodName(2)); - List modules = Directory.GetFiles(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ScenarioTests\\NetworkSecurityGroup"), "*.ps1").ToList(); - modules.AddRange(Directory.GetFiles(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ScenarioTests"), "*.ps1")); - modules.Add("Common.ps1"); + List modules = Directory.GetFiles("ScenarioTests\\NetworkSecurityGroup".AsAbsoluteLocation(), "*.ps1").ToList(); + modules.AddRange(Directory.GetFiles("ScenarioTests".AsAbsoluteLocation(), "*.ps1")); SetupManagementClients(); diff --git a/src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/ReservedIPs/ReservedIP.cs b/src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/ReservedIPs/ReservedIP.cs index 1b7aa65a4947..9a9bc41ecbce 100644 --- a/src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/ReservedIPs/ReservedIP.cs +++ b/src/ServiceManagement/Network/Commands.Network.Test/ScenarioTests/ReservedIPs/ReservedIP.cs @@ -23,6 +23,7 @@ namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.Scenari using Microsoft.WindowsAzure.Commands.ScenarioTest; using Microsoft.WindowsAzure.Management; using Microsoft.WindowsAzure.Management.Network; + using Microsoft.WindowsAzure.Commands.Utilities.Common; using System; using System.Collections.Generic; using System.IO; @@ -85,14 +86,13 @@ protected void SetupManagementClients() protected void RunPowerShellTest(params string[] scripts) { - HttpMockServer.RecordsDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "SessionRecords"); + HttpMockServer.RecordsDirectory = "SessionRecords".AsAbsoluteLocation(); using (UndoContext context = UndoContext.Current) { context.Start(TestUtilities.GetCallingClass(2), TestUtilities.GetCurrentMethodName(2)); - List modules = Directory.GetFiles(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ScenarioTests\\ReservedIPs"), "*.ps1").ToList(); - modules.AddRange(Directory.GetFiles(Path.Combine(AppDomain.CurrentDomain.BaseDirectory,"ScenarioTests"), "*.ps1")); - modules.Add("Common.ps1"); + List modules = Directory.GetFiles("ScenarioTests\\ReservedIPs".AsAbsoluteLocation(), "*.ps1").ToList(); + modules.AddRange(Directory.GetFiles("ScenarioTests".AsAbsoluteLocation(), "*.ps1")); SetupManagementClients(); diff --git a/src/ServiceManagement/RemoteApp/Commands.RemoteApp.ScenarioTest/Commands.RemoteAppScenarioTest.csproj b/src/ServiceManagement/RemoteApp/Commands.RemoteApp.ScenarioTest/Commands.RemoteAppScenarioTest.csproj index 9e9c75489d3e..3991a4e02243 100644 --- a/src/ServiceManagement/RemoteApp/Commands.RemoteApp.ScenarioTest/Commands.RemoteAppScenarioTest.csproj +++ b/src/ServiceManagement/RemoteApp/Commands.RemoteApp.ScenarioTest/Commands.RemoteAppScenarioTest.csproj @@ -132,6 +132,10 @@ {d3804b64-c0d3-48f8-82ec-1f632f833c9e} Commands.Common.Authentication + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {c1bda476-a5cc-4394-914d-48b0ec31a710} Commands.ScenarioTests.Common diff --git a/src/ServiceManagement/RemoteApp/Commands.RemoteApp.ScenarioTest/CreateCloudCollection.cs b/src/ServiceManagement/RemoteApp/Commands.RemoteApp.ScenarioTest/CreateCloudCollection.cs index af69e670b300..41b64427b326 100644 --- a/src/ServiceManagement/RemoteApp/Commands.RemoteApp.ScenarioTest/CreateCloudCollection.cs +++ b/src/ServiceManagement/RemoteApp/Commands.RemoteApp.ScenarioTest/CreateCloudCollection.cs @@ -14,6 +14,7 @@ using Microsoft.Azure.Commands.Common.Authentication; +using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.Azure.Test; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -38,7 +39,7 @@ protected Collection RunPowerShellTest(params string[] scripts) Collection result = new Collection(); EnvironmentSetupHelper helper = new EnvironmentSetupHelper(); - modules = Directory.GetFiles(@"..\..\Scripts", "*.ps1").ToList(); + modules = Directory.GetFiles(@"..\..\Scripts".AsAbsoluteLocation(), "*.ps1").ToList(); helper.SetupSomeOfManagementClients(); helper.SetupEnvironment(AzureModule.AzureServiceManagement); helper.SetupModules(AzureModule.AzureServiceManagement, modules.ToArray()); diff --git a/src/ServiceManagement/ServiceManagement.sln b/src/ServiceManagement/ServiceManagement.sln index d5b991f3cb76..2211ee5edcd9 100644 --- a/src/ServiceManagement/ServiceManagement.sln +++ b/src/ServiceManagement/ServiceManagement.sln @@ -17,9 +17,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.SqlDatabase", "Sql EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.SqlDatabase.Test", "Sql\Commands.SqlDatabase.Test\Commands.SqlDatabase.Test.csproj", "{37455286-D8A7-4E0C-8B4D-C517D20C641A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage", "..\Common\Storage\Commands.Storage\Commands.Storage.csproj", "{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage", "..\Storage\Commands.Storage\Commands.Storage.csproj", "{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage.Test", "..\Common\Storage\Commands.Storage.Test\Commands.Storage.Test.csproj", "{D6F470A6-7395-4B8B-9D29-44DF0EC8F624}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage.Test", "..\Storage\Commands.Storage.Test\Commands.Storage.Test.csproj", "{D6F470A6-7395-4B8B-9D29-44DF0EC8F624}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTest", "Common\Commands.ScenarioTest\Commands.ScenarioTest.csproj", "{A3965B66-5A3E-4B8C-9574-28E5958D4828}" ProjectSection(ProjectDependencies) = postProject @@ -43,13 +43,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Utilities", "Servi EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Test.Utilities", "Services\Commands.Test.Utilities\Commands.Test.Utilities.csproj", "{BC420543-C04E-4BF3-96E1-CD81B823BDD7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage.MsTestLib", "..\Common\Storage\Commands.Storage.MsTestLib\Commands.Storage.MsTestLib.csproj", "{CE97967B-7479-43B9-9561-776232AC5D47}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage.MsTestLib", "..\Storage\Commands.Storage.MsTestLib\Commands.Storage.MsTestLib.csproj", "{CE97967B-7479-43B9-9561-776232AC5D47}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage.StorageTestLib", "..\Common\Storage\Commands.Storage.StorageTestLib\Commands.Storage.StorageTestLib.csproj", "{0A513849-2690-4D07-8DE7-0ACE39645D12}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage.StorageTestLib", "..\Storage\Commands.Storage.StorageTestLib\Commands.Storage.StorageTestLib.csproj", "{0A513849-2690-4D07-8DE7-0ACE39645D12}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage.ScenarioTest", "..\Common\Storage\Commands.Storage.ScenarioTest\Commands.Storage.ScenarioTest.csproj", "{4BC0E3D3-6EDD-43AA-8F15-DCFED8ACC93D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage.ScenarioTest", "..\Storage\Commands.Storage.ScenarioTest\Commands.Storage.ScenarioTest.csproj", "{4BC0E3D3-6EDD-43AA-8F15-DCFED8ACC93D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage.MsTest2", "..\Common\Storage\Commands.Storage.MsTest2\Commands.Storage.MsTest2.csproj", "{9D5A40CA-5594-4F5C-8230-7ADF7CC0558E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage.MsTest2", "..\Storage\Commands.Storage.MsTest2\Commands.Storage.MsTest2.csproj", "{9D5A40CA-5594-4F5C-8230-7ADF7CC0558E}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement.PlatformImageRepository", "Compute\Commands.ServiceManagement.PlatformImageRepository\Commands.ServiceManagement.PlatformImageRepository.csproj", "{6478FA8B-3801-4863-8591-87F0855D5C82}" EndProject diff --git a/src/ServiceManagement/Services/Commands.Utilities/Azure.psd1 b/src/ServiceManagement/Services/Commands.Utilities/Azure.psd1 index 3125322d7948..7a5d04bd3956 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Azure.psd1 +++ b/src/ServiceManagement/Services/Commands.Utilities/Azure.psd1 @@ -45,7 +45,7 @@ CLRVersion='4.0' ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @() +RequiredModules = @( @{ ModuleName = 'Azure.Storage'; ModuleVersion = '1.0.5'}) # Assemblies that must be loaded prior to importing this module RequiredAssemblies = @() @@ -57,7 +57,6 @@ ScriptsToProcess = @() TypesToProcess = @( '.\Services\Microsoft.WindowsAzure.Commands.Websites.Types.ps1xml', '.\Sql\Microsoft.WindowsAzure.Commands.SqlDatabase.Types.ps1xml', - '.\Azure.Storage\Microsoft.WindowsAzure.Commands.Storage.Types.ps1xml', '.\StorSimple\Microsoft.WindowsAzure.Commands.StorSimple.Types.ps1xml' ) @@ -67,7 +66,6 @@ FormatsToProcess = @( '.\Services\Microsoft.WindowsAzure.Commands.Websites.format.ps1xml', '.\Services\Microsoft.WindowsAzure.Commands.CloudService.format.ps1xml', '.\Services\Microsoft.WindowsAzure.Commands.ServiceBus.format.ps1xml', - '.\Azure.Storage\Microsoft.WindowsAzure.Commands.Storage.format.ps1xml', '.\Services\Microsoft.WindowsAzure.Commands.Store.format.ps1xml', '.\Services\Microsoft.WindowsAzure.Commands.Scheduler.format.ps1xml', '.\Compute\Microsoft.WindowsAzure.Commands.ServiceManagement.format.ps1xml', @@ -77,19 +75,18 @@ FormatsToProcess = @( ) # Modules to import as nested modules of the module specified in ModuleToProcess -NestedModules = '.\Services\Microsoft.WindowsAzure.Commands.dll', - '.\Automation\Microsoft.Azure.Commands.Automation.dll', - '.\TrafficManager\Microsoft.WindowsAzure.Commands.TrafficManager.dll', - '.\Services\Microsoft.WindowsAzure.Commands.Profile.dll', +NestedModules = '.\Automation\Microsoft.Azure.Commands.Automation.dll', '.\Compute\Microsoft.WindowsAzure.Commands.ServiceManagement.dll', - '.\Sql\Microsoft.WindowsAzure.Commands.SqlDatabase.dll', - '.\Azure.Storage\Microsoft.WindowsAzure.Commands.Storage.dll', - '.\ManagedCache\Microsoft.Azure.Commands.ManagedCache.dll', '.\HDInsight\Microsoft.WindowsAzure.Commands.HDInsight.dll', + '.\ManagedCache\Microsoft.Azure.Commands.ManagedCache.dll', '.\Networking\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.dll', - '.\StorSimple\Microsoft.WindowsAzure.Commands.StorSimple.dll', + '.\RecoveryServices\Microsoft.Azure.Commands.RecoveryServicesRdfe.dll', '.\RemoteApp\Microsoft.WindowsAzure.Commands.RemoteApp.dll', - '.\RecoveryServices\Microsoft.Azure.Commands.RecoveryServicesRdfe.dll' + '.\Services\Microsoft.WindowsAzure.Commands.dll', + '.\Services\Microsoft.WindowsAzure.Commands.Profile.dll', + '.\Sql\Microsoft.WindowsAzure.Commands.SqlDatabase.dll', + '.\StorSimple\Microsoft.WindowsAzure.Commands.StorSimple.dll', + '.\TrafficManager\Microsoft.WindowsAzure.Commands.TrafficManager.dll' # Functions to export from this module FunctionsToExport = '*' diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/TSql/MockSqlCommand.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/TSql/MockSqlCommand.cs index 72f37b9bcbd8..823fa37b6d52 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/TSql/MockSqlCommand.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/TSql/MockSqlCommand.cs @@ -13,6 +13,7 @@ // ---------------------------------------------------------------------------------- using Microsoft.VisualStudio.TestTools.UnitTesting; +using Microsoft.WindowsAzure.Commands.Utilities.Common; using System; using System.Collections.Generic; using System.Data; @@ -601,7 +602,7 @@ orderby GetMatchRank(mr.MockId, mockId, isolatedQuery) descending, mr.DatabaseNa /// private static void InitializeMockResults() { - string path = "./TSqlMockSessions"; + string path = "./TSqlMockSessions".AsAbsoluteLocation(); var files = Directory.GetFiles(path); foreach (var file in files) diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/UnitTestHelper.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/UnitTestHelper.cs index b27cb8edfd06..078124c9a09f 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/UnitTestHelper.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/UnitTestHelper.cs @@ -246,6 +246,8 @@ public static void DumpStreams(this System.Management.Automation.PowerShell powe public static void ImportAzureModule(System.Management.Automation.PowerShell powershell) { // Import the test manifest file + powershell.InvokeBatchScript(@"Import-Module ..\..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"); + powershell.InvokeBatchScript(@"Import-Module ..\..\..\..\Package\Debug\Storage\Azure.Storage\Azure.Storage.psd1"); powershell.InvokeBatchScript(@"Import-Module ..\..\..\..\Package\Debug\ServiceManagement\Azure\Azure.psd1"); Assert.IsTrue(powershell.Streams.Error.Count == 0); } diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase/Commands.SqlDatabase.csproj b/src/ServiceManagement/Sql/Commands.SqlDatabase/Commands.SqlDatabase.csproj index ff23ab7e8950..e6f4fe7ce2a6 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase/Commands.SqlDatabase.csproj +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase/Commands.SqlDatabase.csproj @@ -255,7 +255,7 @@ {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common - + {08cf7da7-0392-4a19-b79b-e1ff67cdb81a} Commands.Storage diff --git a/src/Common/Storage/Azure.Storage.psd1 b/src/Storage/Azure.Storage.psd1 similarity index 96% rename from src/Common/Storage/Azure.Storage.psd1 rename to src/Storage/Azure.Storage.psd1 index 3d12c2785465..b3e8b4575246 100644 --- a/src/Common/Storage/Azure.Storage.psd1 +++ b/src/Storage/Azure.Storage.psd1 @@ -45,7 +45,7 @@ CLRVersion='4.0' ProcessorArchitecture = 'None' # Modules that must be imported into the global environment prior to importing this module -RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'}) +RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'}) # Assemblies that must be loaded prior to importing this module RequiredAssemblies = @() diff --git a/src/Common/Storage/Commands.Storage.MsTest2/Commands.Storage.MsTest2.csproj b/src/Storage/Commands.Storage.MsTest2/Commands.Storage.MsTest2.csproj similarity index 100% rename from src/Common/Storage/Commands.Storage.MsTest2/Commands.Storage.MsTest2.csproj rename to src/Storage/Commands.Storage.MsTest2/Commands.Storage.MsTest2.csproj diff --git a/src/Common/Storage/Commands.Storage.MsTest2/Main.cs b/src/Storage/Commands.Storage.MsTest2/Main.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.MsTest2/Main.cs rename to src/Storage/Commands.Storage.MsTest2/Main.cs diff --git a/src/Common/Storage/Commands.Storage.MsTest2/Properties/AssemblyInfo.cs b/src/Storage/Commands.Storage.MsTest2/Properties/AssemblyInfo.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.MsTest2/Properties/AssemblyInfo.cs rename to src/Storage/Commands.Storage.MsTest2/Properties/AssemblyInfo.cs diff --git a/src/Common/Storage/Commands.Storage.MsTest2/TestClassUnit.cs b/src/Storage/Commands.Storage.MsTest2/TestClassUnit.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.MsTest2/TestClassUnit.cs rename to src/Storage/Commands.Storage.MsTest2/TestClassUnit.cs diff --git a/src/Common/Storage/Commands.Storage.MsTest2/TestContext2.cs b/src/Storage/Commands.Storage.MsTest2/TestContext2.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.MsTest2/TestContext2.cs rename to src/Storage/Commands.Storage.MsTest2/TestContext2.cs diff --git a/src/Common/Storage/Commands.Storage.MsTest2/TestMethodUnit.cs b/src/Storage/Commands.Storage.MsTest2/TestMethodUnit.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.MsTest2/TestMethodUnit.cs rename to src/Storage/Commands.Storage.MsTest2/TestMethodUnit.cs diff --git a/src/Common/Storage/Commands.Storage.MsTestLib/ClassConfig.cs b/src/Storage/Commands.Storage.MsTestLib/ClassConfig.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.MsTestLib/ClassConfig.cs rename to src/Storage/Commands.Storage.MsTestLib/ClassConfig.cs diff --git a/src/Common/Storage/Commands.Storage.MsTestLib/Commands.Storage.MsTestLib.csproj b/src/Storage/Commands.Storage.MsTestLib/Commands.Storage.MsTestLib.csproj similarity index 100% rename from src/Common/Storage/Commands.Storage.MsTestLib/Commands.Storage.MsTestLib.csproj rename to src/Storage/Commands.Storage.MsTestLib/Commands.Storage.MsTestLib.csproj diff --git a/src/Common/Storage/Commands.Storage.MsTestLib/ConsoleLogger.cs b/src/Storage/Commands.Storage.MsTestLib/ConsoleLogger.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.MsTestLib/ConsoleLogger.cs rename to src/Storage/Commands.Storage.MsTestLib/ConsoleLogger.cs diff --git a/src/Common/Storage/Commands.Storage.MsTestLib/Exceptions.cs b/src/Storage/Commands.Storage.MsTestLib/Exceptions.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.MsTestLib/Exceptions.cs rename to src/Storage/Commands.Storage.MsTestLib/Exceptions.cs diff --git a/src/Common/Storage/Commands.Storage.MsTestLib/FileLogger.cs b/src/Storage/Commands.Storage.MsTestLib/FileLogger.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.MsTestLib/FileLogger.cs rename to src/Storage/Commands.Storage.MsTestLib/FileLogger.cs diff --git a/src/Common/Storage/Commands.Storage.MsTestLib/ILogger.cs b/src/Storage/Commands.Storage.MsTestLib/ILogger.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.MsTestLib/ILogger.cs rename to src/Storage/Commands.Storage.MsTestLib/ILogger.cs diff --git a/src/Common/Storage/Commands.Storage.MsTestLib/MSSharedLibKey.snk b/src/Storage/Commands.Storage.MsTestLib/MSSharedLibKey.snk similarity index 100% rename from src/Common/Storage/Commands.Storage.MsTestLib/MSSharedLibKey.snk rename to src/Storage/Commands.Storage.MsTestLib/MSSharedLibKey.snk diff --git a/src/Common/Storage/Commands.Storage.MsTestLib/MessageBuilder.cs b/src/Storage/Commands.Storage.MsTestLib/MessageBuilder.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.MsTestLib/MessageBuilder.cs rename to src/Storage/Commands.Storage.MsTestLib/MessageBuilder.cs diff --git a/src/Common/Storage/Commands.Storage.MsTestLib/MethodConfig.cs b/src/Storage/Commands.Storage.MsTestLib/MethodConfig.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.MsTestLib/MethodConfig.cs rename to src/Storage/Commands.Storage.MsTestLib/MethodConfig.cs diff --git a/src/Common/Storage/Commands.Storage.MsTestLib/Properties/AssemblyInfo.cs b/src/Storage/Commands.Storage.MsTestLib/Properties/AssemblyInfo.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.MsTestLib/Properties/AssemblyInfo.cs rename to src/Storage/Commands.Storage.MsTestLib/Properties/AssemblyInfo.cs diff --git a/src/Common/Storage/Commands.Storage.MsTestLib/Test.cs b/src/Storage/Commands.Storage.MsTestLib/Test.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.MsTestLib/Test.cs rename to src/Storage/Commands.Storage.MsTestLib/Test.cs diff --git a/src/Common/Storage/Commands.Storage.MsTestLib/TestConfig.cs b/src/Storage/Commands.Storage.MsTestLib/TestConfig.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.MsTestLib/TestConfig.cs rename to src/Storage/Commands.Storage.MsTestLib/TestConfig.cs diff --git a/src/Common/Storage/Commands.Storage.MsTestLib/TestHelper.cs b/src/Storage/Commands.Storage.MsTestLib/TestHelper.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.MsTestLib/TestHelper.cs rename to src/Storage/Commands.Storage.MsTestLib/TestHelper.cs diff --git a/src/Common/Storage/Commands.Storage.MsTestLib/TestLogger.cs b/src/Storage/Commands.Storage.MsTestLib/TestLogger.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.MsTestLib/TestLogger.cs rename to src/Storage/Commands.Storage.MsTestLib/TestLogger.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/Agent.cs b/src/Storage/Commands.Storage.ScenarioTest/Agent.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/Agent.cs rename to src/Storage/Commands.Storage.ScenarioTest/Agent.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/AssemblyInitCleanup.cs b/src/Storage/Commands.Storage.ScenarioTest/AssemblyInitCleanup.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/AssemblyInitCleanup.cs rename to src/Storage/Commands.Storage.ScenarioTest/AssemblyInitCleanup.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/BVT/CLICommonBVT.cs b/src/Storage/Commands.Storage.ScenarioTest/BVT/CLICommonBVT.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/BVT/CLICommonBVT.cs rename to src/Storage/Commands.Storage.ScenarioTest/BVT/CLICommonBVT.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/BVT/HTTP/AnonymousBVT.cs b/src/Storage/Commands.Storage.ScenarioTest/BVT/HTTP/AnonymousBVT.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/BVT/HTTP/AnonymousBVT.cs rename to src/Storage/Commands.Storage.ScenarioTest/BVT/HTTP/AnonymousBVT.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/BVT/HTTP/AzureEmulatorBVT.cs b/src/Storage/Commands.Storage.ScenarioTest/BVT/HTTP/AzureEmulatorBVT.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/BVT/HTTP/AzureEmulatorBVT.cs rename to src/Storage/Commands.Storage.ScenarioTest/BVT/HTTP/AzureEmulatorBVT.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/BVT/HTTP/AzureEnvironment.cs b/src/Storage/Commands.Storage.ScenarioTest/BVT/HTTP/AzureEnvironment.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/BVT/HTTP/AzureEnvironment.cs rename to src/Storage/Commands.Storage.ScenarioTest/BVT/HTTP/AzureEnvironment.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/BVT/HTTP/ConnectionStringBVT.cs b/src/Storage/Commands.Storage.ScenarioTest/BVT/HTTP/ConnectionStringBVT.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/BVT/HTTP/ConnectionStringBVT.cs rename to src/Storage/Commands.Storage.ScenarioTest/BVT/HTTP/ConnectionStringBVT.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/BVT/HTTP/EnvConnectionStringBVT.cs b/src/Storage/Commands.Storage.ScenarioTest/BVT/HTTP/EnvConnectionStringBVT.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/BVT/HTTP/EnvConnectionStringBVT.cs rename to src/Storage/Commands.Storage.ScenarioTest/BVT/HTTP/EnvConnectionStringBVT.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/BVT/HTTP/NameKeyContextBVT.cs b/src/Storage/Commands.Storage.ScenarioTest/BVT/HTTP/NameKeyContextBVT.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/BVT/HTTP/NameKeyContextBVT.cs rename to src/Storage/Commands.Storage.ScenarioTest/BVT/HTTP/NameKeyContextBVT.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/BVT/HTTP/SecondaryEndPointBVT.cs b/src/Storage/Commands.Storage.ScenarioTest/BVT/HTTP/SecondaryEndPointBVT.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/BVT/HTTP/SecondaryEndPointBVT.cs rename to src/Storage/Commands.Storage.ScenarioTest/BVT/HTTP/SecondaryEndPointBVT.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/BVT/HTTPS/AnonymousBVT.cs b/src/Storage/Commands.Storage.ScenarioTest/BVT/HTTPS/AnonymousBVT.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/BVT/HTTPS/AnonymousBVT.cs rename to src/Storage/Commands.Storage.ScenarioTest/BVT/HTTPS/AnonymousBVT.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/BVT/HTTPS/AzureEnvironment.cs b/src/Storage/Commands.Storage.ScenarioTest/BVT/HTTPS/AzureEnvironment.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/BVT/HTTPS/AzureEnvironment.cs rename to src/Storage/Commands.Storage.ScenarioTest/BVT/HTTPS/AzureEnvironment.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/BVT/HTTPS/ConnectionStringBVT.cs b/src/Storage/Commands.Storage.ScenarioTest/BVT/HTTPS/ConnectionStringBVT.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/BVT/HTTPS/ConnectionStringBVT.cs rename to src/Storage/Commands.Storage.ScenarioTest/BVT/HTTPS/ConnectionStringBVT.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/BVT/HTTPS/EnvConnectionStringBVT.cs b/src/Storage/Commands.Storage.ScenarioTest/BVT/HTTPS/EnvConnectionStringBVT.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/BVT/HTTPS/EnvConnectionStringBVT.cs rename to src/Storage/Commands.Storage.ScenarioTest/BVT/HTTPS/EnvConnectionStringBVT.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/BVT/HTTPS/NameKeyContextBVT.cs b/src/Storage/Commands.Storage.ScenarioTest/BVT/HTTPS/NameKeyContextBVT.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/BVT/HTTPS/NameKeyContextBVT.cs rename to src/Storage/Commands.Storage.ScenarioTest/BVT/HTTPS/NameKeyContextBVT.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/BVT/HTTPS/SecondaryEndPointBVT.cs b/src/Storage/Commands.Storage.ScenarioTest/BVT/HTTPS/SecondaryEndPointBVT.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/BVT/HTTPS/SecondaryEndPointBVT.cs rename to src/Storage/Commands.Storage.ScenarioTest/BVT/HTTPS/SecondaryEndPointBVT.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/BVT/HTTPS/SubScriptionBVT.cs b/src/Storage/Commands.Storage.ScenarioTest/BVT/HTTPS/SubScriptionBVT.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/BVT/HTTPS/SubScriptionBVT.cs rename to src/Storage/Commands.Storage.ScenarioTest/BVT/HTTPS/SubScriptionBVT.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/BVT/StorageBVT.cs b/src/Storage/Commands.Storage.ScenarioTest/BVT/StorageBVT.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/BVT/StorageBVT.cs rename to src/Storage/Commands.Storage.ScenarioTest/BVT/StorageBVT.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/CLIBlobFunc.cs b/src/Storage/Commands.Storage.ScenarioTest/CLIBlobFunc.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/CLIBlobFunc.cs rename to src/Storage/Commands.Storage.ScenarioTest/CLIBlobFunc.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/CLIContainerFunc.cs b/src/Storage/Commands.Storage.ScenarioTest/CLIContainerFunc.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/CLIContainerFunc.cs rename to src/Storage/Commands.Storage.ScenarioTest/CLIContainerFunc.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/CLIContextFunc.cs b/src/Storage/Commands.Storage.ScenarioTest/CLIContextFunc.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/CLIContextFunc.cs rename to src/Storage/Commands.Storage.ScenarioTest/CLIContextFunc.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/CLIQueueFunc.cs b/src/Storage/Commands.Storage.ScenarioTest/CLIQueueFunc.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/CLIQueueFunc.cs rename to src/Storage/Commands.Storage.ScenarioTest/CLIQueueFunc.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/CLITableFunc.cs b/src/Storage/Commands.Storage.ScenarioTest/CLITableFunc.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/CLITableFunc.cs rename to src/Storage/Commands.Storage.ScenarioTest/CLITableFunc.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/Commands.Storage.ScenarioTest.csproj b/src/Storage/Commands.Storage.ScenarioTest/Commands.Storage.ScenarioTest.csproj similarity index 79% rename from src/Common/Storage/Commands.Storage.ScenarioTest/Commands.Storage.ScenarioTest.csproj rename to src/Storage/Commands.Storage.ScenarioTest/Commands.Storage.ScenarioTest.csproj index d6e4e3858c13..d955b7381cfe 100644 --- a/src/Common/Storage/Commands.Storage.ScenarioTest/Commands.Storage.ScenarioTest.csproj +++ b/src/Storage/Commands.Storage.ScenarioTest/Commands.Storage.ScenarioTest.csproj @@ -1,7 +1,7 @@  - - + + Debug AnyCPU @@ -51,46 +51,46 @@ - ..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll + ..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll True - ..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.0.5896.19355-prerelease\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll + ..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.0.5896.19355-prerelease\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll True False - ..\..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll + ..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll False - ..\..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll + ..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll False - ..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll + ..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll False - ..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll + ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll False - ..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll + ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll False - ..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll + ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - ..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll + ..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll False - ..\..\..\packages\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll + ..\..\packages\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll - ..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll @@ -100,33 +100,33 @@ False - ..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Extensions.dll + ..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Extensions.dll False - ..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll + ..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll False - ..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll + ..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll - ..\..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll + ..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll True - ..\..\..\packages\xunit.assert.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll + ..\..\packages\xunit.assert.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll True - ..\..\..\packages\xunit.extensibility.core.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll + ..\..\packages\xunit.extensibility.core.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll True - ..\..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll + ..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll True @@ -202,14 +202,18 @@ - + {c1bda476-a5cc-4394-914d-48b0ec31a710} Commands.ScenarioTests.Common - + {a3965b66-5a3e-4b8c-9574-28e5958d4828} Commands.ScenarioTest + + {3b48a77b-5956-4a62-9081-92ba04b02b27} + Commands.Common.Test + {9d5a40ca-5594-4f5c-8230-7adf7cc0558e} Commands.Storage.MsTest2 @@ -256,5 +260,5 @@ - + \ No newline at end of file diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/Common/TestBase.cs b/src/Storage/Commands.Storage.ScenarioTest/Common/TestBase.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/Common/TestBase.cs rename to src/Storage/Commands.Storage.ScenarioTest/Common/TestBase.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/Functional/Blob/GetBlob.cs b/src/Storage/Commands.Storage.ScenarioTest/Functional/Blob/GetBlob.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/Functional/Blob/GetBlob.cs rename to src/Storage/Commands.Storage.ScenarioTest/Functional/Blob/GetBlob.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/Functional/Blob/GetBlobContent.cs b/src/Storage/Commands.Storage.ScenarioTest/Functional/Blob/GetBlobContent.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/Functional/Blob/GetBlobContent.cs rename to src/Storage/Commands.Storage.ScenarioTest/Functional/Blob/GetBlobContent.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/Functional/Blob/GetContainer.cs b/src/Storage/Commands.Storage.ScenarioTest/Functional/Blob/GetContainer.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/Functional/Blob/GetContainer.cs rename to src/Storage/Commands.Storage.ScenarioTest/Functional/Blob/GetContainer.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/Functional/Blob/GetCopyState.cs b/src/Storage/Commands.Storage.ScenarioTest/Functional/Blob/GetCopyState.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/Functional/Blob/GetCopyState.cs rename to src/Storage/Commands.Storage.ScenarioTest/Functional/Blob/GetCopyState.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/Functional/Blob/NewContainer.cs b/src/Storage/Commands.Storage.ScenarioTest/Functional/Blob/NewContainer.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/Functional/Blob/NewContainer.cs rename to src/Storage/Commands.Storage.ScenarioTest/Functional/Blob/NewContainer.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/Functional/Blob/RemoveBlob.cs b/src/Storage/Commands.Storage.ScenarioTest/Functional/Blob/RemoveBlob.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/Functional/Blob/RemoveBlob.cs rename to src/Storage/Commands.Storage.ScenarioTest/Functional/Blob/RemoveBlob.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/Functional/Blob/RemoveContainer.cs b/src/Storage/Commands.Storage.ScenarioTest/Functional/Blob/RemoveContainer.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/Functional/Blob/RemoveContainer.cs rename to src/Storage/Commands.Storage.ScenarioTest/Functional/Blob/RemoveContainer.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/Functional/Blob/SetBlobContent.cs b/src/Storage/Commands.Storage.ScenarioTest/Functional/Blob/SetBlobContent.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/Functional/Blob/SetBlobContent.cs rename to src/Storage/Commands.Storage.ScenarioTest/Functional/Blob/SetBlobContent.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/Functional/Blob/SetContainerAcl.cs b/src/Storage/Commands.Storage.ScenarioTest/Functional/Blob/SetContainerAcl.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/Functional/Blob/SetContainerAcl.cs rename to src/Storage/Commands.Storage.ScenarioTest/Functional/Blob/SetContainerAcl.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/Functional/Blob/StartCopy.cs b/src/Storage/Commands.Storage.ScenarioTest/Functional/Blob/StartCopy.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/Functional/Blob/StartCopy.cs rename to src/Storage/Commands.Storage.ScenarioTest/Functional/Blob/StartCopy.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/Functional/Blob/StopCopy.cs b/src/Storage/Commands.Storage.ScenarioTest/Functional/Blob/StopCopy.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/Functional/Blob/StopCopy.cs rename to src/Storage/Commands.Storage.ScenarioTest/Functional/Blob/StopCopy.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/Functional/Queue/GetQueue.cs b/src/Storage/Commands.Storage.ScenarioTest/Functional/Queue/GetQueue.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/Functional/Queue/GetQueue.cs rename to src/Storage/Commands.Storage.ScenarioTest/Functional/Queue/GetQueue.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/Functional/Queue/RemoveQueue.cs b/src/Storage/Commands.Storage.ScenarioTest/Functional/Queue/RemoveQueue.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/Functional/Queue/RemoveQueue.cs rename to src/Storage/Commands.Storage.ScenarioTest/Functional/Queue/RemoveQueue.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/Functional/StorageContext.cs b/src/Storage/Commands.Storage.ScenarioTest/Functional/StorageContext.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/Functional/StorageContext.cs rename to src/Storage/Commands.Storage.ScenarioTest/Functional/StorageContext.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/Functional/Table/RemoveTable.cs b/src/Storage/Commands.Storage.ScenarioTest/Functional/Table/RemoveTable.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/Functional/Table/RemoveTable.cs rename to src/Storage/Commands.Storage.ScenarioTest/Functional/Table/RemoveTable.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/GB18030Test/BlobContentTest.cs b/src/Storage/Commands.Storage.ScenarioTest/GB18030Test/BlobContentTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/GB18030Test/BlobContentTest.cs rename to src/Storage/Commands.Storage.ScenarioTest/GB18030Test/BlobContentTest.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/MSSharedLibKey.snk b/src/Storage/Commands.Storage.ScenarioTest/MSSharedLibKey.snk similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/MSSharedLibKey.snk rename to src/Storage/Commands.Storage.ScenarioTest/MSSharedLibKey.snk diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/PowerShellAgent.cs b/src/Storage/Commands.Storage.ScenarioTest/PowerShellAgent.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/PowerShellAgent.cs rename to src/Storage/Commands.Storage.ScenarioTest/PowerShellAgent.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/Properties/AssemblyInfo.cs b/src/Storage/Commands.Storage.ScenarioTest/Properties/AssemblyInfo.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/Properties/AssemblyInfo.cs rename to src/Storage/Commands.Storage.ScenarioTest/Properties/AssemblyInfo.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/PsTag.cs b/src/Storage/Commands.Storage.ScenarioTest/PsTag.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/PsTag.cs rename to src/Storage/Commands.Storage.ScenarioTest/PsTag.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/README b/src/Storage/Commands.Storage.ScenarioTest/README similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/README rename to src/Storage/Commands.Storage.ScenarioTest/README diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/Resources/TestData.xml b/src/Storage/Commands.Storage.ScenarioTest/Resources/TestData.xml similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/Resources/TestData.xml rename to src/Storage/Commands.Storage.ScenarioTest/Resources/TestData.xml diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/StorageObjectType.cs b/src/Storage/Commands.Storage.ScenarioTest/StorageObjectType.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/StorageObjectType.cs rename to src/Storage/Commands.Storage.ScenarioTest/StorageObjectType.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/Util/CloudBlobUtil.cs b/src/Storage/Commands.Storage.ScenarioTest/Util/CloudBlobUtil.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/Util/CloudBlobUtil.cs rename to src/Storage/Commands.Storage.ScenarioTest/Util/CloudBlobUtil.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/Util/CloudQueueUtil.cs b/src/Storage/Commands.Storage.ScenarioTest/Util/CloudQueueUtil.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/Util/CloudQueueUtil.cs rename to src/Storage/Commands.Storage.ScenarioTest/Util/CloudQueueUtil.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/Util/CloudTableUtil.cs b/src/Storage/Commands.Storage.ScenarioTest/Util/CloudTableUtil.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/Util/CloudTableUtil.cs rename to src/Storage/Commands.Storage.ScenarioTest/Util/CloudTableUtil.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/Util/FileUtil.cs b/src/Storage/Commands.Storage.ScenarioTest/Util/FileUtil.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/Util/FileUtil.cs rename to src/Storage/Commands.Storage.ScenarioTest/Util/FileUtil.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/Util/PowerShellExtension.cs b/src/Storage/Commands.Storage.ScenarioTest/Util/PowerShellExtension.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/Util/PowerShellExtension.cs rename to src/Storage/Commands.Storage.ScenarioTest/Util/PowerShellExtension.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/Utility.cs b/src/Storage/Commands.Storage.ScenarioTest/Utility.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/Utility.cs rename to src/Storage/Commands.Storage.ScenarioTest/Utility.cs diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/deploy.cmd b/src/Storage/Commands.Storage.ScenarioTest/deploy.cmd similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/deploy.cmd rename to src/Storage/Commands.Storage.ScenarioTest/deploy.cmd diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/packages.config b/src/Storage/Commands.Storage.ScenarioTest/packages.config similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/packages.config rename to src/Storage/Commands.Storage.ScenarioTest/packages.config diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/storagetest.cmd b/src/Storage/Commands.Storage.ScenarioTest/storagetest.cmd similarity index 100% rename from src/Common/Storage/Commands.Storage.ScenarioTest/storagetest.cmd rename to src/Storage/Commands.Storage.ScenarioTest/storagetest.cmd diff --git a/src/Common/Storage/Commands.Storage.StorageTestLib/Commands.Storage.StorageTestLib.csproj b/src/Storage/Commands.Storage.StorageTestLib/Commands.Storage.StorageTestLib.csproj similarity index 73% rename from src/Common/Storage/Commands.Storage.StorageTestLib/Commands.Storage.StorageTestLib.csproj rename to src/Storage/Commands.Storage.StorageTestLib/Commands.Storage.StorageTestLib.csproj index e333c8d2d692..e3784747dffd 100644 --- a/src/Common/Storage/Commands.Storage.StorageTestLib/Commands.Storage.StorageTestLib.csproj +++ b/src/Storage/Commands.Storage.StorageTestLib/Commands.Storage.StorageTestLib.csproj @@ -1,7 +1,7 @@  - - + + Debug @@ -46,37 +46,37 @@ - ..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll + ..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll True False - ..\..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll + ..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll False - ..\..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll + ..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll False - ..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll + ..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll - ..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll + ..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll False - ..\..\..\packages\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll + ..\..\packages\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll - ..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll False - ..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll + ..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll @@ -84,19 +84,19 @@ - ..\..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll + ..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll True - ..\..\..\packages\xunit.assert.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll + ..\..\packages\xunit.assert.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll True - ..\..\..\packages\xunit.extensibility.core.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll + ..\..\packages\xunit.extensibility.core.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll True - ..\..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll + ..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll True diff --git a/src/Common/Storage/Commands.Storage.StorageTestLib/Helpers.cs b/src/Storage/Commands.Storage.StorageTestLib/Helpers.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.StorageTestLib/Helpers.cs rename to src/Storage/Commands.Storage.StorageTestLib/Helpers.cs diff --git a/src/Common/Storage/Commands.Storage.StorageTestLib/MSSharedLibKey.snk b/src/Storage/Commands.Storage.StorageTestLib/MSSharedLibKey.snk similarity index 100% rename from src/Common/Storage/Commands.Storage.StorageTestLib/MSSharedLibKey.snk rename to src/Storage/Commands.Storage.StorageTestLib/MSSharedLibKey.snk diff --git a/src/Common/Storage/Commands.Storage.StorageTestLib/Properties/AssemblyInfo.cs b/src/Storage/Commands.Storage.StorageTestLib/Properties/AssemblyInfo.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.StorageTestLib/Properties/AssemblyInfo.cs rename to src/Storage/Commands.Storage.StorageTestLib/Properties/AssemblyInfo.cs diff --git a/src/Common/Storage/Commands.Storage.StorageTestLib/TestConstants.cs b/src/Storage/Commands.Storage.StorageTestLib/TestConstants.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.StorageTestLib/TestConstants.cs rename to src/Storage/Commands.Storage.StorageTestLib/TestConstants.cs diff --git a/src/Common/Storage/Commands.Storage.StorageTestLib/packages.config b/src/Storage/Commands.Storage.StorageTestLib/packages.config similarity index 100% rename from src/Common/Storage/Commands.Storage.StorageTestLib/packages.config rename to src/Storage/Commands.Storage.StorageTestLib/packages.config diff --git a/src/Common/Storage/Commands.Storage.Test/Blob/Cmdlet/GetAzureStorageBlobContentTest.cs b/src/Storage/Commands.Storage.Test/Blob/Cmdlet/GetAzureStorageBlobContentTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Blob/Cmdlet/GetAzureStorageBlobContentTest.cs rename to src/Storage/Commands.Storage.Test/Blob/Cmdlet/GetAzureStorageBlobContentTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Blob/Cmdlet/GetAzureStorageBlobTest.cs b/src/Storage/Commands.Storage.Test/Blob/Cmdlet/GetAzureStorageBlobTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Blob/Cmdlet/GetAzureStorageBlobTest.cs rename to src/Storage/Commands.Storage.Test/Blob/Cmdlet/GetAzureStorageBlobTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Blob/Cmdlet/GetAzureStorageContainerTest.cs b/src/Storage/Commands.Storage.Test/Blob/Cmdlet/GetAzureStorageContainerTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Blob/Cmdlet/GetAzureStorageContainerTest.cs rename to src/Storage/Commands.Storage.Test/Blob/Cmdlet/GetAzureStorageContainerTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Blob/Cmdlet/NewAzureStorageBlobSasTest.cs b/src/Storage/Commands.Storage.Test/Blob/Cmdlet/NewAzureStorageBlobSasTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Blob/Cmdlet/NewAzureStorageBlobSasTest.cs rename to src/Storage/Commands.Storage.Test/Blob/Cmdlet/NewAzureStorageBlobSasTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Blob/Cmdlet/NewAzureStorageContainerSasTest.cs b/src/Storage/Commands.Storage.Test/Blob/Cmdlet/NewAzureStorageContainerSasTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Blob/Cmdlet/NewAzureStorageContainerSasTest.cs rename to src/Storage/Commands.Storage.Test/Blob/Cmdlet/NewAzureStorageContainerSasTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Blob/Cmdlet/NewAzureStorageContainerTest.cs b/src/Storage/Commands.Storage.Test/Blob/Cmdlet/NewAzureStorageContainerTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Blob/Cmdlet/NewAzureStorageContainerTest.cs rename to src/Storage/Commands.Storage.Test/Blob/Cmdlet/NewAzureStorageContainerTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Blob/Cmdlet/RemoveAzureStorageBlobTest.cs b/src/Storage/Commands.Storage.Test/Blob/Cmdlet/RemoveAzureStorageBlobTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Blob/Cmdlet/RemoveAzureStorageBlobTest.cs rename to src/Storage/Commands.Storage.Test/Blob/Cmdlet/RemoveAzureStorageBlobTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Blob/Cmdlet/RemoveAzureStorageContainerTest.cs b/src/Storage/Commands.Storage.Test/Blob/Cmdlet/RemoveAzureStorageContainerTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Blob/Cmdlet/RemoveAzureStorageContainerTest.cs rename to src/Storage/Commands.Storage.Test/Blob/Cmdlet/RemoveAzureStorageContainerTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Blob/Cmdlet/SetAzureStorageBlobContentTest.cs b/src/Storage/Commands.Storage.Test/Blob/Cmdlet/SetAzureStorageBlobContentTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Blob/Cmdlet/SetAzureStorageBlobContentTest.cs rename to src/Storage/Commands.Storage.Test/Blob/Cmdlet/SetAzureStorageBlobContentTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Blob/Cmdlet/SetAzureStorageContainerAclTest.cs b/src/Storage/Commands.Storage.Test/Blob/Cmdlet/SetAzureStorageContainerAclTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Blob/Cmdlet/SetAzureStorageContainerAclTest.cs rename to src/Storage/Commands.Storage.Test/Blob/Cmdlet/SetAzureStorageContainerAclTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Blob/StorageBlobTestBase.cs b/src/Storage/Commands.Storage.Test/Blob/StorageBlobTestBase.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Blob/StorageBlobTestBase.cs rename to src/Storage/Commands.Storage.Test/Blob/StorageBlobTestBase.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Blob/StorageCloudBlobCmdletBaseTest.cs b/src/Storage/Commands.Storage.Test/Blob/StorageCloudBlobCmdletBaseTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Blob/StorageCloudBlobCmdletBaseTest.cs rename to src/Storage/Commands.Storage.Test/Blob/StorageCloudBlobCmdletBaseTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Commands.Storage.Test.csproj b/src/Storage/Commands.Storage.Test/Commands.Storage.Test.csproj similarity index 75% rename from src/Common/Storage/Commands.Storage.Test/Commands.Storage.Test.csproj rename to src/Storage/Commands.Storage.Test/Commands.Storage.Test.csproj index 5dc5df563293..e2edece41725 100644 --- a/src/Common/Storage/Commands.Storage.Test/Commands.Storage.Test.csproj +++ b/src/Storage/Commands.Storage.Test/Commands.Storage.Test.csproj @@ -1,7 +1,7 @@  - - + + Debug AnyCPU @@ -52,82 +52,82 @@ - ..\..\..\packages\Hyak.Common.1.0.3\lib\portable-net403+win+wpa81\Hyak.Common.dll + ..\..\packages\Hyak.Common.1.0.3\lib\portable-net403+win+wpa81\Hyak.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll + ..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll + ..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll - ..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll + ..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll True False - ..\..\..\packages\Microsoft.Azure.Management.Resources.2.19.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll + ..\..\packages\Microsoft.Azure.Management.Resources.2.19.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll - ..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.0.5896.19355-prerelease\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll + ..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.0.5896.19355-prerelease\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll True False - ..\..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll + ..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll False - ..\..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll + ..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll False - ..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll + ..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll False - ..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll + ..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll False - ..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll + ..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll - ..\..\..\packages\Microsoft.Rest.ClientRuntime.2.1.0\lib\net45\Microsoft.Rest.ClientRuntime.dll + ..\..\packages\Microsoft.Rest.ClientRuntime.2.1.0\lib\net45\Microsoft.Rest.ClientRuntime.dll True - ..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.0.1-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll + ..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.0.1-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll True False - ..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll + ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll False - ..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll + ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll False - ..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll + ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - ..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll + ..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.2.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll - ..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll + ..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll - ..\..\..\packages\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll + ..\..\packages\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll False - ..\..\..\lib\Microsoft.WindowsAzure.Storage.DataMovement.dll + ..\..\lib\Microsoft.WindowsAzure.Storage.DataMovement.dll - ..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll @@ -139,34 +139,34 @@ False - ..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Extensions.dll + ..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Extensions.dll False - ..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll + ..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll False - ..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll + ..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll - ..\..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll + ..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll True - ..\..\..\packages\xunit.assert.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll + ..\..\packages\xunit.assert.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll True - ..\..\..\packages\xunit.extensibility.core.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll + ..\..\packages\xunit.extensibility.core.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll True - ..\..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll + ..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll True @@ -244,19 +244,19 @@ - + {3b48a77b-5956-4a62-9081-92ba04b02b27} Commands.Common.Test - + {c1bda476-a5cc-4394-914d-48b0ec31a710} Commands.ScenarioTests.Common - + {cff09e81-1e31-444e-b4d4-a21e946c29e2} Commands.ServiceManagement.Common - + {d3804b64-c0d3-48f8-82ec-1f632f833c9e} Commands.Common.Authentication @@ -264,11 +264,11 @@ {08cf7da7-0392-4a19-b79b-e1ff67cdb81a} Commands.Storage - + {65c3a86a-716d-4e7d-ab67-1db00b3bf72d} Commands.Common.Storage - + {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common @@ -297,5 +297,5 @@ - + \ No newline at end of file diff --git a/src/Common/Storage/Commands.Storage.Test/Common/Cmdlet/NewAzureStorageContextTest.cs b/src/Storage/Commands.Storage.Test/Common/Cmdlet/NewAzureStorageContextTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Common/Cmdlet/NewAzureStorageContextTest.cs rename to src/Storage/Commands.Storage.Test/Common/Cmdlet/NewAzureStorageContextTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Common/Cmdlet/SetAzureStorageServiceHourMetricsTest.cs b/src/Storage/Commands.Storage.Test/Common/Cmdlet/SetAzureStorageServiceHourMetricsTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Common/Cmdlet/SetAzureStorageServiceHourMetricsTest.cs rename to src/Storage/Commands.Storage.Test/Common/Cmdlet/SetAzureStorageServiceHourMetricsTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Common/Cmdlet/SetAzureStorageServiceLoggingTest.cs b/src/Storage/Commands.Storage.Test/Common/Cmdlet/SetAzureStorageServiceLoggingTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Common/Cmdlet/SetAzureStorageServiceLoggingTest.cs rename to src/Storage/Commands.Storage.Test/Common/Cmdlet/SetAzureStorageServiceLoggingTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Common/CmdletOperationContextTest.cs b/src/Storage/Commands.Storage.Test/Common/CmdletOperationContextTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Common/CmdletOperationContextTest.cs rename to src/Storage/Commands.Storage.Test/Common/CmdletOperationContextTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Common/CommunicationExceptionUtilTest.cs b/src/Storage/Commands.Storage.Test/Common/CommunicationExceptionUtilTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Common/CommunicationExceptionUtilTest.cs rename to src/Storage/Commands.Storage.Test/Common/CommunicationExceptionUtilTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Common/FileNamingGenerator.cs b/src/Storage/Commands.Storage.Test/Common/FileNamingGenerator.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Common/FileNamingGenerator.cs rename to src/Storage/Commands.Storage.Test/Common/FileNamingGenerator.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Common/IStorageManagement.cs b/src/Storage/Commands.Storage.Test/Common/IStorageManagement.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Common/IStorageManagement.cs rename to src/Storage/Commands.Storage.Test/Common/IStorageManagement.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Common/MockTransferManager.cs b/src/Storage/Commands.Storage.Test/Common/MockTransferManager.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Common/MockTransferManager.cs rename to src/Storage/Commands.Storage.Test/Common/MockTransferManager.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Common/MockupException.cs b/src/Storage/Commands.Storage.Test/Common/MockupException.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Common/MockupException.cs rename to src/Storage/Commands.Storage.Test/Common/MockupException.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Common/NameUtilTest.cs b/src/Storage/Commands.Storage.Test/Common/NameUtilTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Common/NameUtilTest.cs rename to src/Storage/Commands.Storage.Test/Common/NameUtilTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Common/ResourceAlreadyExistExceptionTest.cs b/src/Storage/Commands.Storage.Test/Common/ResourceAlreadyExistExceptionTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Common/ResourceAlreadyExistExceptionTest.cs rename to src/Storage/Commands.Storage.Test/Common/ResourceAlreadyExistExceptionTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Common/ResourceNotFoundExceptionTest.cs b/src/Storage/Commands.Storage.Test/Common/ResourceNotFoundExceptionTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Common/ResourceNotFoundExceptionTest.cs rename to src/Storage/Commands.Storage.Test/Common/ResourceNotFoundExceptionTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Common/SasTokenHelperTest.cs b/src/Storage/Commands.Storage.Test/Common/SasTokenHelperTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Common/SasTokenHelperTest.cs rename to src/Storage/Commands.Storage.Test/Common/SasTokenHelperTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Common/StorageCloudCmdletBaseTest.cs b/src/Storage/Commands.Storage.Test/Common/StorageCloudCmdletBaseTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Common/StorageCloudCmdletBaseTest.cs rename to src/Storage/Commands.Storage.Test/Common/StorageCloudCmdletBaseTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Common/StorageExceptionUtilTest.cs b/src/Storage/Commands.Storage.Test/Common/StorageExceptionUtilTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Common/StorageExceptionUtilTest.cs rename to src/Storage/Commands.Storage.Test/Common/StorageExceptionUtilTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/File/Cmdlet/GetAzureStorageFileContentTest.cs b/src/Storage/Commands.Storage.Test/File/Cmdlet/GetAzureStorageFileContentTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/File/Cmdlet/GetAzureStorageFileContentTest.cs rename to src/Storage/Commands.Storage.Test/File/Cmdlet/GetAzureStorageFileContentTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/File/Cmdlet/GetAzureStorageFileTest.cs b/src/Storage/Commands.Storage.Test/File/Cmdlet/GetAzureStorageFileTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/File/Cmdlet/GetAzureStorageFileTest.cs rename to src/Storage/Commands.Storage.Test/File/Cmdlet/GetAzureStorageFileTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/File/Cmdlet/GetAzureStorageShareTest.cs b/src/Storage/Commands.Storage.Test/File/Cmdlet/GetAzureStorageShareTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/File/Cmdlet/GetAzureStorageShareTest.cs rename to src/Storage/Commands.Storage.Test/File/Cmdlet/GetAzureStorageShareTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/File/Cmdlet/NewAzureStorageDirectoryTest.cs b/src/Storage/Commands.Storage.Test/File/Cmdlet/NewAzureStorageDirectoryTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/File/Cmdlet/NewAzureStorageDirectoryTest.cs rename to src/Storage/Commands.Storage.Test/File/Cmdlet/NewAzureStorageDirectoryTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/File/Cmdlet/NewAzureStorageShareTest.cs b/src/Storage/Commands.Storage.Test/File/Cmdlet/NewAzureStorageShareTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/File/Cmdlet/NewAzureStorageShareTest.cs rename to src/Storage/Commands.Storage.Test/File/Cmdlet/NewAzureStorageShareTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/File/Cmdlet/RemoveAzureStorageDirectoryTest.cs b/src/Storage/Commands.Storage.Test/File/Cmdlet/RemoveAzureStorageDirectoryTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/File/Cmdlet/RemoveAzureStorageDirectoryTest.cs rename to src/Storage/Commands.Storage.Test/File/Cmdlet/RemoveAzureStorageDirectoryTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/File/Cmdlet/RemoveAzureStorageFileTest.cs b/src/Storage/Commands.Storage.Test/File/Cmdlet/RemoveAzureStorageFileTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/File/Cmdlet/RemoveAzureStorageFileTest.cs rename to src/Storage/Commands.Storage.Test/File/Cmdlet/RemoveAzureStorageFileTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/File/Cmdlet/RemoveAzureStorageShareTest.cs b/src/Storage/Commands.Storage.Test/File/Cmdlet/RemoveAzureStorageShareTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/File/Cmdlet/RemoveAzureStorageShareTest.cs rename to src/Storage/Commands.Storage.Test/File/Cmdlet/RemoveAzureStorageShareTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/File/Cmdlet/SetAzureStorageFileContentTest.cs b/src/Storage/Commands.Storage.Test/File/Cmdlet/SetAzureStorageFileContentTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/File/Cmdlet/SetAzureStorageFileContentTest.cs rename to src/Storage/Commands.Storage.Test/File/Cmdlet/SetAzureStorageFileContentTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/File/FileAssertUtil.cs b/src/Storage/Commands.Storage.Test/File/FileAssertUtil.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/File/FileAssertUtil.cs rename to src/Storage/Commands.Storage.Test/File/FileAssertUtil.cs diff --git a/src/Common/Storage/Commands.Storage.Test/File/PSCmdletReflectionHelper.cs b/src/Storage/Commands.Storage.Test/File/PSCmdletReflectionHelper.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/File/PSCmdletReflectionHelper.cs rename to src/Storage/Commands.Storage.Test/File/PSCmdletReflectionHelper.cs diff --git a/src/Common/Storage/Commands.Storage.Test/File/StorageFileTestBase.cs b/src/Storage/Commands.Storage.Test/File/StorageFileTestBase.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/File/StorageFileTestBase.cs rename to src/Storage/Commands.Storage.Test/File/StorageFileTestBase.cs diff --git a/src/Common/Storage/Commands.Storage.Test/MSSharedLibKey.snk b/src/Storage/Commands.Storage.Test/MSSharedLibKey.snk similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/MSSharedLibKey.snk rename to src/Storage/Commands.Storage.Test/MSSharedLibKey.snk diff --git a/src/Common/Storage/Commands.Storage.Test/Properties/AssemblyInfo.cs b/src/Storage/Commands.Storage.Test/Properties/AssemblyInfo.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Properties/AssemblyInfo.cs rename to src/Storage/Commands.Storage.Test/Properties/AssemblyInfo.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Queue/GetAzureStorageQueueTest.cs b/src/Storage/Commands.Storage.Test/Queue/GetAzureStorageQueueTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Queue/GetAzureStorageQueueTest.cs rename to src/Storage/Commands.Storage.Test/Queue/GetAzureStorageQueueTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Queue/NewAzureStorageQueueSasTest.cs b/src/Storage/Commands.Storage.Test/Queue/NewAzureStorageQueueSasTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Queue/NewAzureStorageQueueSasTest.cs rename to src/Storage/Commands.Storage.Test/Queue/NewAzureStorageQueueSasTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Queue/NewAzureStorageQueueTest.cs b/src/Storage/Commands.Storage.Test/Queue/NewAzureStorageQueueTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Queue/NewAzureStorageQueueTest.cs rename to src/Storage/Commands.Storage.Test/Queue/NewAzureStorageQueueTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Queue/RemoveAzureStorageQueueTest.cs b/src/Storage/Commands.Storage.Test/Queue/RemoveAzureStorageQueueTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Queue/RemoveAzureStorageQueueTest.cs rename to src/Storage/Commands.Storage.Test/Queue/RemoveAzureStorageQueueTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Queue/StorageQueueTestBase.cs b/src/Storage/Commands.Storage.Test/Queue/StorageQueueTestBase.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Queue/StorageQueueTestBase.cs rename to src/Storage/Commands.Storage.Test/Queue/StorageQueueTestBase.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Service/MockStorageBlobManagement.cs b/src/Storage/Commands.Storage.Test/Service/MockStorageBlobManagement.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Service/MockStorageBlobManagement.cs rename to src/Storage/Commands.Storage.Test/Service/MockStorageBlobManagement.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Service/MockStorageFileManagement.cs b/src/Storage/Commands.Storage.Test/Service/MockStorageFileManagement.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Service/MockStorageFileManagement.cs rename to src/Storage/Commands.Storage.Test/Service/MockStorageFileManagement.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Service/MockStorageQueueManagement.cs b/src/Storage/Commands.Storage.Test/Service/MockStorageQueueManagement.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Service/MockStorageQueueManagement.cs rename to src/Storage/Commands.Storage.Test/Service/MockStorageQueueManagement.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Service/MockStorageTableManagement.cs b/src/Storage/Commands.Storage.Test/Service/MockStorageTableManagement.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Service/MockStorageTableManagement.cs rename to src/Storage/Commands.Storage.Test/Service/MockStorageTableManagement.cs diff --git a/src/Common/Storage/Commands.Storage.Test/StorageTestBase.cs b/src/Storage/Commands.Storage.Test/StorageTestBase.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/StorageTestBase.cs rename to src/Storage/Commands.Storage.Test/StorageTestBase.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Table/GetAzureStorageTableStoredAccessPolicyTest.cs b/src/Storage/Commands.Storage.Test/Table/GetAzureStorageTableStoredAccessPolicyTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Table/GetAzureStorageTableStoredAccessPolicyTest.cs rename to src/Storage/Commands.Storage.Test/Table/GetAzureStorageTableStoredAccessPolicyTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Table/GetAzureStorageTableTest.cs b/src/Storage/Commands.Storage.Test/Table/GetAzureStorageTableTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Table/GetAzureStorageTableTest.cs rename to src/Storage/Commands.Storage.Test/Table/GetAzureStorageTableTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Table/NewAzureStorageTableSasTest.cs b/src/Storage/Commands.Storage.Test/Table/NewAzureStorageTableSasTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Table/NewAzureStorageTableSasTest.cs rename to src/Storage/Commands.Storage.Test/Table/NewAzureStorageTableSasTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Table/NewAzureStorageTableStoredAccessPolicyTest.cs b/src/Storage/Commands.Storage.Test/Table/NewAzureStorageTableStoredAccessPolicyTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Table/NewAzureStorageTableStoredAccessPolicyTest.cs rename to src/Storage/Commands.Storage.Test/Table/NewAzureStorageTableStoredAccessPolicyTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Table/NewAzureStorageTableTest.cs b/src/Storage/Commands.Storage.Test/Table/NewAzureStorageTableTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Table/NewAzureStorageTableTest.cs rename to src/Storage/Commands.Storage.Test/Table/NewAzureStorageTableTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Table/RemoveAzureStorageTableStoredAccessPolicyTest.cs b/src/Storage/Commands.Storage.Test/Table/RemoveAzureStorageTableStoredAccessPolicyTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Table/RemoveAzureStorageTableStoredAccessPolicyTest.cs rename to src/Storage/Commands.Storage.Test/Table/RemoveAzureStorageTableStoredAccessPolicyTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Table/RemoveAzureStorageTableTest.cs b/src/Storage/Commands.Storage.Test/Table/RemoveAzureStorageTableTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Table/RemoveAzureStorageTableTest.cs rename to src/Storage/Commands.Storage.Test/Table/RemoveAzureStorageTableTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Table/SetAzureStorageTableStoredAccessPolicyTest.cs b/src/Storage/Commands.Storage.Test/Table/SetAzureStorageTableStoredAccessPolicyTest.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Table/SetAzureStorageTableStoredAccessPolicyTest.cs rename to src/Storage/Commands.Storage.Test/Table/SetAzureStorageTableStoredAccessPolicyTest.cs diff --git a/src/Common/Storage/Commands.Storage.Test/Table/StorageTableStorageTestBase.cs b/src/Storage/Commands.Storage.Test/Table/StorageTableStorageTestBase.cs similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/Table/StorageTableStorageTestBase.cs rename to src/Storage/Commands.Storage.Test/Table/StorageTableStorageTestBase.cs diff --git a/src/Common/Storage/Commands.Storage.Test/packages.config b/src/Storage/Commands.Storage.Test/packages.config similarity index 100% rename from src/Common/Storage/Commands.Storage.Test/packages.config rename to src/Storage/Commands.Storage.Test/packages.config diff --git a/src/Common/Storage/Commands.Storage/AzureStorageStartup.ps1 b/src/Storage/Commands.Storage/AzureStorageStartup.ps1 similarity index 100% rename from src/Common/Storage/Commands.Storage/AzureStorageStartup.ps1 rename to src/Storage/Commands.Storage/AzureStorageStartup.ps1 diff --git a/src/Common/Storage/Commands.Storage/Blob/Cmdlet/GetAzureStorageBlob.cs b/src/Storage/Commands.Storage/Blob/Cmdlet/GetAzureStorageBlob.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Blob/Cmdlet/GetAzureStorageBlob.cs rename to src/Storage/Commands.Storage/Blob/Cmdlet/GetAzureStorageBlob.cs diff --git a/src/Common/Storage/Commands.Storage/Blob/Cmdlet/GetAzureStorageBlobContent.cs b/src/Storage/Commands.Storage/Blob/Cmdlet/GetAzureStorageBlobContent.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Blob/Cmdlet/GetAzureStorageBlobContent.cs rename to src/Storage/Commands.Storage/Blob/Cmdlet/GetAzureStorageBlobContent.cs diff --git a/src/Common/Storage/Commands.Storage/Blob/Cmdlet/GetAzureStorageBlobCopyState.cs b/src/Storage/Commands.Storage/Blob/Cmdlet/GetAzureStorageBlobCopyState.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Blob/Cmdlet/GetAzureStorageBlobCopyState.cs rename to src/Storage/Commands.Storage/Blob/Cmdlet/GetAzureStorageBlobCopyState.cs diff --git a/src/Common/Storage/Commands.Storage/Blob/Cmdlet/GetAzureStorageContainer.cs b/src/Storage/Commands.Storage/Blob/Cmdlet/GetAzureStorageContainer.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Blob/Cmdlet/GetAzureStorageContainer.cs rename to src/Storage/Commands.Storage/Blob/Cmdlet/GetAzureStorageContainer.cs diff --git a/src/Common/Storage/Commands.Storage/Blob/Cmdlet/GetAzureStorageContainerStoredAccessPolicy.cs b/src/Storage/Commands.Storage/Blob/Cmdlet/GetAzureStorageContainerStoredAccessPolicy.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Blob/Cmdlet/GetAzureStorageContainerStoredAccessPolicy.cs rename to src/Storage/Commands.Storage/Blob/Cmdlet/GetAzureStorageContainerStoredAccessPolicy.cs diff --git a/src/Common/Storage/Commands.Storage/Blob/Cmdlet/NewAzureStorageBlobSasToken.cs b/src/Storage/Commands.Storage/Blob/Cmdlet/NewAzureStorageBlobSasToken.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Blob/Cmdlet/NewAzureStorageBlobSasToken.cs rename to src/Storage/Commands.Storage/Blob/Cmdlet/NewAzureStorageBlobSasToken.cs diff --git a/src/Common/Storage/Commands.Storage/Blob/Cmdlet/NewAzureStorageContainer.cs b/src/Storage/Commands.Storage/Blob/Cmdlet/NewAzureStorageContainer.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Blob/Cmdlet/NewAzureStorageContainer.cs rename to src/Storage/Commands.Storage/Blob/Cmdlet/NewAzureStorageContainer.cs diff --git a/src/Common/Storage/Commands.Storage/Blob/Cmdlet/NewAzureStorageContainerSasToken.cs b/src/Storage/Commands.Storage/Blob/Cmdlet/NewAzureStorageContainerSasToken.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Blob/Cmdlet/NewAzureStorageContainerSasToken.cs rename to src/Storage/Commands.Storage/Blob/Cmdlet/NewAzureStorageContainerSasToken.cs diff --git a/src/Common/Storage/Commands.Storage/Blob/Cmdlet/NewAzureStorageContainerStoredAccessPolicy.cs b/src/Storage/Commands.Storage/Blob/Cmdlet/NewAzureStorageContainerStoredAccessPolicy.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Blob/Cmdlet/NewAzureStorageContainerStoredAccessPolicy.cs rename to src/Storage/Commands.Storage/Blob/Cmdlet/NewAzureStorageContainerStoredAccessPolicy.cs diff --git a/src/Common/Storage/Commands.Storage/Blob/Cmdlet/RemoveAzureStorageBlob.cs b/src/Storage/Commands.Storage/Blob/Cmdlet/RemoveAzureStorageBlob.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Blob/Cmdlet/RemoveAzureStorageBlob.cs rename to src/Storage/Commands.Storage/Blob/Cmdlet/RemoveAzureStorageBlob.cs diff --git a/src/Common/Storage/Commands.Storage/Blob/Cmdlet/RemoveAzureStorageContainer.cs b/src/Storage/Commands.Storage/Blob/Cmdlet/RemoveAzureStorageContainer.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Blob/Cmdlet/RemoveAzureStorageContainer.cs rename to src/Storage/Commands.Storage/Blob/Cmdlet/RemoveAzureStorageContainer.cs diff --git a/src/Common/Storage/Commands.Storage/Blob/Cmdlet/RemoveAzureStorageContainerStoredAccessPolicy.cs b/src/Storage/Commands.Storage/Blob/Cmdlet/RemoveAzureStorageContainerStoredAccessPolicy.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Blob/Cmdlet/RemoveAzureStorageContainerStoredAccessPolicy.cs rename to src/Storage/Commands.Storage/Blob/Cmdlet/RemoveAzureStorageContainerStoredAccessPolicy.cs diff --git a/src/Common/Storage/Commands.Storage/Blob/Cmdlet/SetAzureStorageBlobContent.cs b/src/Storage/Commands.Storage/Blob/Cmdlet/SetAzureStorageBlobContent.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Blob/Cmdlet/SetAzureStorageBlobContent.cs rename to src/Storage/Commands.Storage/Blob/Cmdlet/SetAzureStorageBlobContent.cs diff --git a/src/Common/Storage/Commands.Storage/Blob/Cmdlet/SetAzureStorageContainerAcl.cs b/src/Storage/Commands.Storage/Blob/Cmdlet/SetAzureStorageContainerAcl.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Blob/Cmdlet/SetAzureStorageContainerAcl.cs rename to src/Storage/Commands.Storage/Blob/Cmdlet/SetAzureStorageContainerAcl.cs diff --git a/src/Common/Storage/Commands.Storage/Blob/Cmdlet/SetAzureStorageContainerStoredAccessPolicy.cs b/src/Storage/Commands.Storage/Blob/Cmdlet/SetAzureStorageContainerStoredAccessPolicy.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Blob/Cmdlet/SetAzureStorageContainerStoredAccessPolicy.cs rename to src/Storage/Commands.Storage/Blob/Cmdlet/SetAzureStorageContainerStoredAccessPolicy.cs diff --git a/src/Common/Storage/Commands.Storage/Blob/Cmdlet/StartAzureStorageBlobCopy.cs b/src/Storage/Commands.Storage/Blob/Cmdlet/StartAzureStorageBlobCopy.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Blob/Cmdlet/StartAzureStorageBlobCopy.cs rename to src/Storage/Commands.Storage/Blob/Cmdlet/StartAzureStorageBlobCopy.cs diff --git a/src/Common/Storage/Commands.Storage/Blob/Cmdlet/StopAzureStorageBlobCopy.cs b/src/Storage/Commands.Storage/Blob/Cmdlet/StopAzureStorageBlobCopy.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Blob/Cmdlet/StopAzureStorageBlobCopy.cs rename to src/Storage/Commands.Storage/Blob/Cmdlet/StopAzureStorageBlobCopy.cs diff --git a/src/Common/Storage/Commands.Storage/Blob/DataMovementUserData.cs b/src/Storage/Commands.Storage/Blob/DataMovementUserData.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Blob/DataMovementUserData.cs rename to src/Storage/Commands.Storage/Blob/DataMovementUserData.cs diff --git a/src/Common/Storage/Commands.Storage/Blob/StorageCloudBlobCmdletBase.cs b/src/Storage/Commands.Storage/Blob/StorageCloudBlobCmdletBase.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Blob/StorageCloudBlobCmdletBase.cs rename to src/Storage/Commands.Storage/Blob/StorageCloudBlobCmdletBase.cs diff --git a/src/Common/Storage/Commands.Storage/Blob/StorageDataMovementCmdletBase.cs b/src/Storage/Commands.Storage/Blob/StorageDataMovementCmdletBase.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Blob/StorageDataMovementCmdletBase.cs rename to src/Storage/Commands.Storage/Blob/StorageDataMovementCmdletBase.cs diff --git a/src/Common/Storage/Commands.Storage/Commands.Storage.csproj b/src/Storage/Commands.Storage/Commands.Storage.csproj similarity index 81% rename from src/Common/Storage/Commands.Storage/Commands.Storage.csproj rename to src/Storage/Commands.Storage/Commands.Storage.csproj index fdafd16b2c80..485da3c1fd72 100644 --- a/src/Common/Storage/Commands.Storage/Commands.Storage.csproj +++ b/src/Storage/Commands.Storage/Commands.Storage.csproj @@ -20,7 +20,7 @@ true full false - ..\..\..\Package\Debug\ServiceManagement\Azure\Azure.Storage + ..\..\Package\Debug\Storage\Azure.Storage DEBUG;TRACE prompt 4 @@ -32,7 +32,7 @@ true MSSharedLibKey.snk true - ..\..\..\Package\Release\ServiceManagement\Azure\Azure.Storage + ..\..\Package\Release\Storage\Azure.Storage TRACE;SIGN true pdbonly @@ -43,78 +43,78 @@ False - ..\..\..\packages\Hyak.Common.1.0.3\lib\portable-net403+win+wpa81\Hyak.Common.dll + ..\..\packages\Hyak.Common.1.0.3\lib\portable-net403+win+wpa81\Hyak.Common.dll False - ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll + ..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll False - ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll + ..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll - ..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll + ..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll True False - ..\..\..\packages\Microsoft.Azure.Management.Resources.2.19.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll + ..\..\packages\Microsoft.Azure.Management.Resources.2.19.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll False - ..\..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll + ..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll False - ..\..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll + ..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll False - ..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll + ..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll - ..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll + ..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll True - ..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll + ..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll True - ..\..\..\packages\Microsoft.Rest.ClientRuntime.2.1.0\lib\net45\Microsoft.Rest.ClientRuntime.dll + ..\..\packages\Microsoft.Rest.ClientRuntime.2.1.0\lib\net45\Microsoft.Rest.ClientRuntime.dll True - ..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.0.1-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll + ..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.0.1-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll True False - ..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll + ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll False - ..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll + ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll False - ..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll + ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - ..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll + ..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll False - ..\..\..\packages\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll + ..\..\packages\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll False - ..\..\..\lib\Microsoft.WindowsAzure.Storage.DataMovement.dll + ..\..\lib\Microsoft.WindowsAzure.Storage.DataMovement.dll False - ..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll @@ -126,11 +126,11 @@ False - ..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Extensions.dll + ..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Extensions.dll False - ..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll + ..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll @@ -139,7 +139,7 @@ False - ..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll + ..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll @@ -270,19 +270,19 @@ - + {65c3a86a-716d-4e7d-ab67-1db00b3bf72d} Commands.Common.Storage - + {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common - + {cff09e81-1e31-444e-b4d4-a21e946c29e2} Commands.ServiceManagement.Common - + {d3804b64-c0d3-48f8-82ec-1f632f833c9e} Commands.Common.Authentication @@ -310,9 +310,6 @@ - - Always - @@ -323,8 +320,5 @@ - - - powershell.exe -ExecutionPolicy Unrestricted -File "$(ProjectDir)\PostBuild.ps1" "..\..\..\ResourceManager\AzureResourceManager" - + \ No newline at end of file diff --git a/src/Common/Storage/Commands.Storage/Common/AccessPolicyHelper.cs b/src/Storage/Commands.Storage/Common/AccessPolicyHelper.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/AccessPolicyHelper.cs rename to src/Storage/Commands.Storage/Common/AccessPolicyHelper.cs diff --git a/src/Common/Storage/Commands.Storage/Common/BlobToAzureFileNameResolver.cs b/src/Storage/Commands.Storage/Common/BlobToAzureFileNameResolver.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/BlobToAzureFileNameResolver.cs rename to src/Storage/Commands.Storage/Common/BlobToAzureFileNameResolver.cs diff --git a/src/Common/Storage/Commands.Storage/Common/BlobToFileNameResolver.cs b/src/Storage/Commands.Storage/Common/BlobToFileNameResolver.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/BlobToFileNameResolver.cs rename to src/Storage/Commands.Storage/Common/BlobToFileNameResolver.cs diff --git a/src/Common/Storage/Commands.Storage/Common/BlobToFileSystemNameResolver.cs b/src/Storage/Commands.Storage/Common/BlobToFileSystemNameResolver.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/BlobToFileSystemNameResolver.cs rename to src/Storage/Commands.Storage/Common/BlobToFileSystemNameResolver.cs diff --git a/src/Common/Storage/Commands.Storage/Common/BlobUploadRequestQueue.cs b/src/Storage/Commands.Storage/Common/BlobUploadRequestQueue.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/BlobUploadRequestQueue.cs rename to src/Storage/Commands.Storage/Common/BlobUploadRequestQueue.cs diff --git a/src/Common/Storage/Commands.Storage/Common/Cmdlet/GetAzureStorageCORSRule.cs b/src/Storage/Commands.Storage/Common/Cmdlet/GetAzureStorageCORSRule.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/Cmdlet/GetAzureStorageCORSRule.cs rename to src/Storage/Commands.Storage/Common/Cmdlet/GetAzureStorageCORSRule.cs diff --git a/src/Common/Storage/Commands.Storage/Common/Cmdlet/GetAzureStorageServiceLogging.cs b/src/Storage/Commands.Storage/Common/Cmdlet/GetAzureStorageServiceLogging.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/Cmdlet/GetAzureStorageServiceLogging.cs rename to src/Storage/Commands.Storage/Common/Cmdlet/GetAzureStorageServiceLogging.cs diff --git a/src/Common/Storage/Commands.Storage/Common/Cmdlet/GetAzureStorageServiceMetrics.cs b/src/Storage/Commands.Storage/Common/Cmdlet/GetAzureStorageServiceMetrics.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/Cmdlet/GetAzureStorageServiceMetrics.cs rename to src/Storage/Commands.Storage/Common/Cmdlet/GetAzureStorageServiceMetrics.cs diff --git a/src/Common/Storage/Commands.Storage/Common/Cmdlet/NewAzureStorageAccountSasToken.cs b/src/Storage/Commands.Storage/Common/Cmdlet/NewAzureStorageAccountSasToken.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/Cmdlet/NewAzureStorageAccountSasToken.cs rename to src/Storage/Commands.Storage/Common/Cmdlet/NewAzureStorageAccountSasToken.cs diff --git a/src/Common/Storage/Commands.Storage/Common/Cmdlet/NewAzureStorageContext.cs b/src/Storage/Commands.Storage/Common/Cmdlet/NewAzureStorageContext.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/Cmdlet/NewAzureStorageContext.cs rename to src/Storage/Commands.Storage/Common/Cmdlet/NewAzureStorageContext.cs diff --git a/src/Common/Storage/Commands.Storage/Common/Cmdlet/RemoveAzureStorageCORSRule.cs b/src/Storage/Commands.Storage/Common/Cmdlet/RemoveAzureStorageCORSRule.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/Cmdlet/RemoveAzureStorageCORSRule.cs rename to src/Storage/Commands.Storage/Common/Cmdlet/RemoveAzureStorageCORSRule.cs diff --git a/src/Common/Storage/Commands.Storage/Common/Cmdlet/SetAzureStorageCORSRule.cs b/src/Storage/Commands.Storage/Common/Cmdlet/SetAzureStorageCORSRule.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/Cmdlet/SetAzureStorageCORSRule.cs rename to src/Storage/Commands.Storage/Common/Cmdlet/SetAzureStorageCORSRule.cs diff --git a/src/Common/Storage/Commands.Storage/Common/Cmdlet/SetAzureStorageServiceLogging.cs b/src/Storage/Commands.Storage/Common/Cmdlet/SetAzureStorageServiceLogging.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/Cmdlet/SetAzureStorageServiceLogging.cs rename to src/Storage/Commands.Storage/Common/Cmdlet/SetAzureStorageServiceLogging.cs diff --git a/src/Common/Storage/Commands.Storage/Common/Cmdlet/SetAzureStorageServiceMetrics.cs b/src/Storage/Commands.Storage/Common/Cmdlet/SetAzureStorageServiceMetrics.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/Cmdlet/SetAzureStorageServiceMetrics.cs rename to src/Storage/Commands.Storage/Common/Cmdlet/SetAzureStorageServiceMetrics.cs diff --git a/src/Common/Storage/Commands.Storage/Common/CmdletOperationContext.cs b/src/Storage/Commands.Storage/Common/CmdletOperationContext.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/CmdletOperationContext.cs rename to src/Storage/Commands.Storage/Common/CmdletOperationContext.cs diff --git a/src/Common/Storage/Commands.Storage/Common/ConfirmTaskCompletionSource.cs b/src/Storage/Commands.Storage/Common/ConfirmTaskCompletionSource.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/ConfirmTaskCompletionSource.cs rename to src/Storage/Commands.Storage/Common/ConfirmTaskCompletionSource.cs diff --git a/src/Common/Storage/Commands.Storage/Common/DataManagementWrapper.cs b/src/Storage/Commands.Storage/Common/DataManagementWrapper.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/DataManagementWrapper.cs rename to src/Storage/Commands.Storage/Common/DataManagementWrapper.cs diff --git a/src/Common/Storage/Commands.Storage/Common/DataMovementTransferHelper.cs b/src/Storage/Commands.Storage/Common/DataMovementTransferHelper.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/DataMovementTransferHelper.cs rename to src/Storage/Commands.Storage/Common/DataMovementTransferHelper.cs diff --git a/src/Common/Storage/Commands.Storage/Common/ITransferManager.cs b/src/Storage/Commands.Storage/Common/ITransferManager.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/ITransferManager.cs rename to src/Storage/Commands.Storage/Common/ITransferManager.cs diff --git a/src/Common/Storage/Commands.Storage/Common/LimitedConcurrencyTaskScheduler.cs b/src/Storage/Commands.Storage/Common/LimitedConcurrencyTaskScheduler.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/LimitedConcurrencyTaskScheduler.cs rename to src/Storage/Commands.Storage/Common/LimitedConcurrencyTaskScheduler.cs diff --git a/src/Common/Storage/Commands.Storage/Common/NameUtil.cs b/src/Storage/Commands.Storage/Common/NameUtil.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/NameUtil.cs rename to src/Storage/Commands.Storage/Common/NameUtil.cs diff --git a/src/Common/Storage/Commands.Storage/Common/ResourceAlreadyExistException.cs b/src/Storage/Commands.Storage/Common/ResourceAlreadyExistException.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/ResourceAlreadyExistException.cs rename to src/Storage/Commands.Storage/Common/ResourceAlreadyExistException.cs diff --git a/src/Common/Storage/Commands.Storage/Common/ResourceNotFoundException.cs b/src/Storage/Commands.Storage/Common/ResourceNotFoundException.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/ResourceNotFoundException.cs rename to src/Storage/Commands.Storage/Common/ResourceNotFoundException.cs diff --git a/src/Common/Storage/Commands.Storage/Common/SasTokenHelper.cs b/src/Storage/Commands.Storage/Common/SasTokenHelper.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/SasTokenHelper.cs rename to src/Storage/Commands.Storage/Common/SasTokenHelper.cs diff --git a/src/Common/Storage/Commands.Storage/Common/ServiceMetricsType.cs b/src/Storage/Commands.Storage/Common/ServiceMetricsType.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/ServiceMetricsType.cs rename to src/Storage/Commands.Storage/Common/ServiceMetricsType.cs diff --git a/src/Common/Storage/Commands.Storage/Common/ServicePropertiesExtension.cs b/src/Storage/Commands.Storage/Common/ServicePropertiesExtension.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/ServicePropertiesExtension.cs rename to src/Storage/Commands.Storage/Common/ServicePropertiesExtension.cs diff --git a/src/Common/Storage/Commands.Storage/Common/StorageCloudCmdletBase.cs b/src/Storage/Commands.Storage/Common/StorageCloudCmdletBase.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/StorageCloudCmdletBase.cs rename to src/Storage/Commands.Storage/Common/StorageCloudCmdletBase.cs diff --git a/src/Common/Storage/Commands.Storage/Common/StorageExceptionUtil.cs b/src/Storage/Commands.Storage/Common/StorageExceptionUtil.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/StorageExceptionUtil.cs rename to src/Storage/Commands.Storage/Common/StorageExceptionUtil.cs diff --git a/src/Common/Storage/Commands.Storage/Common/StorageExtensions.cs b/src/Storage/Commands.Storage/Common/StorageExtensions.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/StorageExtensions.cs rename to src/Storage/Commands.Storage/Common/StorageExtensions.cs diff --git a/src/Common/Storage/Commands.Storage/Common/StorageNouns.cs b/src/Storage/Commands.Storage/Common/StorageNouns.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/StorageNouns.cs rename to src/Storage/Commands.Storage/Common/StorageNouns.cs diff --git a/src/Common/Storage/Commands.Storage/Common/StorageServiceType.cs b/src/Storage/Commands.Storage/Common/StorageServiceType.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/StorageServiceType.cs rename to src/Storage/Commands.Storage/Common/StorageServiceType.cs diff --git a/src/Common/Storage/Commands.Storage/Common/TaskOutputStream.cs b/src/Storage/Commands.Storage/Common/TaskOutputStream.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/TaskOutputStream.cs rename to src/Storage/Commands.Storage/Common/TaskOutputStream.cs diff --git a/src/Common/Storage/Commands.Storage/Common/TransferManagerFactory.cs b/src/Storage/Commands.Storage/Common/TransferManagerFactory.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/TransferManagerFactory.cs rename to src/Storage/Commands.Storage/Common/TransferManagerFactory.cs diff --git a/src/Common/Storage/Commands.Storage/Common/TransferProgressHandler.cs b/src/Storage/Commands.Storage/Common/TransferProgressHandler.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/TransferProgressHandler.cs rename to src/Storage/Commands.Storage/Common/TransferProgressHandler.cs diff --git a/src/Common/Storage/Commands.Storage/Common/Util.cs b/src/Storage/Commands.Storage/Common/Util.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Common/Util.cs rename to src/Storage/Commands.Storage/Common/Util.cs diff --git a/src/Common/Storage/Commands.Storage/File/AzureStorageFileCmdletBase.cs b/src/Storage/Commands.Storage/File/AzureStorageFileCmdletBase.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/File/AzureStorageFileCmdletBase.cs rename to src/Storage/Commands.Storage/File/AzureStorageFileCmdletBase.cs diff --git a/src/Common/Storage/Commands.Storage/File/AzureStorageFileException.cs b/src/Storage/Commands.Storage/File/AzureStorageFileException.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/File/AzureStorageFileException.cs rename to src/Storage/Commands.Storage/File/AzureStorageFileException.cs diff --git a/src/Common/Storage/Commands.Storage/File/Cmdlet/GetAzureStorageFile.cs b/src/Storage/Commands.Storage/File/Cmdlet/GetAzureStorageFile.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/File/Cmdlet/GetAzureStorageFile.cs rename to src/Storage/Commands.Storage/File/Cmdlet/GetAzureStorageFile.cs diff --git a/src/Common/Storage/Commands.Storage/File/Cmdlet/GetAzureStorageFileContent.cs b/src/Storage/Commands.Storage/File/Cmdlet/GetAzureStorageFileContent.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/File/Cmdlet/GetAzureStorageFileContent.cs rename to src/Storage/Commands.Storage/File/Cmdlet/GetAzureStorageFileContent.cs diff --git a/src/Common/Storage/Commands.Storage/File/Cmdlet/GetAzureStorageFileCopyState.cs b/src/Storage/Commands.Storage/File/Cmdlet/GetAzureStorageFileCopyState.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/File/Cmdlet/GetAzureStorageFileCopyState.cs rename to src/Storage/Commands.Storage/File/Cmdlet/GetAzureStorageFileCopyState.cs diff --git a/src/Common/Storage/Commands.Storage/File/Cmdlet/GetAzureStorageShare.cs b/src/Storage/Commands.Storage/File/Cmdlet/GetAzureStorageShare.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/File/Cmdlet/GetAzureStorageShare.cs rename to src/Storage/Commands.Storage/File/Cmdlet/GetAzureStorageShare.cs diff --git a/src/Common/Storage/Commands.Storage/File/Cmdlet/GetAzureStorageShareStoredAccessPolicy.cs b/src/Storage/Commands.Storage/File/Cmdlet/GetAzureStorageShareStoredAccessPolicy.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/File/Cmdlet/GetAzureStorageShareStoredAccessPolicy.cs rename to src/Storage/Commands.Storage/File/Cmdlet/GetAzureStorageShareStoredAccessPolicy.cs diff --git a/src/Common/Storage/Commands.Storage/File/Cmdlet/NewAzureStorageDirectory.cs b/src/Storage/Commands.Storage/File/Cmdlet/NewAzureStorageDirectory.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/File/Cmdlet/NewAzureStorageDirectory.cs rename to src/Storage/Commands.Storage/File/Cmdlet/NewAzureStorageDirectory.cs diff --git a/src/Common/Storage/Commands.Storage/File/Cmdlet/NewAzureStorageFileSasToken.cs b/src/Storage/Commands.Storage/File/Cmdlet/NewAzureStorageFileSasToken.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/File/Cmdlet/NewAzureStorageFileSasToken.cs rename to src/Storage/Commands.Storage/File/Cmdlet/NewAzureStorageFileSasToken.cs diff --git a/src/Common/Storage/Commands.Storage/File/Cmdlet/NewAzureStorageShare.cs b/src/Storage/Commands.Storage/File/Cmdlet/NewAzureStorageShare.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/File/Cmdlet/NewAzureStorageShare.cs rename to src/Storage/Commands.Storage/File/Cmdlet/NewAzureStorageShare.cs diff --git a/src/Common/Storage/Commands.Storage/File/Cmdlet/NewAzureStorageShareSasToken.cs b/src/Storage/Commands.Storage/File/Cmdlet/NewAzureStorageShareSasToken.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/File/Cmdlet/NewAzureStorageShareSasToken.cs rename to src/Storage/Commands.Storage/File/Cmdlet/NewAzureStorageShareSasToken.cs diff --git a/src/Common/Storage/Commands.Storage/File/Cmdlet/NewAzureStorageShareStoredAccessPolicy.cs b/src/Storage/Commands.Storage/File/Cmdlet/NewAzureStorageShareStoredAccessPolicy.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/File/Cmdlet/NewAzureStorageShareStoredAccessPolicy.cs rename to src/Storage/Commands.Storage/File/Cmdlet/NewAzureStorageShareStoredAccessPolicy.cs diff --git a/src/Common/Storage/Commands.Storage/File/Cmdlet/RemoveAzureStorageDirectory.cs b/src/Storage/Commands.Storage/File/Cmdlet/RemoveAzureStorageDirectory.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/File/Cmdlet/RemoveAzureStorageDirectory.cs rename to src/Storage/Commands.Storage/File/Cmdlet/RemoveAzureStorageDirectory.cs diff --git a/src/Common/Storage/Commands.Storage/File/Cmdlet/RemoveAzureStorageFile.cs b/src/Storage/Commands.Storage/File/Cmdlet/RemoveAzureStorageFile.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/File/Cmdlet/RemoveAzureStorageFile.cs rename to src/Storage/Commands.Storage/File/Cmdlet/RemoveAzureStorageFile.cs diff --git a/src/Common/Storage/Commands.Storage/File/Cmdlet/RemoveAzureStorageShare.cs b/src/Storage/Commands.Storage/File/Cmdlet/RemoveAzureStorageShare.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/File/Cmdlet/RemoveAzureStorageShare.cs rename to src/Storage/Commands.Storage/File/Cmdlet/RemoveAzureStorageShare.cs diff --git a/src/Common/Storage/Commands.Storage/File/Cmdlet/RemoveAzureStorageShareStoredAccessPolicy.cs b/src/Storage/Commands.Storage/File/Cmdlet/RemoveAzureStorageShareStoredAccessPolicy.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/File/Cmdlet/RemoveAzureStorageShareStoredAccessPolicy.cs rename to src/Storage/Commands.Storage/File/Cmdlet/RemoveAzureStorageShareStoredAccessPolicy.cs diff --git a/src/Common/Storage/Commands.Storage/File/Cmdlet/SetAzureStorageFileContent.cs b/src/Storage/Commands.Storage/File/Cmdlet/SetAzureStorageFileContent.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/File/Cmdlet/SetAzureStorageFileContent.cs rename to src/Storage/Commands.Storage/File/Cmdlet/SetAzureStorageFileContent.cs diff --git a/src/Common/Storage/Commands.Storage/File/Cmdlet/SetAzureStorageShareQuota.cs b/src/Storage/Commands.Storage/File/Cmdlet/SetAzureStorageShareQuota.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/File/Cmdlet/SetAzureStorageShareQuota.cs rename to src/Storage/Commands.Storage/File/Cmdlet/SetAzureStorageShareQuota.cs diff --git a/src/Common/Storage/Commands.Storage/File/Cmdlet/SetAzureStorageShareStoredAccessPolicy.cs b/src/Storage/Commands.Storage/File/Cmdlet/SetAzureStorageShareStoredAccessPolicy.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/File/Cmdlet/SetAzureStorageShareStoredAccessPolicy.cs rename to src/Storage/Commands.Storage/File/Cmdlet/SetAzureStorageShareStoredAccessPolicy.cs diff --git a/src/Common/Storage/Commands.Storage/File/Cmdlet/StartAzureStorageFileCopy.cs b/src/Storage/Commands.Storage/File/Cmdlet/StartAzureStorageFileCopy.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/File/Cmdlet/StartAzureStorageFileCopy.cs rename to src/Storage/Commands.Storage/File/Cmdlet/StartAzureStorageFileCopy.cs diff --git a/src/Common/Storage/Commands.Storage/File/Cmdlet/StopAzureStorageFileCopy.cs b/src/Storage/Commands.Storage/File/Cmdlet/StopAzureStorageFileCopy.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/File/Cmdlet/StopAzureStorageFileCopy.cs rename to src/Storage/Commands.Storage/File/Cmdlet/StopAzureStorageFileCopy.cs diff --git a/src/Common/Storage/Commands.Storage/File/Constants.cs b/src/Storage/Commands.Storage/File/Constants.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/File/Constants.cs rename to src/Storage/Commands.Storage/File/Constants.cs diff --git a/src/Common/Storage/Commands.Storage/File/ErrorIdConstants.cs b/src/Storage/Commands.Storage/File/ErrorIdConstants.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/File/ErrorIdConstants.cs rename to src/Storage/Commands.Storage/File/ErrorIdConstants.cs diff --git a/src/Common/Storage/Commands.Storage/File/NamingUtil.cs b/src/Storage/Commands.Storage/File/NamingUtil.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/File/NamingUtil.cs rename to src/Storage/Commands.Storage/File/NamingUtil.cs diff --git a/src/Common/Storage/Commands.Storage/File/StorageClientExtensions.cs b/src/Storage/Commands.Storage/File/StorageClientExtensions.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/File/StorageClientExtensions.cs rename to src/Storage/Commands.Storage/File/StorageClientExtensions.cs diff --git a/src/Common/Storage/Commands.Storage/File/StorageFileDataManagementCmdletBase.cs b/src/Storage/Commands.Storage/File/StorageFileDataManagementCmdletBase.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/File/StorageFileDataManagementCmdletBase.cs rename to src/Storage/Commands.Storage/File/StorageFileDataManagementCmdletBase.cs diff --git a/src/Common/Storage/Commands.Storage/MSSharedLibKey.snk b/src/Storage/Commands.Storage/MSSharedLibKey.snk similarity index 100% rename from src/Common/Storage/Commands.Storage/MSSharedLibKey.snk rename to src/Storage/Commands.Storage/MSSharedLibKey.snk diff --git a/src/Common/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.dll-Help.psd1 b/src/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.dll-Help.psd1 similarity index 100% rename from src/Common/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.dll-Help.psd1 rename to src/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.dll-Help.psd1 diff --git a/src/Common/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.dll-Help.xml b/src/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.dll-Help.xml similarity index 100% rename from src/Common/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.dll-Help.xml rename to src/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.dll-Help.xml diff --git a/src/Common/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.format.ps1xml b/src/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.format.ps1xml similarity index 100% rename from src/Common/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.format.ps1xml rename to src/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.format.ps1xml diff --git a/src/Common/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.types.ps1xml b/src/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.types.ps1xml similarity index 100% rename from src/Common/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.types.ps1xml rename to src/Storage/Commands.Storage/Microsoft.WindowsAzure.Commands.Storage.types.ps1xml diff --git a/src/Common/Storage/Commands.Storage/Model/Contract/IStorageBlobManagement.cs b/src/Storage/Commands.Storage/Model/Contract/IStorageBlobManagement.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Model/Contract/IStorageBlobManagement.cs rename to src/Storage/Commands.Storage/Model/Contract/IStorageBlobManagement.cs diff --git a/src/Common/Storage/Commands.Storage/Model/Contract/IStorageFileManagement.cs b/src/Storage/Commands.Storage/Model/Contract/IStorageFileManagement.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Model/Contract/IStorageFileManagement.cs rename to src/Storage/Commands.Storage/Model/Contract/IStorageFileManagement.cs diff --git a/src/Common/Storage/Commands.Storage/Model/Contract/IStorageManagement.cs b/src/Storage/Commands.Storage/Model/Contract/IStorageManagement.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Model/Contract/IStorageManagement.cs rename to src/Storage/Commands.Storage/Model/Contract/IStorageManagement.cs diff --git a/src/Common/Storage/Commands.Storage/Model/Contract/IStorageQueueManagement.cs b/src/Storage/Commands.Storage/Model/Contract/IStorageQueueManagement.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Model/Contract/IStorageQueueManagement.cs rename to src/Storage/Commands.Storage/Model/Contract/IStorageQueueManagement.cs diff --git a/src/Common/Storage/Commands.Storage/Model/Contract/IStorageTableManagement.cs b/src/Storage/Commands.Storage/Model/Contract/IStorageTableManagement.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Model/Contract/IStorageTableManagement.cs rename to src/Storage/Commands.Storage/Model/Contract/IStorageTableManagement.cs diff --git a/src/Common/Storage/Commands.Storage/Model/Contract/StorageBlobManagement.cs b/src/Storage/Commands.Storage/Model/Contract/StorageBlobManagement.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Model/Contract/StorageBlobManagement.cs rename to src/Storage/Commands.Storage/Model/Contract/StorageBlobManagement.cs diff --git a/src/Common/Storage/Commands.Storage/Model/Contract/StorageFileManagement.cs b/src/Storage/Commands.Storage/Model/Contract/StorageFileManagement.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Model/Contract/StorageFileManagement.cs rename to src/Storage/Commands.Storage/Model/Contract/StorageFileManagement.cs diff --git a/src/Common/Storage/Commands.Storage/Model/Contract/StorageQueueManagement.cs b/src/Storage/Commands.Storage/Model/Contract/StorageQueueManagement.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Model/Contract/StorageQueueManagement.cs rename to src/Storage/Commands.Storage/Model/Contract/StorageQueueManagement.cs diff --git a/src/Common/Storage/Commands.Storage/Model/Contract/StorageTableManagement.cs b/src/Storage/Commands.Storage/Model/Contract/StorageTableManagement.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Model/Contract/StorageTableManagement.cs rename to src/Storage/Commands.Storage/Model/Contract/StorageTableManagement.cs diff --git a/src/Common/Storage/Commands.Storage/Model/ResourceModel/AzureStorageBase.cs b/src/Storage/Commands.Storage/Model/ResourceModel/AzureStorageBase.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Model/ResourceModel/AzureStorageBase.cs rename to src/Storage/Commands.Storage/Model/ResourceModel/AzureStorageBase.cs diff --git a/src/Common/Storage/Commands.Storage/Model/ResourceModel/AzureStorageBlob.cs b/src/Storage/Commands.Storage/Model/ResourceModel/AzureStorageBlob.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Model/ResourceModel/AzureStorageBlob.cs rename to src/Storage/Commands.Storage/Model/ResourceModel/AzureStorageBlob.cs diff --git a/src/Common/Storage/Commands.Storage/Model/ResourceModel/AzureStorageContainer.cs b/src/Storage/Commands.Storage/Model/ResourceModel/AzureStorageContainer.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Model/ResourceModel/AzureStorageContainer.cs rename to src/Storage/Commands.Storage/Model/ResourceModel/AzureStorageContainer.cs diff --git a/src/Common/Storage/Commands.Storage/Model/ResourceModel/AzureStorageQueue.cs b/src/Storage/Commands.Storage/Model/ResourceModel/AzureStorageQueue.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Model/ResourceModel/AzureStorageQueue.cs rename to src/Storage/Commands.Storage/Model/ResourceModel/AzureStorageQueue.cs diff --git a/src/Common/Storage/Commands.Storage/Model/ResourceModel/AzureStorageTable.cs b/src/Storage/Commands.Storage/Model/ResourceModel/AzureStorageTable.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Model/ResourceModel/AzureStorageTable.cs rename to src/Storage/Commands.Storage/Model/ResourceModel/AzureStorageTable.cs diff --git a/src/Common/Storage/Commands.Storage/Model/ResourceModel/PSCorsRule.cs b/src/Storage/Commands.Storage/Model/ResourceModel/PSCorsRule.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Model/ResourceModel/PSCorsRule.cs rename to src/Storage/Commands.Storage/Model/ResourceModel/PSCorsRule.cs diff --git a/src/Common/Storage/Commands.Storage/Properties/AssemblyInfo.cs b/src/Storage/Commands.Storage/Properties/AssemblyInfo.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Properties/AssemblyInfo.cs rename to src/Storage/Commands.Storage/Properties/AssemblyInfo.cs diff --git a/src/Common/Storage/Commands.Storage/Queue/Cmdlet/GetAzureStorageQueue.cs b/src/Storage/Commands.Storage/Queue/Cmdlet/GetAzureStorageQueue.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Queue/Cmdlet/GetAzureStorageQueue.cs rename to src/Storage/Commands.Storage/Queue/Cmdlet/GetAzureStorageQueue.cs diff --git a/src/Common/Storage/Commands.Storage/Queue/Cmdlet/GetAzureStorageQueueStoredAccessPolicy.cs b/src/Storage/Commands.Storage/Queue/Cmdlet/GetAzureStorageQueueStoredAccessPolicy.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Queue/Cmdlet/GetAzureStorageQueueStoredAccessPolicy.cs rename to src/Storage/Commands.Storage/Queue/Cmdlet/GetAzureStorageQueueStoredAccessPolicy.cs diff --git a/src/Common/Storage/Commands.Storage/Queue/Cmdlet/NewAzureStorageQueue.cs b/src/Storage/Commands.Storage/Queue/Cmdlet/NewAzureStorageQueue.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Queue/Cmdlet/NewAzureStorageQueue.cs rename to src/Storage/Commands.Storage/Queue/Cmdlet/NewAzureStorageQueue.cs diff --git a/src/Common/Storage/Commands.Storage/Queue/Cmdlet/NewAzureStorageQueueSasToken.cs b/src/Storage/Commands.Storage/Queue/Cmdlet/NewAzureStorageQueueSasToken.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Queue/Cmdlet/NewAzureStorageQueueSasToken.cs rename to src/Storage/Commands.Storage/Queue/Cmdlet/NewAzureStorageQueueSasToken.cs diff --git a/src/Common/Storage/Commands.Storage/Queue/Cmdlet/NewAzureStorageQueueStoredAccessPolicy.cs b/src/Storage/Commands.Storage/Queue/Cmdlet/NewAzureStorageQueueStoredAccessPolicy.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Queue/Cmdlet/NewAzureStorageQueueStoredAccessPolicy.cs rename to src/Storage/Commands.Storage/Queue/Cmdlet/NewAzureStorageQueueStoredAccessPolicy.cs diff --git a/src/Common/Storage/Commands.Storage/Queue/Cmdlet/RemoveAzureStorageQueue.cs b/src/Storage/Commands.Storage/Queue/Cmdlet/RemoveAzureStorageQueue.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Queue/Cmdlet/RemoveAzureStorageQueue.cs rename to src/Storage/Commands.Storage/Queue/Cmdlet/RemoveAzureStorageQueue.cs diff --git a/src/Common/Storage/Commands.Storage/Queue/Cmdlet/RemoveAzureStorageQueueStoredAccessPolicy.cs b/src/Storage/Commands.Storage/Queue/Cmdlet/RemoveAzureStorageQueueStoredAccessPolicy.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Queue/Cmdlet/RemoveAzureStorageQueueStoredAccessPolicy.cs rename to src/Storage/Commands.Storage/Queue/Cmdlet/RemoveAzureStorageQueueStoredAccessPolicy.cs diff --git a/src/Common/Storage/Commands.Storage/Queue/Cmdlet/SetAzureStorageQueueStoredAccessPolicy.cs b/src/Storage/Commands.Storage/Queue/Cmdlet/SetAzureStorageQueueStoredAccessPolicy.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Queue/Cmdlet/SetAzureStorageQueueStoredAccessPolicy.cs rename to src/Storage/Commands.Storage/Queue/Cmdlet/SetAzureStorageQueueStoredAccessPolicy.cs diff --git a/src/Common/Storage/Commands.Storage/Queue/StorageQueueBaseCmdlet.cs b/src/Storage/Commands.Storage/Queue/StorageQueueBaseCmdlet.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Queue/StorageQueueBaseCmdlet.cs rename to src/Storage/Commands.Storage/Queue/StorageQueueBaseCmdlet.cs diff --git a/src/Common/Storage/Commands.Storage/Resources.Designer.cs b/src/Storage/Commands.Storage/Resources.Designer.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Resources.Designer.cs rename to src/Storage/Commands.Storage/Resources.Designer.cs diff --git a/src/Common/Storage/Commands.Storage/Resources.resx b/src/Storage/Commands.Storage/Resources.resx similarity index 100% rename from src/Common/Storage/Commands.Storage/Resources.resx rename to src/Storage/Commands.Storage/Resources.resx diff --git a/src/Common/Storage/Commands.Storage/Table/Cmdlet/GetAzureStorageTableStoredAccessPolicy.cs b/src/Storage/Commands.Storage/Table/Cmdlet/GetAzureStorageTableStoredAccessPolicy.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Table/Cmdlet/GetAzureStorageTableStoredAccessPolicy.cs rename to src/Storage/Commands.Storage/Table/Cmdlet/GetAzureStorageTableStoredAccessPolicy.cs diff --git a/src/Common/Storage/Commands.Storage/Table/Cmdlet/GetStorageAzureTable.cs b/src/Storage/Commands.Storage/Table/Cmdlet/GetStorageAzureTable.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Table/Cmdlet/GetStorageAzureTable.cs rename to src/Storage/Commands.Storage/Table/Cmdlet/GetStorageAzureTable.cs diff --git a/src/Common/Storage/Commands.Storage/Table/Cmdlet/NewAzureStorageTableSasToken.cs b/src/Storage/Commands.Storage/Table/Cmdlet/NewAzureStorageTableSasToken.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Table/Cmdlet/NewAzureStorageTableSasToken.cs rename to src/Storage/Commands.Storage/Table/Cmdlet/NewAzureStorageTableSasToken.cs diff --git a/src/Common/Storage/Commands.Storage/Table/Cmdlet/NewAzureStorageTableStoredAccessPolicy.cs b/src/Storage/Commands.Storage/Table/Cmdlet/NewAzureStorageTableStoredAccessPolicy.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Table/Cmdlet/NewAzureStorageTableStoredAccessPolicy.cs rename to src/Storage/Commands.Storage/Table/Cmdlet/NewAzureStorageTableStoredAccessPolicy.cs diff --git a/src/Common/Storage/Commands.Storage/Table/Cmdlet/NewStorageAzureTable.cs b/src/Storage/Commands.Storage/Table/Cmdlet/NewStorageAzureTable.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Table/Cmdlet/NewStorageAzureTable.cs rename to src/Storage/Commands.Storage/Table/Cmdlet/NewStorageAzureTable.cs diff --git a/src/Common/Storage/Commands.Storage/Table/Cmdlet/RemoveAzureStorageTableStoredAccessPolicy.cs b/src/Storage/Commands.Storage/Table/Cmdlet/RemoveAzureStorageTableStoredAccessPolicy.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Table/Cmdlet/RemoveAzureStorageTableStoredAccessPolicy.cs rename to src/Storage/Commands.Storage/Table/Cmdlet/RemoveAzureStorageTableStoredAccessPolicy.cs diff --git a/src/Common/Storage/Commands.Storage/Table/Cmdlet/RemoveStorageAzureTable.cs b/src/Storage/Commands.Storage/Table/Cmdlet/RemoveStorageAzureTable.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Table/Cmdlet/RemoveStorageAzureTable.cs rename to src/Storage/Commands.Storage/Table/Cmdlet/RemoveStorageAzureTable.cs diff --git a/src/Common/Storage/Commands.Storage/Table/Cmdlet/SetAzureStorageTableStoredAccessPolicy.cs b/src/Storage/Commands.Storage/Table/Cmdlet/SetAzureStorageTableStoredAccessPolicy.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Table/Cmdlet/SetAzureStorageTableStoredAccessPolicy.cs rename to src/Storage/Commands.Storage/Table/Cmdlet/SetAzureStorageTableStoredAccessPolicy.cs diff --git a/src/Common/Storage/Commands.Storage/Table/StorageCloudTableCmdletBase.cs b/src/Storage/Commands.Storage/Table/StorageCloudTableCmdletBase.cs similarity index 100% rename from src/Common/Storage/Commands.Storage/Table/StorageCloudTableCmdletBase.cs rename to src/Storage/Commands.Storage/Table/StorageCloudTableCmdletBase.cs diff --git a/src/Common/Storage/Commands.Storage/packages.config b/src/Storage/Commands.Storage/packages.config similarity index 100% rename from src/Common/Storage/Commands.Storage/packages.config rename to src/Storage/Commands.Storage/packages.config diff --git a/src/Storage/NuGet.Config b/src/Storage/NuGet.Config new file mode 100644 index 000000000000..d151eea23028 --- /dev/null +++ b/src/Storage/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/Storage/Storage.sln b/src/Storage/Storage.sln new file mode 100644 index 000000000000..f17232666274 --- /dev/null +++ b/src/Storage/Storage.sln @@ -0,0 +1,183 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.40629.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage", "Commands.Storage\Commands.Storage.csproj", "{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage.MsTest2", "Commands.Storage.MsTest2\Commands.Storage.MsTest2.csproj", "{9D5A40CA-5594-4F5C-8230-7ADF7CC0558E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage.MsTestLib", "Commands.Storage.MsTestLib\Commands.Storage.MsTestLib.csproj", "{CE97967B-7479-43B9-9561-776232AC5D47}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage.ScenarioTest", "Commands.Storage.ScenarioTest\Commands.Storage.ScenarioTest.csproj", "{4BC0E3D3-6EDD-43AA-8F15-DCFED8ACC93D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{710436A9-30AC-4A4C-9BE5-E078C83803FB}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage.StorageTestLib", "Commands.Storage.StorageTestLib\Commands.Storage.StorageTestLib.csproj", "{0A513849-2690-4D07-8DE7-0ACE39645D12}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage.Test", "Commands.Storage.Test\Commands.Storage.Test.csproj", "{D6F470A6-7395-4B8B-9D29-44DF0EC8F624}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Storage", "..\Common\Commands.Common.Storage\Commands.Common.Storage.csproj", "{65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Authentication", "..\Common\Commands.Common.Authentication\Commands.Common.Authentication.csproj", "{D3804B64-C0D3-48F8-82EC-1F632F833C9E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement.Common", "..\ServiceManagement\Common\Commands.ServiceManagement.Common\Commands.ServiceManagement.Common.csproj", "{CFF09E81-1E31-444E-B4D4-A21E946C29E2}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.Common", "..\Common\Commands.ScenarioTests.Common\Commands.ScenarioTests.Common.csproj", "{C1BDA476-A5CC-4394-914D-48B0EC31A710}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Test", "..\ServiceManagement\Common\Commands.Common.Test\Commands.Common.Test.csproj", "{3B48A77B-5956-4A62-9081-92BA04B02B27}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTest", "..\ServiceManagement\Common\Commands.ScenarioTest\Commands.ScenarioTest.csproj", "{A3965B66-5A3E-4B8C-9574-28E5958D4828}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands", "..\ServiceManagement\Services\Commands\Commands.csproj", "{CD5AA507-F5EF-473D-855B-84B91A1ABE54}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Utilities", "..\ServiceManagement\Services\Commands.Utilities\Commands.Utilities.csproj", "{4900EC4E-8DEB-4412-9108-0BC52F81D457}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Test.Utilities", "..\ServiceManagement\Services\Commands.Test.Utilities\Commands.Test.Utilities.csproj", "{BC420543-C04E-4BF3-96E1-CD81B823BDD7}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement.Test", "..\ServiceManagement\Compute\Commands.ServiceManagement.Test\Commands.ServiceManagement.Test.csproj", "{58A78F29-8C0C-4A5E-893E-3953C0F29C8A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement", "..\ServiceManagement\Compute\Commands.ServiceManagement\Commands.ServiceManagement.csproj", "{E1CA72BA-8374-45F6-904D-FD34ECDF5B6F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sync", "..\ServiceManagement\Compute\Sync\Sync.csproj", "{73820CBC-F4EB-4C5E-B4F0-CC4A93FBF157}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VhdManagement", "..\ServiceManagement\Compute\VhdManagement\VhdManagement.csproj", "{80496B7B-068A-4A1E-B0BB-4B1FFF3FA616}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile", "..\ServiceManagement\Profile\Commands.Profile\Commands.Profile.csproj", "{C60342B1-47D3-4A0E-8081-9B97CE60B7AF}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement.Network", "..\ServiceManagement\Network\Commands.Network\Commands.ServiceManagement.Network.csproj", "{40FEE0BB-FD45-4EFC-85BC-0D602A6892C4}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement.PlatformImageRepository", "..\ServiceManagement\Compute\Commands.ServiceManagement.PlatformImageRepository\Commands.ServiceManagement.PlatformImageRepository.csproj", "{6478FA8B-3801-4863-8591-87F0855D5C82}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement.Preview", "..\ServiceManagement\Compute\Commands.ServiceManagement.Preview\Commands.ServiceManagement.Preview.csproj", "{E895BBDA-0B06-46AB-B909-9B97B3ECE47E}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}.Release|Any CPU.Build.0 = Release|Any CPU + {9D5A40CA-5594-4F5C-8230-7ADF7CC0558E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9D5A40CA-5594-4F5C-8230-7ADF7CC0558E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9D5A40CA-5594-4F5C-8230-7ADF7CC0558E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9D5A40CA-5594-4F5C-8230-7ADF7CC0558E}.Release|Any CPU.Build.0 = Release|Any CPU + {CE97967B-7479-43B9-9561-776232AC5D47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CE97967B-7479-43B9-9561-776232AC5D47}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CE97967B-7479-43B9-9561-776232AC5D47}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CE97967B-7479-43B9-9561-776232AC5D47}.Release|Any CPU.Build.0 = Release|Any CPU + {4BC0E3D3-6EDD-43AA-8F15-DCFED8ACC93D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4BC0E3D3-6EDD-43AA-8F15-DCFED8ACC93D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4BC0E3D3-6EDD-43AA-8F15-DCFED8ACC93D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4BC0E3D3-6EDD-43AA-8F15-DCFED8ACC93D}.Release|Any CPU.Build.0 = Release|Any CPU + {0A513849-2690-4D07-8DE7-0ACE39645D12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0A513849-2690-4D07-8DE7-0ACE39645D12}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0A513849-2690-4D07-8DE7-0ACE39645D12}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0A513849-2690-4D07-8DE7-0ACE39645D12}.Release|Any CPU.Build.0 = Release|Any CPU + {D6F470A6-7395-4B8B-9D29-44DF0EC8F624}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D6F470A6-7395-4B8B-9D29-44DF0EC8F624}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D6F470A6-7395-4B8B-9D29-44DF0EC8F624}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D6F470A6-7395-4B8B-9D29-44DF0EC8F624}.Release|Any CPU.Build.0 = Release|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Release|Any CPU.Build.0 = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.Build.0 = Release|Any CPU + {D3804B64-C0D3-48F8-82EC-1F632F833C9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D3804B64-C0D3-48F8-82EC-1F632F833C9E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D3804B64-C0D3-48F8-82EC-1F632F833C9E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D3804B64-C0D3-48F8-82EC-1F632F833C9E}.Release|Any CPU.Build.0 = Release|Any CPU + {CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Release|Any CPU.Build.0 = Release|Any CPU + {C1BDA476-A5CC-4394-914D-48B0EC31A710}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C1BDA476-A5CC-4394-914D-48B0EC31A710}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C1BDA476-A5CC-4394-914D-48B0EC31A710}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C1BDA476-A5CC-4394-914D-48B0EC31A710}.Release|Any CPU.Build.0 = Release|Any CPU + {3B48A77B-5956-4A62-9081-92BA04B02B27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3B48A77B-5956-4A62-9081-92BA04B02B27}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3B48A77B-5956-4A62-9081-92BA04B02B27}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3B48A77B-5956-4A62-9081-92BA04B02B27}.Release|Any CPU.Build.0 = Release|Any CPU + {A3965B66-5A3E-4B8C-9574-28E5958D4828}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A3965B66-5A3E-4B8C-9574-28E5958D4828}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A3965B66-5A3E-4B8C-9574-28E5958D4828}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A3965B66-5A3E-4B8C-9574-28E5958D4828}.Release|Any CPU.Build.0 = Release|Any CPU + {CD5AA507-F5EF-473D-855B-84B91A1ABE54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CD5AA507-F5EF-473D-855B-84B91A1ABE54}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CD5AA507-F5EF-473D-855B-84B91A1ABE54}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CD5AA507-F5EF-473D-855B-84B91A1ABE54}.Release|Any CPU.Build.0 = Release|Any CPU + {4900EC4E-8DEB-4412-9108-0BC52F81D457}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4900EC4E-8DEB-4412-9108-0BC52F81D457}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4900EC4E-8DEB-4412-9108-0BC52F81D457}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4900EC4E-8DEB-4412-9108-0BC52F81D457}.Release|Any CPU.Build.0 = Release|Any CPU + {BC420543-C04E-4BF3-96E1-CD81B823BDD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BC420543-C04E-4BF3-96E1-CD81B823BDD7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BC420543-C04E-4BF3-96E1-CD81B823BDD7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BC420543-C04E-4BF3-96E1-CD81B823BDD7}.Release|Any CPU.Build.0 = Release|Any CPU + {58A78F29-8C0C-4A5E-893E-3953C0F29C8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {58A78F29-8C0C-4A5E-893E-3953C0F29C8A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {58A78F29-8C0C-4A5E-893E-3953C0F29C8A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {58A78F29-8C0C-4A5E-893E-3953C0F29C8A}.Release|Any CPU.Build.0 = Release|Any CPU + {E1CA72BA-8374-45F6-904D-FD34ECDF5B6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E1CA72BA-8374-45F6-904D-FD34ECDF5B6F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E1CA72BA-8374-45F6-904D-FD34ECDF5B6F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E1CA72BA-8374-45F6-904D-FD34ECDF5B6F}.Release|Any CPU.Build.0 = Release|Any CPU + {73820CBC-F4EB-4C5E-B4F0-CC4A93FBF157}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {73820CBC-F4EB-4C5E-B4F0-CC4A93FBF157}.Debug|Any CPU.Build.0 = Debug|Any CPU + {73820CBC-F4EB-4C5E-B4F0-CC4A93FBF157}.Release|Any CPU.ActiveCfg = Release|Any CPU + {73820CBC-F4EB-4C5E-B4F0-CC4A93FBF157}.Release|Any CPU.Build.0 = Release|Any CPU + {80496B7B-068A-4A1E-B0BB-4B1FFF3FA616}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {80496B7B-068A-4A1E-B0BB-4B1FFF3FA616}.Debug|Any CPU.Build.0 = Debug|Any CPU + {80496B7B-068A-4A1E-B0BB-4B1FFF3FA616}.Release|Any CPU.ActiveCfg = Release|Any CPU + {80496B7B-068A-4A1E-B0BB-4B1FFF3FA616}.Release|Any CPU.Build.0 = Release|Any CPU + {C60342B1-47D3-4A0E-8081-9B97CE60B7AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C60342B1-47D3-4A0E-8081-9B97CE60B7AF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C60342B1-47D3-4A0E-8081-9B97CE60B7AF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C60342B1-47D3-4A0E-8081-9B97CE60B7AF}.Release|Any CPU.Build.0 = Release|Any CPU + {40FEE0BB-FD45-4EFC-85BC-0D602A6892C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {40FEE0BB-FD45-4EFC-85BC-0D602A6892C4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {40FEE0BB-FD45-4EFC-85BC-0D602A6892C4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {40FEE0BB-FD45-4EFC-85BC-0D602A6892C4}.Release|Any CPU.Build.0 = Release|Any CPU + {6478FA8B-3801-4863-8591-87F0855D5C82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6478FA8B-3801-4863-8591-87F0855D5C82}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6478FA8B-3801-4863-8591-87F0855D5C82}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6478FA8B-3801-4863-8591-87F0855D5C82}.Release|Any CPU.Build.0 = Release|Any CPU + {E895BBDA-0B06-46AB-B909-9B97B3ECE47E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E895BBDA-0B06-46AB-B909-9B97B3ECE47E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E895BBDA-0B06-46AB-B909-9B97B3ECE47E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E895BBDA-0B06-46AB-B909-9B97B3ECE47E}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {9D5A40CA-5594-4F5C-8230-7ADF7CC0558E} = {710436A9-30AC-4A4C-9BE5-E078C83803FB} + {CE97967B-7479-43B9-9561-776232AC5D47} = {710436A9-30AC-4A4C-9BE5-E078C83803FB} + {4BC0E3D3-6EDD-43AA-8F15-DCFED8ACC93D} = {710436A9-30AC-4A4C-9BE5-E078C83803FB} + {0A513849-2690-4D07-8DE7-0ACE39645D12} = {710436A9-30AC-4A4C-9BE5-E078C83803FB} + {D6F470A6-7395-4B8B-9D29-44DF0EC8F624} = {710436A9-30AC-4A4C-9BE5-E078C83803FB} + {C1BDA476-A5CC-4394-914D-48B0EC31A710} = {710436A9-30AC-4A4C-9BE5-E078C83803FB} + {3B48A77B-5956-4A62-9081-92BA04B02B27} = {710436A9-30AC-4A4C-9BE5-E078C83803FB} + {A3965B66-5A3E-4B8C-9574-28E5958D4828} = {710436A9-30AC-4A4C-9BE5-E078C83803FB} + {CD5AA507-F5EF-473D-855B-84B91A1ABE54} = {710436A9-30AC-4A4C-9BE5-E078C83803FB} + {4900EC4E-8DEB-4412-9108-0BC52F81D457} = {710436A9-30AC-4A4C-9BE5-E078C83803FB} + {BC420543-C04E-4BF3-96E1-CD81B823BDD7} = {710436A9-30AC-4A4C-9BE5-E078C83803FB} + {58A78F29-8C0C-4A5E-893E-3953C0F29C8A} = {710436A9-30AC-4A4C-9BE5-E078C83803FB} + {E1CA72BA-8374-45F6-904D-FD34ECDF5B6F} = {710436A9-30AC-4A4C-9BE5-E078C83803FB} + {73820CBC-F4EB-4C5E-B4F0-CC4A93FBF157} = {710436A9-30AC-4A4C-9BE5-E078C83803FB} + {80496B7B-068A-4A1E-B0BB-4B1FFF3FA616} = {710436A9-30AC-4A4C-9BE5-E078C83803FB} + {C60342B1-47D3-4A0E-8081-9B97CE60B7AF} = {710436A9-30AC-4A4C-9BE5-E078C83803FB} + {40FEE0BB-FD45-4EFC-85BC-0D602A6892C4} = {710436A9-30AC-4A4C-9BE5-E078C83803FB} + {6478FA8B-3801-4863-8591-87F0855D5C82} = {710436A9-30AC-4A4C-9BE5-E078C83803FB} + {E895BBDA-0B06-46AB-B909-9B97B3ECE47E} = {710436A9-30AC-4A4C-9BE5-E078C83803FB} + EndGlobalSection +EndGlobal