Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev

Author: blueww

CONTRIBUTING.md

@@ -1,5 +1,5 @@
 # Contribute Code or Provide Feedback
 
-If you would like to become an active contributor to this project please follow the instructions provided in [Microsoft Azure Projects Contribution Guidelines](http://windowsazure.github.com/guidelines.html).
+If you would like to become an active contributor to this project please follow the instructions provided in [Microsoft Azure Projects Contribution Guidelines](http://azure.github.io/guidelines/).
 
 If you encounter any bugs with Microsoft Azure PowerShell please file an issue in the [Issues](https://github.com/Azure/azure-powershell/issues) section of the project.

src/Common/Commands.Common.Authentication/Commands.Common.Authentication.csproj

@@ -11,7 +11,7 @@
     <AssemblyName>Commands.Common.Authentication</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <TargetFrameworkProfile />
     <RestorePackages>true</RestorePackages>
     <CodeAnalysisAdditionalOptions>/assemblyCompareMode:StrongNameIgnoringVersion</CodeAnalysisAdditionalOptions>
     <NuGetPackageImportStamp>06e19c11</NuGetPackageImportStamp>
@@ -51,7 +51,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Hyak.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Hyak.Common.1.0.3\lib\net45\Hyak.Common.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Hyak.Common.1.0.3\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.Common, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -178,5 +179,4 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
 </Project>

src/Common/Commands.Common.Authentication/Models/XmlProfileSerializer.cs

@@ -38,6 +38,16 @@ public bool Deserialize(string contents, AzureSMProfile profile)
             DeserializeErrors = new List<string>();
 
             DataContractSerializer serializer = new DataContractSerializer(typeof(ProfileData));
+
+            // For backward compatibility since namespace of ProfileData has been changed
+            // we need to replace previous namespace with the current one
+            if (!string.IsNullOrWhiteSpace(contents))
+            {
+                contents = contents.Replace(
+                    "http://schemas.datacontract.org/2004/07/Microsoft.Azure.Common.Authentication",
+                    "http://schemas.datacontract.org/2004/07/Microsoft.Azure.Commands.Common.Authentication");
+            }
+
             using (MemoryStream s = new MemoryStream(Encoding.UTF8.GetBytes(contents ?? "")))
             {
                 data = (ProfileData)serializer.ReadObject(s);

src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/Commands.ScenarioTests.ResourceManager.Common.csproj

@@ -140,6 +140,7 @@
     <Compile Include="Mocks\MockClientFactory.cs" />
     <Compile Include="Mocks\MockCommandRuntime.cs" />
     <Compile Include="PermissiveRecordMatcherWithApiExclusion.cs" />
+    <Compile Include="ProfileClient.cs" />
     <Compile Include="PSCmdletExtensions.cs" />
     <Compile Include="Constants.cs" />
     <Compile Include="Mocks\MockAccessToken.cs" />
@@ -171,10 +172,6 @@
       <Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
       <Name>Commands.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\ServiceManagement\Common\Commands.ServiceManagement.Common\Commands.ServiceManagement.Common.csproj">
-      <Project>{cff09e81-1e31-444e-b4d4-a21e946c29e2}</Project>
-      <Name>Commands.ServiceManagement.Common</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj">
       <Project>{3819d8a7-c62c-4c47-8ddd-0332d9ce1252}</Project>
       <Name>Commands.ResourceManager.Common</Name>

src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/EnvironmentSetupHelper.cs

@@ -61,9 +61,11 @@ public EnvironmentSetupHelper()
             rmprofile.Context.Subscription.Environment = "foo";
             if (AzureRmProfileProvider.Instance.Profile == null)
             {
-                AzureRmProfileProvider.Instance.Profile = rmprofile;            }
+                AzureRmProfileProvider.Instance.Profile = rmprofile;
+            }
 
-            AzureSession.DataStore = datastore;            ProfileClient = new ProfileClient(profile);
+            AzureSession.DataStore = datastore;            
+            ProfileClient = new ProfileClient(profile);
 
             // Ignore SSL errors
             System.Net.ServicePointManager.ServerCertificateValidationCallback += (se, cert, chain, sslerror) => true;

src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/Mocks/MockClientFactory.cs

@@ -29,6 +29,7 @@
 using Microsoft.Azure.Commands.Common.Authentication.Factories;
 using Microsoft.Azure.Commands.Common.Authentication.Models;
 using Microsoft.Azure.ServiceManagemenet.Common;
+using Microsoft.WindowsAzure.Commands.ScenarioTest;
 
 namespace Microsoft.WindowsAzure.Commands.Common.Test.Mocks
 {

src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/ProfileClient.cs

@@ -656,7 +656,7 @@ public AzureSubscription SetSubscriptionAsDefault(Guid id, string accountName)
             {
                 if (subscription.IsPropertySet(AzureSubscription.Property.StorageAccount))
                 {
-                    subscription.SetProperty(AzureSubscription.Property.StorageAccount, null);
+                    GeneralUtilities.ClearCurrentStorageAccount();
                 }
 
                 Profile.DefaultSubscription = subscription;

src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/ExpressRouteCircuitTests.cs

@@ -19,7 +19,7 @@ namespace Commands.Network.Test.ScenarioTests
 {
     public class ExpressRouteCircuitTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase
     {
-        [Fact(Skip = "Rerecord tests")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestExpressRouteCircuitCRUD()
         {
@@ -33,7 +33,7 @@ public void TestExpressRouteCircuitPeeringCRUD()
             NetworkResourcesController.NewInstance.RunPsTest("Test-ExpressRouteCircuitPeeringCRUD");
         }
 
-        [Fact(Skip = "Rerecord tests")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestExpressRouteCircuitAuthorizationCRUD()
         {

src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/ExpressRouteCircuitTests.ps1

@@ -31,7 +31,7 @@ function Test-ExpressRouteCircuitCRUD
         $resourceGroup = New-AzureRmResourceGroup -Name $rgname -Location $rglocation
 
         # Create the ExpressRouteCircuit
-		$circuit = New-AzureRmExpressRouteCircuit -Name $circuitName -Location $location -ResourceGroupName $rgname -SkuTier Standard -SkuFamily MeteredData -BillingType MeteredData -ServiceProviderName "equinix" -PeeringLocation "Silicon Valley" -BandwidthInMbps 1000;
+		$circuit = New-AzureRmExpressRouteCircuit -Name $circuitName -Location $location -ResourceGroupName $rgname -SkuTier Standard -SkuFamily MeteredData  -ServiceProviderName "equinix" -PeeringLocation "Silicon Valley" -BandwidthInMbps 500;
 
         # get Circuit
         $getCircuit = Get-AzureRmExpressRouteCircuit -Name $circuitName -ResourceGroupName $rgname
@@ -47,7 +47,7 @@ function Test-ExpressRouteCircuitCRUD
         Assert-AreEqual "MeteredData" $getCircuit.Sku.Family
         Assert-AreEqual "equinix" $getCircuit.ServiceProviderProperties.ServiceProviderName
         Assert-AreEqual "Silicon Valley" $getCircuit.ServiceProviderProperties.PeeringLocation
-        Assert-AreEqual "1000" $getCircuit.ServiceProviderProperties.BandwidthInMbps
+        Assert-AreEqual "500" $getCircuit.ServiceProviderProperties.BandwidthInMbps
 
         # list
         $list = Get-AzureRmExpressRouteCircuit -ResourceGroupName $rgname
@@ -59,20 +59,22 @@ function Test-ExpressRouteCircuitCRUD
         Assert-AreEqual @($list[0].Peerings).Count @($getCircuit.Peerings).Count
 
 		# set
-		$getCircuit.ServiceProviderProperties.BandwidthInMbps = 500
+		$getCircuit.ServiceProviderProperties.BandwidthInMbps = 1000
+		$getCircuit.Sku.Tier = "Premium"
+		$getCircuit.Sku.Family = "UnlimitedData"
 
-		$getCircuit = Set-AzureRmExpressRouteCircuit -ExpressRouteCircuit $getCircuit -BillingType UnlimitedData
+		$getCircuit = Set-AzureRmExpressRouteCircuit -ExpressRouteCircuit $getCircuit 
 		Assert-AreEqual $rgName $getCircuit.ResourceGroupName
         Assert-AreEqual $circuitName $getCircuit.Name
         Assert-NotNull $getCircuit.Location
         Assert-NotNull $getCircuit.Etag
         Assert-AreEqual 0 @($getCircuit.Peerings).Count
-        Assert-AreEqual "standard_meteredData" $getCircuit.Sku.Name
-        Assert-AreEqual "Standard" $getCircuit.Sku.Tier
-        Assert-AreEqual "MeteredData" $getCircuit.Sku.Family
+        Assert-AreEqual "Standard_MeteredData" $getCircuit.Sku.Name
+        Assert-AreEqual "Premium" $getCircuit.Sku.Tier
+        Assert-AreEqual "UnlimitedData" $getCircuit.Sku.Family
         Assert-AreEqual "equinix" $getCircuit.ServiceProviderProperties.ServiceProviderName
         Assert-AreEqual "Silicon Valley" $getCircuit.ServiceProviderProperties.PeeringLocation
-        Assert-AreEqual "500" $getCircuit.ServiceProviderProperties.BandwidthInMbps
+        Assert-AreEqual "1000" $getCircuit.ServiceProviderProperties.BandwidthInMbps
 
         # Delete Circuit
         $delete = Remove-AzureRmExpressRouteCircuit -ResourceGroupName $rgname -name $circuitName -PassThru -Force
@@ -108,7 +110,7 @@ function Test-ExpressRouteCircuitPeeringCRUD
 
         # Create the ExpressRouteCircuit with peering
 		$peering = New-AzureRmExpressRouteCircuitPeeringConfig -Name AzurePrivatePeering -PeeringType AzurePrivatePeering -PeerASN 100 -PrimaryPeerAddressPrefix "192.168.1.0/30" -SecondaryPeerAddressPrefix "192.168.2.0/30" -VlanId 200
-		$circuit = New-AzureRmExpressRouteCircuit -Name $circuitName -Location $location -ResourceGroupName $rgname -SkuTier Standard -SkuFamily MeteredData -BillingType UnlimitedData -ServiceProviderName "equinix" -PeeringLocation "Silicon Valley" -BandwidthInMbps 1000 -Peering $peering
+		$circuit = New-AzureRmExpressRouteCircuit -Name $circuitName -Location $location -ResourceGroupName $rgname -SkuTier Standard -SkuFamily MeteredData  -ServiceProviderName "equinix" -PeeringLocation "Silicon Valley" -BandwidthInMbps 1000 -Peering $peering
 
         #verification
         Assert-AreEqual $rgName $circuit.ResourceGroupName
@@ -146,7 +148,7 @@ function Test-ExpressRouteCircuitPeeringCRUD
 		Assert-AreEqual 1 @($listPeering).Count
 
 		# add a new Peering
-		$circuit = Get-AzureRmExpressRouteCircuit -Name $circuitName -ResourceGroupName $rgname | Add-AzureRmExpressRouteCircuitPeeringConfig -Name MicrosoftPeering -PeeringType MicrosoftPeering -PeerASN 99 -PrimaryPeerAddressPrefix "192.168.1.0/30" -SecondaryPeerAddressPrefix "192.168.2.0/30" -VlanId 200 -MicrosoftConfigAdvertisedPublicPrefixes @("11.2.3.4/30", "12.2.3.4/30") -MicrosoftConfigCustomerAsn 1000 -MicrosoftConfigRoutingRegistryName AFRINIC | Set-AzureRmExpressRouteCircuit -BillingType UnlimitedData
+		$circuit = Get-AzureRmExpressRouteCircuit -Name $circuitName -ResourceGroupName $rgname | Add-AzureRmExpressRouteCircuitPeeringConfig -Name MicrosoftPeering -PeeringType MicrosoftPeering -PeerASN 99 -PrimaryPeerAddressPrefix "192.168.1.0/30" -SecondaryPeerAddressPrefix "192.168.2.0/30" -VlanId 200 -MicrosoftConfigAdvertisedPublicPrefixes @("11.2.3.4/30", "12.2.3.4/30") -MicrosoftConfigCustomerAsn 1000 -MicrosoftConfigRoutingRegistryName AFRINIC | Set-AzureRmExpressRouteCircuit 
 
 		$p = $circuit | Get-AzureRmExpressRouteCircuitPeeringConfig -Name MicrosoftPeering
 		Assert-AreEqual "MicrosoftPeering" $p.Name
@@ -165,7 +167,7 @@ function Test-ExpressRouteCircuitPeeringCRUD
 		Assert-AreEqual 2 @($listPeering).Count
 
 		# Set a new peering
-	$circuit = Get-AzureRmExpressRouteCircuit -Name $circuitName -ResourceGroupName $rgname | Set-AzureRmExpressRouteCircuitPeeringConfig -Name MicrosoftPeering -PeeringType MicrosoftPeering -PeerASN 100 -PrimaryPeerAddressPrefix "192.168.1.0/30" -SecondaryPeerAddressPrefix "192.168.2.0/30" -VlanId 200 -MicrosoftConfigAdvertisedPublicPrefixes @("11.2.3.4/30", "12.2.3.4/30") -MicrosoftConfigCustomerAsn 1000 -MicrosoftConfigRoutingRegistryName AFRINIC | Set-AzureRmExpressRouteCircuit -BillingType UnlimitedData
+	$circuit = Get-AzureRmExpressRouteCircuit -Name $circuitName -ResourceGroupName $rgname | Set-AzureRmExpressRouteCircuitPeeringConfig -Name MicrosoftPeering -PeeringType MicrosoftPeering -PeerASN 100 -PrimaryPeerAddressPrefix "192.168.1.0/30" -SecondaryPeerAddressPrefix "192.168.2.0/30" -VlanId 200 -MicrosoftConfigAdvertisedPublicPrefixes @("11.2.3.4/30", "12.2.3.4/30") -MicrosoftConfigCustomerAsn 1000 -MicrosoftConfigRoutingRegistryName AFRINIC | Set-AzureRmExpressRouteCircuit 
 		$p = $circuit | Get-AzureRmExpressRouteCircuitPeeringConfig -Name MicrosoftPeering
 		Assert-AreEqual "MicrosoftPeering" $p.Name
 		Assert-AreEqual "MicrosoftPeering" $p.PeeringType
@@ -215,7 +217,7 @@ function Test-ExpressRouteCircuitAuthorizationCRUD
 
         # Create the ExpressRouteCircuit with authorization
 		$authorization = New-AzureRmExpressRouteCircuitAuthorization -Name $authorizationName
-		$circuit = New-AzureRmExpressRouteCircuit -Name $circuitName -Location $location -ResourceGroupName $rgname -SkuTier Standard -SkuFamily MeteredData  -ServiceProviderName "equinix" -PeeringLocation "Silicon Valley" -BandwidthInMbps 1000 -Authorization $authorization
+		$circuit = New-AzureRmExpressRouteCircuit -Name $circuitName -Location $location -ResourceGroupName $rgname -SkuTier Standard -SkuFamily MeteredData  -ServiceProviderName "equinix" -PeeringLocation "Silicon Valley" -BandwidthInMbps 500 -Authorization $authorization
 
         #verification
         Assert-AreEqual $rgName $circuit.ResourceGroupName
@@ -228,7 +230,7 @@ function Test-ExpressRouteCircuitAuthorizationCRUD
         Assert-AreEqual "MeteredData" $circuit.Sku.Family
         Assert-AreEqual "equinix" $circuit.ServiceProviderProperties.ServiceProviderName
         Assert-AreEqual "Silicon Valley" $circuit.ServiceProviderProperties.PeeringLocation
-        Assert-AreEqual "1000" $circuit.ServiceProviderProperties.BandwidthInMbps
+        Assert-AreEqual "500" $circuit.ServiceProviderProperties.BandwidthInMbps
 
 		# Verify the authorization
 		Assert-AreEqual $authorizationName $circuit.Authorizations[0].Name