Merge branch 'dev' into po/directiveUpdates

Author: peombwa

src/Authentication/Authentication/Cmdlets/SelectMgProfile.cs

@@ -17,8 +17,9 @@ namespace Microsoft.Graph.PowerShell.Authentication.Cmdlets
     [OutputType(typeof(bool))]
     public class SelectMgProfile: PSCmdlet
     {
-        [Parameter(Mandatory = true)]
+        [Parameter(Mandatory = true, Position = 1)]
         [Alias("ProfileName")]
+        [ValidateSet("v1.0", "beta")]
         [ValidateNotNullOrEmpty]
         public string Name { get; set; }
 
@@ -32,11 +33,15 @@ protected override void ProcessRecord()
             {
                 if (this.IsParameterBound(c => c.Name))
                 {
-                    PSModuleInfo[] modules = GetModules(InvokeCommand).Where(m => GetProfiles(m).Contains(Name)).ToArray();
+                    string profileName = Name.ToLower();
+                    // Internally treat beta profile as v1.0-beta. 
+                    // This is an AutoREST limitation.
+                    profileName = profileName.ContainsValue("beta") ? "v1.0-beta" : profileName;
+                    PSModuleInfo[] modules = GetModules(InvokeCommand).Where(m => GetProfiles(m).Contains(profileName)).ToArray();
                     string moduleList = string.Join(", ", modules.Select(m => m.Name));
-                    if (ShouldProcess($"Modules {moduleList}", $"Load modules with profile {Name}"))
+                    if (ShouldProcess($"Modules {moduleList}", $"Load modules with profile {profileName}"))
                     {
-                        GraphSession.Instance.SelectedProfile = Name;
+                        GraphSession.Instance.SelectedProfile = profileName;
                         ReloadModules(InvokeCommand, modules);
                         if (PassThru.IsPresent && PassThru.ToBool())
                         {

src/Authentication/Authentication/Constants.cs

@@ -17,7 +17,7 @@ public static class Constants
         internal static readonly string TokenCacheDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".graph");
         internal const string ProfileDescription = "A snapshot of the Microsoft Graph {0} API for {1} cloud.";
         internal const string TokenCacheServiceName = "com.microsoft.graph.powershell.sdkcache";
-        internal const string DefaultProfile = "v1.0-beta";
+        internal const string DefaultProfile = "v1.0";
         internal const int TokenExpirationBufferInMinutes = 5;
     }
 }

src/Authentication/Authentication/Models/PSGraphServiceProfile.cs

@@ -34,7 +34,7 @@ internal static PSGraphServiceProfile Create(string name)
             {
                 throw new ArgumentNullException(nameof(name));
             }
-            return new PSGraphServiceProfile { Name = name, Description = GetProfileDescription(name) };
+            return new PSGraphServiceProfile { Name = GetProfileVersion(name), Description = GetProfileDescription(name) };
         }
 
         /// <summary>

tools/Custom/Module.cs

@@ -24,7 +24,7 @@ public partial class Module
         /// <summary>
         /// The selected Microsoft Graph profile.
         /// </summary>
-        public string ProfileName { get; set; } = "v1.0-beta";
+        public string ProfileName { get; set; } = "v1.0";
         partial void BeforeCreatePipeline(System.Management.Automation.InvocationInfo invocationInfo, ref Runtime.HttpPipeline pipeline)
         {
             // Call Init to trigger any custom initialization needed after

tools/GenerateModules.ps1

@@ -127,22 +127,37 @@ $ModuleMapping.Keys | ForEach-Object -Begin { $RequestCount = 0 } -End { Write-H
                 [HashTable]$PrivateData = @{ Profiles = $Profiles }
                 Update-ModuleManifest -Path $ModuleManifestPath -PrivateData $PrivateData
 
-                # Update module psm1 with Graph session profile name.
+                # Update main module psm1.
                 $ModulePsm1 = Join-Path $ModuleProjectDir "/$ModulePrefix.$ModuleName.psm1"
                 (Get-Content -Path $ModulePsm1) | ForEach-Object{
-                    $_
                     if ($_ -match '\$instance = \[Microsoft.Graph.PowerShell.Module\]::Instance') {
+                        # Update main psm1 with Graph session profile name and module name.
+                        $_
                         '  $instance.ProfileName = [Microsoft.Graph.PowerShell.Authentication.GraphSession]::Instance.SelectedProfile'
+                    } else {
+                        # Rename all Azure instances in psm1 to `Microsoft Graph`.
+                        $updatedLine = $_ -replace 'Azure', 'Microsoft Graph'
+                        # Replace all 'instance.Name' declarations with fully qualified module name.
+                        $updatedLine = $updatedLine -replace '\$\(\$instance.Name\)', "$ModulePrefix.$ModuleName"
+                        $updatedLine
                     }
                 } | Set-Content $ModulePsm1
 
-                # Address AutoREST bug where it looks for exports in the wrong directory.
+                # Update internal module psm1.
                 $InternalModulePsm1 = Join-Path $ModuleProjectDir "/internal/$ModulePrefix.$ModuleName.internal.psm1"
                 (Get-Content -Path $InternalModulePsm1) | ForEach-Object{
-                    $_
+                    $updatedLine = $_
+                    # Address AutoREST bug where it looks for exports in the wrong directory.
                     if ($_ -match '\$exportsPath = \$PSScriptRoot') {
-                        '  $exportsPath = Join-Path $PSScriptRoot "../exports"'
+                        $updatedLine = '  $exportsPath = Join-Path $PSScriptRoot "../exports"'
                     }
+                    
+                    # Remove duplicate instance.Name declarations in internal.psm1
+                    # Main .psm1 already handles this.
+                    if ($_ -match '\$\(\$instance.Name\)') {
+                        $updatedLine = ""
+                    }
+                    $updatedLine
                 } | Set-Content $InternalModulePsm1
 
                 if ($LASTEXITCODE) {