Skip to content

HPF PR: dev <- AzureRT:dev #503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Mar 29, 2016
Merged

HPF PR: dev <- AzureRT:dev #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
74436c7
Merge pull request #164 from huangpf/dev
huangpf Mar 4, 2016
f9fdbbb
Merge pull request #168 from huangpf/dev
huangpf Mar 8, 2016
de850fc
Merge pull request #169 from huangpf/dev
huangpf Mar 9, 2016
3754b87
Merge pull request #171 from huangpf/dev
huangpf Mar 9, 2016
f410a51
Merge pull request #173 from huangpf/dev
huangpf Mar 12, 2016
3776d68
Merge pull request #177 from huangpf/dev
huangpf Mar 16, 2016
c067e44
Merge pull request #180 from huangpf/dev
huangpf Mar 17, 2016
ab1213e
Merge pull request #182 from huangpf/dev
huangpf Mar 18, 2016
4917128
Merge pull request #185 from huangpf/dev
huangpf Mar 18, 2016
d7efa15
Merge pull request #187 from huangpf/dev
huangpf Mar 19, 2016
1bfef10
Merge pull request #192 from huangpf/dev
huangpf Mar 21, 2016
560dc20
Merge pull request #194 from huangpf/dev
huangpf Mar 24, 2016
f8388a8
Merge pull request #195 from huangpf/dev
huangpf Mar 24, 2016
86d716b
Fix ServiceManagement tests
hyonholee Mar 29, 2016
669fea3
Merge pull request #197 from hyonholee/dev
AzureRT Mar 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/AzureRT.testsettings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<Description>These are test settings for AzureRT test run.</Description>
<Deployment>
<DeploymentItem filename="ServiceManagement\Compute\Commands.ServiceManagement.Test\Resources\" />
<DeploymentItem filename="Package\Debug\" />
<DeploymentItem filename="ServiceManagement\Compute\Commands.ServiceManagement.Test\bin\Debug\" />
</Deployment>
<Execution parallelTestCount="0">
<Timeouts testTimeout="3000000" />
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager.ForRefactoringOnly.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.Reso
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
Expand Down
22 changes: 6 additions & 16 deletions ...nds.ServiceManagement.Test/FunctionalTests/IaasCmdletInfo/WindowsAzurePowershellCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,30 +19,20 @@ namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests
{
public class WindowsAzurePowershellCmdlet : PowershellCmdlet
{
private static readonly string[] modules = new[]
{
Path.Combine(Utilities.windowsAzurePowershellPath, Utilities.windowsAzurePowershellServiceModule)
};

public WindowsAzurePowershellCmdlet(CmdletsInfo cmdlet) : base(cmdlet, ConstructModules())
{
}

public static string[] Modules
{
get
{
return modules;
}
}

private static PowershellModule[] ConstructModules()
{
var modules = new[]
{
new PowershellModule(Utilities.windowsAzurePowershellServiceModule, Utilities.windowsAzurePowershellPath),
new PowershellModule(Utilities.AzurePowershellModuleServiceManagementPirModule, Utilities.windowsAzurePowershellDefaultPath),
new PowershellModule(Utilities.AzurePowershellModuleServiceManagementPreviewModule, Utilities.windowsAzurePowershellDefaultPath),
new PowershellModule(Utilities.AzurePowershellProfileModule, Utilities.AzurePowershellPath),
new PowershellModule(Utilities.AzurePowershellServiceManagementModule, Utilities.AzurePowershellPath),
new PowershellModule(Utilities.AzurePowershellCommandsModule, Utilities.AzurePowershellPath),
new PowershellModule(Utilities.AzurePowershellStorageModule, Utilities.AzurePowershellPath),
new PowershellModule(Utilities.AzurePowershellModuleServiceManagementPirModule, Utilities.AzurePowershellPath),
new PowershellModule(Utilities.AzurePowershellModuleServiceManagementPreviewModule, Utilities.AzurePowershellPath),
};
return modules;
}
Expand Down
18 changes: 4 additions & 14 deletions ...nds.ServiceManagement.Test/FunctionalTests/IaasCmdletInfo/WindowsAzurePowershellScript.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,31 +20,21 @@ namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests
{
public class WindowsAzurePowershellScript : PowershellCmdletScript
{
private static readonly string[] modules = new[]
{
Path.Combine(Utilities.windowsAzurePowershellPath, Utilities.windowsAzurePowershellServiceModule)
};

public WindowsAzurePowershellScript(List<string> cmdlets) : base(cmdlets, ConstructModules())
{
}
public WindowsAzurePowershellScript() : base(ConstructModules())
{
}

public static string[] Modules
{
get
{
return modules;
}
}

private static PowershellModule[] ConstructModules()
{
return new[]
{
new PowershellModule(Utilities.windowsAzurePowershellServiceModule, Utilities.windowsAzurePowershellPath)
new PowershellModule(Utilities.AzurePowershellProfileModule, Utilities.AzurePowershellPath),
new PowershellModule(Utilities.AzurePowershellCommandsModule, Utilities.AzurePowershellPath),
new PowershellModule(Utilities.AzurePowershellStorageModule, Utilities.AzurePowershellPath),
new PowershellModule(Utilities.AzurePowershellServiceManagementModule, Utilities.AzurePowershellPath)
};
}
}
Expand Down
8 changes: 5 additions & 3 deletions src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/Utilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,12 @@ internal class Utilities
{
#region Constants

public static string windowsAzurePowershellPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ServiceManagement\\Azure");
public static string windowsAzurePowershellDefaultPath = AppDomain.CurrentDomain.BaseDirectory;
public static string AzurePowershellPath = AppDomain.CurrentDomain.BaseDirectory;

public const string windowsAzurePowershellServiceModule = "Azure.psd1";
public const string AzurePowershellProfileModule = "Microsoft.WindowsAzure.Commands.Profile.dll";
public const string AzurePowershellCommandsModule = "Microsoft.WindowsAzure.Commands.dll";
public const string AzurePowershellStorageModule = "Microsoft.WindowsAzure.Commands.Storage.dll";
public const string AzurePowershellServiceManagementModule = "Microsoft.WindowsAzure.Commands.ServiceManagement.dll";
public const string AzurePowershellModuleServiceManagementPirModule = "Microsoft.WindowsAzure.Commands.ServiceManagement.PlatformImageRepository.dll";
public const string AzurePowershellModuleServiceManagementPreviewModule = "Microsoft.WindowsAzure.Commands.ServiceManagement.Preview.dll";

Expand Down
Binary file removed ...e/Commands.ServiceManagement.Test/Microsoft.WindowsAzure.Management.ServiceManagement.dll
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion src/ServiceManagement/Services/Commands.Utilities/ServiceManagementStartup.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ $script:aliases = @{
"Remove-WAPackSBNamespace" = "Remove-AzureSBNamespace";

# Compute aliases
"New-AzureDns" = "New-AzureDnsConfig";
"New-AzureDnsConfig" = "New-AzureDns";

# HDInsight aliases
"Invoke-Hive" = "Invoke-AzureHDInsightHiveJob";
Expand Down