Fix for Issue #404

Author: markcowl

src/Common/Commands.Common/Properties/Resources.Designer.cs

@@ -1361,10 +1361,9 @@ use and privacy statement at <url> and (c) agree to sharing my contact inf
   <data name="SwitchAzureModeDeprecated" xml:space="preserve">
     <value>The Switch-AzureMode cmdlet is deprecated and will be removed in a future release.</value>
   </data>
-  <data name="ComputeCloudExceptionOperationIdMessage" xml:space="preserve"> 
-    <value>OperationID : '{0}'</value> 
-  </data> 
-  <!-- DSC -->
+  <data name="ComputeCloudExceptionOperationIdMessage" xml:space="preserve">
+    <value>OperationID : '{0}'</value>
+  </data>
   <data name="PublishVMDscExtensionGetDscResourceFailed" xml:space="preserve">
     <value>Cannot get module for DscResource '{0}'. Possible solutions:
 1) Specify -ModuleName for Import-DscResource in your configuration.
@@ -1466,4 +1465,7 @@ The file needs to be a PowerShell script (.ps1 or .psm1).</value>
   <data name="AzureVMDscInvalidConfigurationDataFile" xml:space="preserve">
     <value>The configuration data must be a .psd1 file</value>
   </data>
+  <data name="CannotChangeBuiltinEnvironment" xml:space="preserve">
+    <value>Cannot change built-in environment {0}.</value>
+  </data>
 </root>

src/Common/Commands.Common/Properties/Resources.resx

@@ -12,9 +12,12 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using System;
+using System.Globalization;
 using System.Management.Automation;
 using System.Security.Permissions;
 using Microsoft.Azure.Common.Authentication.Models;
+using Microsoft.WindowsAzure.Commands.Common.Properties;
 using Microsoft.WindowsAzure.Commands.Profile.Models;
 using Microsoft.WindowsAzure.Commands.Utilities.Profile;
 
@@ -95,6 +98,12 @@ public SetAzureEnvironmentCommand() : base(true) { }
         [PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
         public override void ExecuteCmdlet()
         {
+            if ((Name == "AzureCloud") || (Name == "AzureChinaCloud"))
+            {
+                throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, 
+                    Resources.CannotChangeBuiltinEnvironment, Name));
+            }
+
             var newEnvironment = new AzureEnvironment { Name = Name, OnPremise = EnableAdfsAuthentication };
             if (ProfileClient.Profile.Environments.ContainsKey(Name))
             {

src/Common/Commands.Profile/Environment/SetAzureEnvironment.cs

@@ -18,6 +18,7 @@
 using Microsoft.Azure.Common.Authentication.Models;
 using Microsoft.WindowsAzure.Commands.Common.Test.Mocks;
 using Microsoft.WindowsAzure.Commands.Profile;
+using Microsoft.WindowsAzure.Commands.Profile.Models;
 using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using Moq;
@@ -41,10 +42,10 @@ public GetAzureEnvironmentTests()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void GetsAzureEnvironments()
         {
-            List<PSObject> environments = null;
+            List<PSAzureEnvironment> environments = null;
             Mock<ICommandRuntime> commandRuntimeMock = new Mock<ICommandRuntime>();
             commandRuntimeMock.Setup(c => c.WriteObject(It.IsAny<object>(), It.IsAny<bool>()))
-                .Callback<object, bool>((e, _) => environments = (List<PSObject>)e);
+                .Callback<object, bool>((e, _) => environments = (List<PSAzureEnvironment>)e);
 
             GetAzureEnvironmentCommand cmdlet = new GetAzureEnvironmentCommand()
             {
@@ -63,10 +64,10 @@ public void GetsAzureEnvironments()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void GetsAzureEnvironment()
         {
-            List<PSObject> environments = null;
+            List<PSAzureEnvironment> environments = null;
             Mock<ICommandRuntime> commandRuntimeMock = new Mock<ICommandRuntime>();
             commandRuntimeMock.Setup(c => c.WriteObject(It.IsAny<object>(), It.IsAny<bool>()))
-                .Callback<object, bool>((e, _) => environments = (List<PSObject>)e);
+                .Callback<object, bool>((e, _) => environments = (List<PSAzureEnvironment>)e);
 
             GetAzureEnvironmentCommand cmdlet = new GetAzureEnvironmentCommand()
             {

src/ServiceManagement/Services/Commands.Test/Environment/GetAzureEnvironmentTests.cs

@@ -15,6 +15,7 @@
 using System;
 using System.Collections.Generic;
 using System.Management.Automation;
+using Microsoft.WindowsAzure.Commands.Profile.Models;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using Xunit;
@@ -70,7 +71,7 @@ public void SetsAzureEnvironment()
             cmdlet.ExecuteCmdlet();
             cmdlet.InvokeEndProcessing();
 
-            commandRuntimeMock.Verify(f => f.WriteObject(It.IsAny<AzureEnvironment>()), Times.Once());
+            commandRuntimeMock.Verify(f => f.WriteObject(It.IsAny<PSAzureEnvironment>()), Times.Once());
             client = new ProfileClient(new AzureProfile(Path.Combine(AzureSession.ProfileDirectory, AzureSession.ProfileFile)));
             AzureEnvironment env = client.Profile.Environments["KaTaL"];
             Assert.Equal(env.Name.ToLower(), cmdlet.Name.ToLower());
@@ -94,9 +95,12 @@ public void ThrowsWhenSettingPublicEnvironment()
                     Name = name,
                     PublishSettingsFileUrl = "http://microsoft.com"
                 };
-
-                cmdlet.InvokeBeginProcessing();
-                Assert.Throws<ArgumentException>(() => cmdlet.ExecuteCmdlet());
+                var savedValue = AzureEnvironment.PublicEnvironments[name].GetEndpoint(AzureEnvironment.Endpoint.PublishSettingsFileUrl);
+               cmdlet.InvokeBeginProcessing();
+                Assert.Throws<InvalidOperationException>(() => cmdlet.ExecuteCmdlet());
+                var newValue = cmdlet.ProfileClient.Profile.Environments[name].GetEndpoint(AzureEnvironment.Endpoint.PublishSettingsFileUrl);
+                Assert.Equal(savedValue, newValue);
+                Assert.NotEqual(cmdlet.PublishSettingsFileUrl, newValue);
             }
         }