Merge pull request #570 from Azure/dev

huangpf PR: dev <- Azure:dev

Author: huangpf

src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.csproj

@@ -169,7 +169,6 @@
     <Compile Include="Commands\NewAzureApiManagement.cs" />
     <Compile Include="Commands\RemoveAzureApiManagement.cs" />
     <Compile Include="Commands\RestoreAzureApiManagement.cs" />
-    <Compile Include="CommonConstants.cs" />
     <Compile Include="Models\PsApiManagement.cs" />
     <Compile Include="Models\PsApiManagementHostnameCertificate.cs" />
     <Compile Include="Models\PsApiManagementHostnameConfiguration.cs" />

src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands/AddAzureApiManagementRegion.cs

@@ -34,10 +34,6 @@ public class AddAzureApiManagementRegion : AzureApiManagementCmdletBase
             HelpMessage = "Location of the new deployment region.")]
 
         [ValidateNotNullOrEmpty]
-        [ValidateSet(
-            "North Central US", "South Central US", "Central US", "West Europe", "North Europe", "West US", "East US",
-            "East US 2", "Japan East", "Japan West", "Brazil South", "Southeast Asia", "East Asia", "Australia East",
-            "Australia Southeast", IgnoreCase = false)]
         public string Location { get; set; }
 
         [Parameter(

src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands/NewAzureApiManagementVirtualNetwork.cs

@@ -29,10 +29,6 @@ public class NewAzureApiManagementVirtualNetwork : AzureRMCmdlet
             HelpMessage = "Location of the virtual network.")]
 
         [ValidateNotNullOrEmpty]
-        [ValidateSet(
-            "North Central US", "South Central US", "Central US", "West Europe", "North Europe", "West US", "East US",
-            "East US 2", "Japan East", "Japan West", "Brazil South", "Southeast Asia", "East Asia", "Australia East",
-            "Australia Southeast", IgnoreCase = false)]
         public string Location { get; set; }
 
         [Parameter(

src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands/RemoveAzureApiManagementRegion.cs

@@ -32,10 +32,6 @@ public class RemoveAzureApiManagementRegion : AzureApiManagementCmdletBase
             Mandatory = true,
             HelpMessage = "Location of the deployment region to remove.")]
         [ValidateNotNullOrEmpty]
-        [ValidateSet(
-            "North Central US", "South Central US", "Central US", "West Europe", "North Europe", "West US", "East US",
-            "East US 2", "Japan East", "Japan West", "Brazil South", "Southeast Asia", "East Asia", "Australia East",
-            "Australia Southeast", IgnoreCase = false)]
         public string Location { get; set; }
 
         public override void ExecuteCmdlet()

src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands/UpdateAzureApiManagementDeployment.cs

@@ -53,10 +53,6 @@ public class UpdateAzureApiManagementDeployment : AzureApiManagementCmdletBase
             ValueFromPipelineByPropertyName = true,
             Mandatory = true,
             HelpMessage = "Location of master API Management deployment region.")]
-        [ValidateSet(
-            "North Central US", "South Central US", "Central US", "West Europe", "North Europe", "West US", "East US",
-            "East US 2", "Japan East", "Japan West", "Brazil South", "Southeast Asia", "East Asia", "Australia East",
-            "Australia Southeast", IgnoreCase = false)]
         public string Location { get; set; }
 
         [Parameter(

src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands/UpdateAzureApiManagementRegion.cs

@@ -34,10 +34,6 @@ public class UpdateAzureApiManagementRegion : AzureApiManagementCmdletBase
             HelpMessage = "Location of the deployment region to update.")]
 
         [ValidateNotNullOrEmpty]
-        [ValidateSet(
-            "North Central US", "South Central US", "Central US", "West Europe", "North Europe", "West US", "East US",
-            "East US 2", "Japan East", "Japan West", "Brazil South", "Southeast Asia", "East Asia", "Australia East",
-            "Australia Southeast", IgnoreCase = false)]
         public string Location { get; set; }
 
         [Parameter(

src/ResourceManager/ApiManagement/Commands.ApiManagement/CommonConstants.cs

@@ -147,17 +147,6 @@ public PsApiManagementRegion AddRegion(
                 throw new ArgumentNullException("location");
             }
 
-            if (!CommonConstants.ValidLocationsSet.Contains(location))
-            {
-                throw new ArgumentException(
-                    string.Format(
-                        Resources.InvalidLocation,
-                        location,
-                        string.Join(",", CommonConstants.ValidLocationsSet)
-                        ),
-                    "location");
-            }
-
             if (location.Equals(Location) || AdditionalRegions.Any(r => location.Equals(r.Location)))
             {
                 throw new ArgumentException(string.Format(Resources.AddRegionExistsMessage, location), "location");
@@ -183,17 +172,6 @@ public bool RemoveRegion(string location)
                 throw new ArgumentNullException("location");
             }
 
-            if (!CommonConstants.ValidLocationsSet.Contains(location))
-            {
-                throw new ArgumentException(
-                    string.Format(
-                        Resources.InvalidLocation,
-                        location,
-                        string.Join(",", CommonConstants.ValidLocationsSet)
-                        ),
-                    "location");
-            }
-
             if (location.Equals(Location))
             {
                 throw new ArgumentException(
@@ -213,17 +191,6 @@ public void UpdateRegion(string location, PsApiManagementSku sku, int capacity,
                 throw new ArgumentNullException("location");
             }
 
-            if (!CommonConstants.ValidLocationsSet.Contains(location))
-            {
-                throw new ArgumentException(
-                    string.Format(
-                        Resources.InvalidLocation,
-                        location,
-                        string.Join(",", CommonConstants.ValidLocationsSet)
-                        ),
-                    "location");
-            }
-
             var regionToUpdate = AdditionalRegions.FirstOrDefault(r => location.Equals(r.Location));
             if (regionToUpdate != null)
             {

src/ResourceManager/ApiManagement/Commands.ApiManagement/Models/PsApiManagement.cs

@@ -294,7 +294,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Resources\WebSite.param.dev.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <None Include="packages.config">
       <SubType>Designer</SubType>