Merge branch 'MoveRG' of https://github.com/vivsriaus/azure-powershell into MoveRG

Conflicts:
	src/ResourceManager/Resources/Commands.Resources.Test/ResourceGroupDeployments/RemoveAzureResourceGroupDeploymentCommandTests.cs
	src/ResourceManager/Resources/Commands.Resources.Test/ResourceGroupDeployments/StopAzureResourceGroupDeploymentCommandTests.cs

Author: Tiano2017

.gitignore

@@ -181,6 +181,10 @@ Backup*/
 UpgradeLog*.XML
 UpgradeLog*.htm
 
+# The Backup*/ rule will ignore the backup and restore cmdlets
+# for Azure web apps. Exclude that directory from being ignored here.
+!/src/ResourceManager/Websites/Commands.Websites/Cmdlets/BackupRestore
+
 # SQL Server files
 *.mdf
 *.ldf

ChangeLog.md

@@ -1,6 +1,11 @@
-##2016.05.03 version 1.4.0
+##2016.05.04 version 1.4.0
+* Azure Resource Manager
+  - Get-AzureRmLocation cmdley: New cmdlet Lists all public Azure locatiosn with available provider namespaces
+  - Get-AzureRMResourceGroupDeploymentOperations: Improved output format
+  - Get-AzureRMDeployment: Responses contain all error details
+  - Added cmdlet help anbd examples
+  - Normalized cmdlet parameter defaults and position
 * Azure Storage
-  * Upgrade to Microsoft.Azure.Management.Storage nuget package v5.0 preview
   * Add Encryption and Hot/Cool features support to resource mode storage account cmdlets
     - New-AzureRmStorageAccount
     - Set-AzureRmStorageAccount
@@ -14,6 +19,32 @@
     - New-AzureStorageShareSASToken
     - New-AzureStorageShareStoredAccessPolicy
     - Set-AzureStorageShareStoredAccessPolicy
+* Azure Compute
+  * Added cmdlets for Contaner Service support
+  * Bug and help fixes
+* Azure Profile
+  * Added support for German national cloud (AzureGermanCloud)
+* Azure APIManagement
+  *  Added Tenant Git Configuration cmdlets
+    - Get-AzureRmApiManagementTenantGitAccess
+    - Set-AzureRmApiManagementTenantGitAccess
+    - Get-AzureRmApiManagementTenantSyncState
+    - Publish-AzureRmApiManagementTenantGitConfiguration
+    - Save-AzureRmApiManagementTenantGitConfiguration
+  * Added ApiManagement Properties cmdlets
+    - Get-AzureRmApiManagementProperty
+    - New-AzureRmApiManagementProperty
+    - Remove-AzureRmApiManagementProperty
+    - Set-AzureRmApiManagementProperty
+  * Added Logger cmdlets
+    - Get-AzureRmApiManagementLogger
+    - Remove-AzureRmApiManagementLogger
+    - Set-AzureRmApiManagementLogger
+    - New-AzureRmApiManagementLogger
+  * Fixed cmdlet bugs
+    - NewAzureRMApiManagementAPI: changed Path to optional
+    - NewAzureRMApiManagementProduct: fixed issue with creating products without Subscriptions
+* Azure Recovery Services Backup
   * Added Recovery Services Backup cmdlets
     - Set-AzureRmRecoveryServicesVaultContext
     - Set-AzureRmRecoveryServicesBackupProperties

setup/azurecmd.wxs

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
 
-  <?define productName="Microsoft Azure PowerShell - April 2016" ?>
+  <?define productName="Microsoft Azure PowerShell - May 2016" ?>
   <?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
   <?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
 
-  <?define version="1.3.2" ?>
+  <?define version="1.4.0" ?>
 
   <Product Id="*"
            Name="$(var.productName)"

setup/azurecmdfiles.wxi

@@ -28,6 +28,6 @@
 
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
-[assembly: AssemblyVersion("1.3.2")]
-[assembly: AssemblyFileVersion("1.3.2")]
+[assembly: AssemblyVersion("1.4.0")]
+[assembly: AssemblyFileVersion("1.4.0")]
 [assembly: CollectionBehavior(DisableTestParallelization = true)]

src/Common/Commands.Common.Authentication.Test/Properties/AssemblyInfo.cs

@@ -31,10 +31,11 @@ public AccessTokenCredential(Guid subscriptionId, IAccessToken token)
             this.token = token;
             this.TenantID = token.TenantId;
         }
-        
+
         public override Task ProcessHttpRequestAsync(HttpRequestMessage request, CancellationToken cancellationToken)
         {
-            token.AuthorizeRequest((tokenType, tokenValue) => {
+            token.AuthorizeRequest((tokenType, tokenValue) =>
+            {
                 request.Headers.Authorization = new AuthenticationHeaderValue(tokenType, tokenValue);
             });
             return base.ProcessHttpRequestAsync(request, cancellationToken);

src/Common/Commands.Common.Authentication/Authentication/AccessTokenCredential.cs

@@ -28,7 +28,7 @@ public class AdalConfiguration
         // These constants define the default values to use for AD authentication
         // against RDFE
         //
-        public const string PowerShellClientId = "1950a258-227b-4e31-a9cf-717495945fc2";          
+        public const string PowerShellClientId = "1950a258-227b-4e31-a9cf-717495945fc2";
 
         public static readonly Uri PowerShellRedirectUri = new Uri("urn:ietf:wg:oauth:2.0:oob");
 
@@ -37,7 +37,7 @@ public class AdalConfiguration
         // login window. Also adding popup flag to handle overly large login windows.
         public const string EnableEbdMagicCookie = "site_id=501358&display=popup";
 
-        public string AdEndpoint { get;set; }
+        public string AdEndpoint { get; set; }
 
         public bool ValidateAuthority { get; set; }
 

src/Common/Commands.Common.Authentication/Authentication/AdalConfiguration.cs

@@ -37,10 +37,14 @@ public AdalTokenProvider()
         public AdalTokenProvider(IWin32Window parentWindow)
         {
             this.userTokenProvider = new UserTokenProvider(parentWindow);
-            servicePrincipalTokenProvider = new ServicePrincipalTokenProvider();
+            this.servicePrincipalTokenProvider = new ServicePrincipalTokenProvider();
         }
 
-        public IAccessToken GetAccessToken(AdalConfiguration config, ShowDialog promptBehavior, string userId, SecureString password,
+        public IAccessToken GetAccessToken(
+            AdalConfiguration config,
+            ShowDialog promptBehavior,
+            string userId,
+            SecureString password,
             AzureAccount.AccountType credentialType)
         {
             switch (credentialType)
@@ -54,7 +58,11 @@ public IAccessToken GetAccessToken(AdalConfiguration config, ShowDialog promptBe
             }
         }
 
-        public IAccessToken GetAccessTokenWithCertificate(AdalConfiguration config, string clientId, string certificate, AzureAccount.AccountType credentialType)
+        public IAccessToken GetAccessTokenWithCertificate(
+            AdalConfiguration config,
+            string clientId,
+            string certificate,
+            AzureAccount.AccountType credentialType)
         {
             switch (credentialType)
             {

src/Common/Commands.Common.Authentication/Authentication/AdalTokenProvider.cs

@@ -14,7 +14,6 @@
 
 using Microsoft.IdentityModel.Clients.ActiveDirectory;
 using Microsoft.Rest.Azure.Authentication;
-using System.Security;
 using System.Security.Cryptography.X509Certificates;
 using System.Threading.Tasks;
 
@@ -35,7 +34,7 @@ public CertificateApplicationCredentialProvider(string certificateThumbprint)
         {
             this._certificateThumbprint = certificateThumbprint;
         }
-        
+
         /// <summary>
         /// Authenticate using certificate thumbprint from the datastore 
         /// </summary>
@@ -47,7 +46,7 @@ public async Task<AuthenticationResult> AuthenticateAsync(string clientId, strin
         {
             var task = new Task<X509Certificate2>(() =>
             {
-                return  AzureSession.DataStore.GetCertificate(this._certificateThumbprint);
+                return AzureSession.DataStore.GetCertificate(this._certificateThumbprint);
             });
             task.Start();
             var certificate = await task.ConfigureAwait(false);

src/Common/Commands.Common.Authentication/Authentication/CertificateApplicationCredentialProvider.cs

@@ -26,7 +26,7 @@ internal static class CredStore
         internal enum CredentialType
         {
             Generic = 1,
-        } 
+        }
 
         internal static class NativeMethods
         {
@@ -69,7 +69,10 @@ internal extern static bool CredFree(
                 IntPtr pCredential
                 );
 
-            [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1049:TypesThatOwnNativeResourcesShouldBeDisposable", Justification = "Wrapper for native struct")]
+            [System.Diagnostics.CodeAnalysis.SuppressMessage(
+                "Microsoft.Design",
+                "CA1049:TypesThatOwnNativeResourcesShouldBeDisposable",
+                Justification = "Wrapper for native struct")]
             [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
             internal struct Credential
             {
@@ -108,7 +111,7 @@ public Credential(string userName, string key, string value)
                 internal IntPtr attributes;
                 internal string targetAlias;
                 internal string userName;
-            }             
+            }
         }
     }
 }

src/Common/Commands.Common.Authentication/Authentication/CredStore.cs

@@ -25,7 +25,7 @@ public interface IAccessToken
         string UserId { get; }
 
         string TenantId { get; }
-        
+
         LoginType LoginType { get; }
     }
 }

src/Common/Commands.Common.Authentication/Authentication/IAccessToken.cs

@@ -33,8 +33,12 @@ public interface ITokenProvider
         /// <param name="password">Secure strings with password/service principal key.</param>
         /// <param name="credentialType">Credential type.</param>
         /// <returns>An access token.</returns>
-        IAccessToken GetAccessToken(AdalConfiguration config, ShowDialog promptBehavior, string userId,
-            SecureString password, AzureAccount.AccountType credentialType);
+        IAccessToken GetAccessToken(
+            AdalConfiguration config,
+            ShowDialog promptBehavior,
+            string userId,
+            SecureString password,
+            AzureAccount.AccountType credentialType);
 
         /// <summary>
         /// Get a new authentication token for the given environment
@@ -44,7 +48,10 @@ IAccessToken GetAccessToken(AdalConfiguration config, ShowDialog promptBehavior,
         /// <param name="certificateThumbprint">The certificate thumbprint for this user</param>
         /// <param name="credentialType">The account type</param>
         /// <returns>An access token, which can be renewed</returns>
-        IAccessToken GetAccessTokenWithCertificate(AdalConfiguration config, string principalId, string certificateThumbprint, 
+        IAccessToken GetAccessTokenWithCertificate(
+            AdalConfiguration config,
+            string principalId,
+            string certificateThumbprint,
             AzureAccount.AccountType credentialType);
     }
 }

src/Common/Commands.Common.Authentication/Authentication/ITokenProvider.cs

@@ -34,7 +34,7 @@ public KeyStoreApplicationCredentialProvider(string tenant)
         {
             this._tenantId = tenant;
         }
-        
+
         /// <summary>
         /// Authenticate using the secret for the specified client from the key store
         /// </summary>

src/Common/Commands.Common.Authentication/Authentication/KeyStoreApplicationCredentialProvider.cs

@@ -19,7 +19,7 @@ public enum LoginType
         /// <summary>
         /// User is logging in with orgid credentials
         /// </summary>
-         OrgId,
+        OrgId,
 
         /// <summary>
         /// User is logging in with liveid credentials

src/Common/Commands.Common.Authentication/Authentication/LoginType.cs

@@ -37,7 +37,7 @@ public static void SaveKey(string appId, string tenantId, SecureString serviceKe
                 targetName = CreateKey(appId, tenantId),
                 targetAlias = null,
                 comment = null,
-                lastWritten = new FILETIME {dwHighDateTime = 0, dwLowDateTime = 0},
+                lastWritten = new FILETIME { dwHighDateTime = 0, dwLowDateTime = 0 },
                 persist = 2, // persist on local machine
                 attibuteCount = 0,
                 attributes = IntPtr.Zero,
@@ -79,16 +79,16 @@ public static SecureString GetKey(string appId, string tenantId)
                     out pCredential))
                 {
                     var credential = (CredStore.NativeMethods.Credential)
-                        Marshal.PtrToStructure(pCredential, typeof (CredStore.NativeMethods.Credential));
+                        Marshal.PtrToStructure(pCredential, typeof(CredStore.NativeMethods.Credential));
                     unsafe
                     {
-                        return new SecureString((char*) (credential.credentialBlob),
-                            (int)(credential.credentialBlobSize/Marshal.SystemDefaultCharSize));
+                        return new SecureString((char*)(credential.credentialBlob),
+                            (int)(credential.credentialBlobSize / Marshal.SystemDefaultCharSize));
                     }
                 }
                 return null;
             }
-            catch 
+            catch
             {
                 // we could be running in an environment that does not have credentials store
             }
@@ -97,7 +97,7 @@ public static SecureString GetKey(string appId, string tenantId)
                 if (pCredential != IntPtr.Zero)
                 {
                     CredStore.NativeMethods.CredFree(pCredential);
-                }   
+                }
             }
 
             return null;