Merge pull request #4 from Azure/maddieclayton-patch-1

Maddie Clayton · web-flow · commit 69dc99a84d4c · 2018-08-16T15:25:51.000-07:00
Enable tests to run with "AzureRm" prefix in NetCore
diff --git a/src/ScenarioTest.ResourceManager/EnvironmentSetupHelper.cs b/src/ScenarioTest.ResourceManager/EnvironmentSetupHelper.cs
@@ -667,6 +667,13 @@ private void SetupPowerShellModules(System.Management.Automation.PowerShell powe
             foreach (string moduleName in modules)
             {
                 powershell.AddScript(string.Format("Import-Module \"{0}\"", moduleName.AsAbsoluteLocation()));
+                if (moduleName.EndsWith(".psd1"))
+                {
+#if NETSTANDARD
+                    var moduleShortName = moduleName.Split(new string[] { "\\" }, StringSplitOptions.None).Last().Split(new string[] { "/" }, StringSplitOptions.None).Last();
+                    powershell.AddScript("Enable-AzureRmAlias -Module " + moduleShortName.Substring(0, moduleShortName.Length - 5));
+#endif
+                }
             }
 
             powershell.AddScript(

Original file line number	Diff line number	Diff line change
`@@ -667,6 +667,13 @@ private void SetupPowerShellModules(System.Management.Automation.PowerShell powe`
`667`	`667`	`foreach (string moduleName in modules)`
`668`	`668`	`{`
`669`	`669`	`powershell.AddScript(string.Format("Import-Module \"{0}\"", moduleName.AsAbsoluteLocation()));`
	`670`	`+ if (moduleName.EndsWith(".psd1"))`
	`671`	`+ {`
	`672`	`+#if NETSTANDARD`
	`673`	`+ var moduleShortName = moduleName.Split(new string[] { "\\" }, StringSplitOptions.None).Last().Split(new string[] { "/" }, StringSplitOptions.None).Last();`
	`674`	`+ powershell.AddScript("Enable-AzureRmAlias -Module " + moduleShortName.Substring(0, moduleShortName.Length - 5));`
	`675`	`+#endif`
	`676`	`+ }`
`670`	`677`	`}`
`671`	`678`
`672`	`679`	`powershell.AddScript(`