Merge pull request #5880 from markcowl/netcore-011a

Bring in latest fixes to NetCore branch

Author: markcowl

Azure.PowerShell.Netcore.sln

@@ -59,9 +59,11 @@
   ],
   "src/ResourceManager/DataFactories/": [
     ".\\src\\ResourceManager\\DataFactories\\Commands.DataFactories.Test\\bin\\Debug\\Microsoft.Azure.Commands.DataFactories.Test.dll",
-    ".\\src\\ResourceManager\\DataFactories\\Commands.DataFactoryV2.Test\\bin\\Debug\\Microsoft.Azure.Commands.DataFactoryV2.Test.dll",
     ".\\src\\ResourceManager\\StreamAnalytics\\Commands.StreamAnalytics.Test\\bin\\Debug\\Microsoft.Azure.Commands.StreamAnalytics.Test.dll"
   ],
+  "src/ResourceManager/DataFactoryV2/": [
+    ".\\src\\ResourceManager\\DataFactoryV2\\Commands.DataFactoryV2.Test\\bin\\Debug\\Microsoft.Azure.Commands.DataFactoryV2.Test.dll"
+  ],
   "src/ResourceManager/DataLakeAnalytics/": [
     ".\\src\\ResourceManager\\DataLakeAnalytics\\Commands.DataLakeAnalytics.Test\\bin\\Debug\\Microsoft.Azure.Commands.DataLakeAnalytics.Test.dll"
   ],

TestMappings.json

@@ -254,6 +254,7 @@
 
     <Message Importance="high" Text="Running Static Analyser" />
     <CallTarget targets="DependencyAnalysis" ContinueOnError="ErrorAndContinue" />
+    <Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\CheckAssemblies.ps1 -BuildConfig $(Configuration) &quot;" />
     <Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\CleanupBuild.ps1 -BuildConfig $(Configuration) &quot;" />
   </Target>
 

build.proj

@@ -128,9 +128,13 @@ public static class Property
         /// <summary>
         /// Backup login Uri for MSI
         /// </summary>
-        MSILoginUriBackup = "MSILoginBackup";
+        MSILoginUriBackup = "MSILoginBackup",
 
 
+        /// <summary>
+        /// Secret that may be used with MSI login
+        /// </summary>
+        MSILoginSecret = "MSILoginSecret";
         }
     }
 }

src/Common/Commands.Common.Authentication.Abstractions/AzureAccount.cs

@@ -17,6 +17,7 @@
 using Microsoft.Rest.Azure;
 using System;
 using System.Collections.Generic;
+using System.Net.Http;
 using System.Text;
 using System.Threading;
 
@@ -72,6 +73,10 @@ public ManagedServiceAccessToken(IAzureAccount account, IAzureEnvironment enviro
             }
 
             _tokenGetter = factory.GetHttpOperations<ManagedServiceTokenInfo>(true).WithHeader("Metadata", new[] { "true" });
+            if (account.IsPropertySet(AzureAccount.Property.MSILoginSecret))
+            {
+                _tokenGetter = _tokenGetter.WithHeader("Secret", new[] { account.GetProperty(AzureAccount.Property.MSILoginSecret) });
+            }
         }
 
         public string AccessToken
@@ -119,11 +124,12 @@ void GetOrRenewAuthentication()
                         RequestUris.Clear();
                         RequestUris.Enqueue(currentRequestUri);
                     }
-                    catch (CloudException) when (RequestUris.Count > 0)
+                    catch (Exception e) when ( (e is CloudException || e is HttpRequestException) && RequestUris.Count > 0)
                     {
-                        // do nothing
+                        // skip to the next uri
                     }
                 }
+
                 SetToken(info);
             }
         }

src/Common/Commands.Common.Authentication/Authentication/ManagedServiceAccessToken.cs

@@ -22,7 +22,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.8" />
+    <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.12" />
     <PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
     <PackageReference Include="System.Reflection" Version="4.3.0" />
     <PackageReference Include="System.Security.SecureString" Version="4.3.0" />

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

@@ -23,8 +23,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.2.12" />
-    <PackageReference Include="Microsoft.Azure.Management.Storage" Version="6.5.0-preview" />
-    <PackageReference Include="WindowsAzure.Storage" Version="8.1.1" />
+    <PackageReference Include="Microsoft.Azure.Management.Storage" Version="7.1.0-preview" />
+    <PackageReference Include="WindowsAzure.Storage" Version="9.0.0" />
     <PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
   </ItemGroup>
 

src/Common/Commands.Common.Storage/Common.Storage.Netcore.csproj

@@ -202,6 +202,18 @@ public static void SafeCopyParameterSet<T>(this T source, T target) where T : Az
             }
         }
 
+        /// <summary>
+        /// Return the value of a paramater, or null if not set
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="cmdlet">the executing cmdlet</param>
+        /// <param name="parameterName">The name of the parameter to return</param>
+        /// <returns>true if the parameter was provided by the user, otherwise false</returns>
+        public static bool IsBound(this PSCmdlet cmdlet, string parameterName) 
+        {
+            return cmdlet.MyInvocation.BoundParameters.ContainsKey(parameterName);
+        }
+
         public static string AsAbsoluteLocation(this string realtivePath)
         {
             return Path.GetFullPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, realtivePath));

src/Common/Commands.Common/Extensions/CmdletExtensions.cs

@@ -209,8 +209,6 @@ public static void ValidateInternetConnection()
             {
                 throw new Exception(Resources.NoInternetConnection);
             }
-#else
-			throw new NotSupportedException();			
 #endif
         }
 

src/Common/Commands.Common/Utilities/Validate.cs

@@ -113,7 +113,7 @@ PrivateData = @{
 
         # External dependent modules of this module
         # ExternalModuleDependencies = ''
-        Prerelease = 'preview'
+        # Prerelease = ''
 
     } # End of PSData hashtable