Migrate ContainerInstance from generation to main

src/ContainerInstance/Az.ContainerInstance.psd1

@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 3/6/2023
+# Generated on: 8/10/2023
 #
 
 @{
@@ -125,8 +125,7 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Added ''priority'' property to Container Group properties
-* Added ''Confidential'' sku type to Container Group Skus'
+        # ReleaseNotes = ''
 
         # Prerelease string of this module
         # Prerelease = ''

src/ContainerInstance/Az.ContainerInstance.psm1

@@ -33,7 +33,7 @@
   }
 
   if(-not $accountsModule) {
-    Write-Error "`nThis module requires $accountsName version 2.7.5 or greater. For installation instructions, please see: https://docs.microsoft.com/powershell/azure/install-az-ps" -ErrorAction Stop
+    Write-Error "`nThis module requires $accountsName version 2.7.5 or greater. For installation instructions, please see: https://learn.microsoft.com/powershell/azure/install-az-ps" -ErrorAction Stop
   } elseif (($accountsModule.Version -lt [System.Version]'2.7.5') -and (-not $localAccounts)) {
     Write-Error "`nThis module requires $accountsName version 2.7.5 or greater. An earlier version of Az.Accounts is imported in the current PowerShell session. If you are running test, please try to add the switch '-RegenerateSupportModule' when executing 'test-module.ps1'. Otherwise please open a new PowerShell session and import this module again.`nAdditionally, this error could indicate that multiple incompatible versions of Azure PowerShell modules are installed on your system. For troubleshooting information, please see: https://aka.ms/azps-version-error" -ErrorAction Stop
   }

src/ContainerInstance/ContainerInstance.sln

@@ -3,19 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Accounts", "..\Accounts\Accounts\Accounts.csproj", "{1A1084E7-5A00-4FA6-B18F-4BFCA38BE254}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Accounts", "..\Accounts\Accounts\Accounts.csproj", "{ECF1F067-4F78-4602-8B5B-0921A62735FD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyLoading", "..\Accounts\AssemblyLoading\AssemblyLoading.csproj", "{61EA7453-63B5-4411-9574-6E1E981C70C4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyLoading", "..\Accounts\AssemblyLoading\AssemblyLoading.csproj", "{480C952C-5C5E-4F37-9D00-7AE941D096DC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{7D43B483-6FA9-497F-9FFC-B4D73EF8BA50}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{620242F8-B561-4AD7-AB19-31E2C6DC3E05}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.ResourceManager", "..\Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{EF3A983C-7304-447B-A5F8-1D787D0138D2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.ResourceManager", "..\Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{2CFACAA8-39B5-4D51-BDA6-1B4532D1C7C0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuthenticationAssemblyLoadContext", "..\Accounts\AuthenticationAssemblyLoadContext\AuthenticationAssemblyLoadContext.csproj", "{3D78805B-070E-47CF-8A42-B8889F3DC2F4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuthenticationAssemblyLoadContext", "..\Accounts\AuthenticationAssemblyLoadContext\AuthenticationAssemblyLoadContext.csproj", "{980F0E51-E2F1-4466-808C-74F560823737}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authenticators", "..\Accounts\Authenticators\Authenticators.csproj", "{D8759E0E-E6AC-418F-819A-8519CA166BA6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authenticators", "..\Accounts\Authenticators\Authenticators.csproj", "{57E72256-3DCC-4BF8-B1CB-2713DB8BABD6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.ContainerInstance", "Az.ContainerInstance.csproj", "{D42492AA-1029-4F54-92B1-603AEF0205E0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.ContainerInstance", "Az.ContainerInstance.csproj", "{9E349674-A1EC-47B2-975B-3C7934918FAE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -26,33 +26,33 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1A1084E7-5A00-4FA6-B18F-4BFCA38BE254}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1A1084E7-5A00-4FA6-B18F-4BFCA38BE254}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1A1084E7-5A00-4FA6-B18F-4BFCA38BE254}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1A1084E7-5A00-4FA6-B18F-4BFCA38BE254}.Release|Any CPU.Build.0 = Release|Any CPU
-		{61EA7453-63B5-4411-9574-6E1E981C70C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{61EA7453-63B5-4411-9574-6E1E981C70C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{61EA7453-63B5-4411-9574-6E1E981C70C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{61EA7453-63B5-4411-9574-6E1E981C70C4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7D43B483-6FA9-497F-9FFC-B4D73EF8BA50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7D43B483-6FA9-497F-9FFC-B4D73EF8BA50}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7D43B483-6FA9-497F-9FFC-B4D73EF8BA50}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7D43B483-6FA9-497F-9FFC-B4D73EF8BA50}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EF3A983C-7304-447B-A5F8-1D787D0138D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF3A983C-7304-447B-A5F8-1D787D0138D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EF3A983C-7304-447B-A5F8-1D787D0138D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EF3A983C-7304-447B-A5F8-1D787D0138D2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3D78805B-070E-47CF-8A42-B8889F3DC2F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3D78805B-070E-47CF-8A42-B8889F3DC2F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3D78805B-070E-47CF-8A42-B8889F3DC2F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3D78805B-070E-47CF-8A42-B8889F3DC2F4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D8759E0E-E6AC-418F-819A-8519CA166BA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D8759E0E-E6AC-418F-819A-8519CA166BA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D8759E0E-E6AC-418F-819A-8519CA166BA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D8759E0E-E6AC-418F-819A-8519CA166BA6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D42492AA-1029-4F54-92B1-603AEF0205E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D42492AA-1029-4F54-92B1-603AEF0205E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D42492AA-1029-4F54-92B1-603AEF0205E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D42492AA-1029-4F54-92B1-603AEF0205E0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ECF1F067-4F78-4602-8B5B-0921A62735FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ECF1F067-4F78-4602-8B5B-0921A62735FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ECF1F067-4F78-4602-8B5B-0921A62735FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ECF1F067-4F78-4602-8B5B-0921A62735FD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{480C952C-5C5E-4F37-9D00-7AE941D096DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{480C952C-5C5E-4F37-9D00-7AE941D096DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{480C952C-5C5E-4F37-9D00-7AE941D096DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{480C952C-5C5E-4F37-9D00-7AE941D096DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{620242F8-B561-4AD7-AB19-31E2C6DC3E05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{620242F8-B561-4AD7-AB19-31E2C6DC3E05}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{620242F8-B561-4AD7-AB19-31E2C6DC3E05}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{620242F8-B561-4AD7-AB19-31E2C6DC3E05}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2CFACAA8-39B5-4D51-BDA6-1B4532D1C7C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2CFACAA8-39B5-4D51-BDA6-1B4532D1C7C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2CFACAA8-39B5-4D51-BDA6-1B4532D1C7C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2CFACAA8-39B5-4D51-BDA6-1B4532D1C7C0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{980F0E51-E2F1-4466-808C-74F560823737}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{980F0E51-E2F1-4466-808C-74F560823737}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{980F0E51-E2F1-4466-808C-74F560823737}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{980F0E51-E2F1-4466-808C-74F560823737}.Release|Any CPU.Build.0 = Release|Any CPU
+		{57E72256-3DCC-4BF8-B1CB-2713DB8BABD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{57E72256-3DCC-4BF8-B1CB-2713DB8BABD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{57E72256-3DCC-4BF8-B1CB-2713DB8BABD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{57E72256-3DCC-4BF8-B1CB-2713DB8BABD6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9E349674-A1EC-47B2-975B-3C7934918FAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E349674-A1EC-47B2-975B-3C7934918FAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E349674-A1EC-47B2-975B-3C7934918FAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9E349674-A1EC-47B2-975B-3C7934918FAE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

src/ContainerInstance/build-module.ps1

@@ -123,6 +123,10 @@ $null = New-Item -ItemType Directory -Force -Path $examplesFolder
 
 Write-Host -ForegroundColor Green 'Creating cmdlets for specified models...'
 $modelCmdlets = @()
+$modelCmdletFolder = Join-Path (Join-Path $PSScriptRoot './custom') 'autogen-model-cmdlets'
+if (Test-Path $modelCmdletFolder) {
+  $null = Remove-Item -Force -Recurse -Path $modelCmdletFolder
+}
 if ($modelCmdlets.Count -gt 0) {
   . (Join-Path $PSScriptRoot 'create-model-cmdlets.ps1')
   CreateModelCmdlet($modelCmdlets)

src/ContainerInstance/create-model-cmdlets.ps1

@@ -23,9 +23,13 @@ function CreateModelCmdlet {
     }
 
     $ModelCsPath = Join-Path (Join-Path $PSScriptRoot 'generated\api') 'Models'
-    $ModuleName = 'ContainerInstance'
     $OutputDir = Join-Path $PSScriptRoot 'custom\autogen-model-cmdlets'
     $null = New-Item -ItemType Directory -Force -Path $OutputDir
+    if (''.length -gt 0) {
+        $ModuleName = ''
+    } else {
+        $ModuleName = 'Az.ContainerInstance'
+    }
 
     $CsFiles = Get-ChildItem -Path $ModelCsPath -Recurse -Filter *.cs
     $Content = ''
@@ -64,10 +68,10 @@ function CreateModelCmdlet {
         $ObjectType = $Model
         $ObjectTypeWithNamespace = "${Namespace}.${ObjectType}"
         # remove duplicated module name
-        if ($ObjectType.StartsWith($ModuleName)) {
+        if ($ObjectType.StartsWith('ContainerInstance')) {
             $ModulePrefix = ''
         } else {
-            $ModulePrefix = $ModuleName
+            $ModulePrefix = 'ContainerInstance'
         }
         $OutputPath = Join-Path -ChildPath "New-Az${ModulePrefix}${ObjectType}Object.ps1" -Path $OutputDir
 
@@ -158,7 +162,7 @@ Create an in-memory object for ${ObjectType}.
 .Outputs
 ${ObjectTypeWithNamespace}
 .Link
-https://learn.microsoft.com/powershell/module/az.${ModuleName}/new-Az${ModulePrefix}${ObjectType}Object
+https://learn.microsoft.com/powershell/module/${ModuleName}/new-Az${ModulePrefix}${ObjectType}Object
 #>
 function New-Az${ModulePrefix}${ObjectType}Object {
     [OutputType('${ObjectTypeWithNamespace}')]

src/ContainerInstance/custom/InvokeAzContainerInstanceCommand_ExecuteExpanded.cs

@@ -71,13 +71,15 @@ private Task PullResponse()
 
                 if (!string.IsNullOrEmpty(result) && PassThru.ToBool()) { WriteObject(result.TrimEnd()); }
 
-            }, this._cancellationTokenSource.Token);
+            }, this._cancellationTokenSource.Token).Unwrap();
         }
 
         private Task PushCommand()
         {
             return Task.Factory.StartNew(async () =>
             {
+                if (Console.IsInputRedirected) return;
+
                 StringBuilder input = new StringBuilder();
                 // Loop until input is entered.
                 while (socket.State == WebSocketState.Open && !this._cancellationTokenSource.Token.IsCancellationRequested)
@@ -95,7 +97,7 @@ private Task PushCommand()
                     System.Threading.Thread.Sleep(250); 
                 }
 
-            }, this._cancellationTokenSource.Token);
+            }, this._cancellationTokenSource.Token).Unwrap();
 
         }
     }

src/ContainerInstance/custom/README.md

@@ -32,7 +32,7 @@ These provide functionality to our HTTP pipeline and other useful features. In s
 ### Attributes
 For processing the cmdlets, we've created some additional attributes:
 - `Microsoft.Azure.PowerShell.Cmdlets.ContainerInstance.DescriptionAttribute`
-  - Used in C# cmdlets to provide a high-level description of the cmdlet. This is propagated to reference documentation via [help comments](https://docs.microsoft.com/powershell/module/microsoft.powershell.core/about/about_comment_based_help) in the exported scripts.
+  - Used in C# cmdlets to provide a high-level description of the cmdlet. This is propagated to reference documentation via [help comments](https://learn.microsoft.com/powershell/module/microsoft.powershell.core/about/about_comment_based_help) in the exported scripts.
 - `Microsoft.Azure.PowerShell.Cmdlets.ContainerInstance.DoNotExportAttribute`
   - Used in C# and script cmdlets to suppress creating an exported cmdlet at build-time. These cmdlets will *not be exposed* by `Az.ContainerInstance`.
 - `Microsoft.Azure.PowerShell.Cmdlets.ContainerInstance.InternalExportAttribute`

src/ContainerInstance/exports/Add-AzContainerInstanceOutput.ps1

@@ -65,7 +65,8 @@ param(
     [ValidateNotNull()]
     [Microsoft.Azure.PowerShell.Cmdlets.ContainerInstance.Category('Azure')]
     [System.Management.Automation.PSObject]
-    # The credentials, account, tenant, and subscription used for communication with Azure.
+    # The DefaultProfile parameter is not functional.
+    # Use the SubscriptionId parameter when available if executing the cmdlet against a different subscription.
     ${DefaultProfile},
 
     [Parameter(DontShow)]
@@ -117,7 +118,7 @@ begin {
         $parameterSet = $PSCmdlet.ParameterSetName
 
         if ($null -eq [Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PowerShellVersion) {
-            [Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PowerShellVersion = $Host.Version.ToString()
+            [Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PowerShellVersion = $PSVersionTable.PSVersion.ToString()
         }         
         $preTelemetryId = [Microsoft.WindowsAzure.Commands.Common.MetricHelper]::TelemetryId
         if ($preTelemetryId -eq '') {

src/ContainerInstance/exports/Get-AzContainerGroup.ps1

@@ -91,7 +91,8 @@ param(
     [ValidateNotNull()]
     [Microsoft.Azure.PowerShell.Cmdlets.ContainerInstance.Category('Azure')]
     [System.Management.Automation.PSObject]
-    # The credentials, account, tenant, and subscription used for communication with Azure.
+    # The DefaultProfile parameter is not functional.
+    # Use the SubscriptionId parameter when available if executing the cmdlet against a different subscription.
     ${DefaultProfile},
 
     [Parameter(DontShow)]
@@ -143,7 +144,7 @@ begin {
         $parameterSet = $PSCmdlet.ParameterSetName
 
         if ($null -eq [Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PowerShellVersion) {
-            [Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PowerShellVersion = $Host.Version.ToString()
+            [Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PowerShellVersion = $PSVersionTable.PSVersion.ToString()
         }         
         $preTelemetryId = [Microsoft.WindowsAzure.Commands.Common.MetricHelper]::TelemetryId
         if ($preTelemetryId -eq '') {

src/ContainerInstance/exports/Get-AzContainerInstanceCachedImage.ps1

@@ -50,7 +50,8 @@ param(
     [ValidateNotNull()]
     [Microsoft.Azure.PowerShell.Cmdlets.ContainerInstance.Category('Azure')]
     [System.Management.Automation.PSObject]
-    # The credentials, account, tenant, and subscription used for communication with Azure.
+    # The DefaultProfile parameter is not functional.
+    # Use the SubscriptionId parameter when available if executing the cmdlet against a different subscription.
     ${DefaultProfile},
 
     [Parameter(DontShow)]
@@ -102,7 +103,7 @@ begin {
         $parameterSet = $PSCmdlet.ParameterSetName
 
         if ($null -eq [Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PowerShellVersion) {
-            [Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PowerShellVersion = $Host.Version.ToString()
+            [Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PowerShellVersion = $PSVersionTable.PSVersion.ToString()
         }         
         $preTelemetryId = [Microsoft.WindowsAzure.Commands.Common.MetricHelper]::TelemetryId
         if ($preTelemetryId -eq '') {

src/ContainerInstance/exports/Get-AzContainerInstanceCapability.ps1

@@ -50,7 +50,8 @@ param(
     [ValidateNotNull()]
     [Microsoft.Azure.PowerShell.Cmdlets.ContainerInstance.Category('Azure')]
     [System.Management.Automation.PSObject]
-    # The credentials, account, tenant, and subscription used for communication with Azure.
+    # The DefaultProfile parameter is not functional.
+    # Use the SubscriptionId parameter when available if executing the cmdlet against a different subscription.
     ${DefaultProfile},
 
     [Parameter(DontShow)]
@@ -102,7 +103,7 @@ begin {
         $parameterSet = $PSCmdlet.ParameterSetName
 
         if ($null -eq [Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PowerShellVersion) {
-            [Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PowerShellVersion = $Host.Version.ToString()
+            [Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PowerShellVersion = $PSVersionTable.PSVersion.ToString()
         }         
         $preTelemetryId = [Microsoft.WindowsAzure.Commands.Common.MetricHelper]::TelemetryId
         if ($preTelemetryId -eq '') {

src/ContainerInstance/exports/Get-AzContainerInstanceContainerGroupOutboundNetworkDependencyEndpoint.ps1

@@ -82,7 +82,8 @@ param(
     [ValidateNotNull()]
     [Microsoft.Azure.PowerShell.Cmdlets.ContainerInstance.Category('Azure')]
     [System.Management.Automation.PSObject]
-    # The credentials, account, tenant, and subscription used for communication with Azure.
+    # The DefaultProfile parameter is not functional.
+    # Use the SubscriptionId parameter when available if executing the cmdlet against a different subscription.
     ${DefaultProfile},
 
     [Parameter(DontShow)]
@@ -134,7 +135,7 @@ begin {
         $parameterSet = $PSCmdlet.ParameterSetName
 
         if ($null -eq [Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PowerShellVersion) {
-            [Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PowerShellVersion = $Host.Version.ToString()
+            [Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PowerShellVersion = $PSVersionTable.PSVersion.ToString()
         }         
         $preTelemetryId = [Microsoft.WindowsAzure.Commands.Common.MetricHelper]::TelemetryId
         if ($preTelemetryId -eq '') {

src/ContainerInstance/exports/Get-AzContainerInstanceLog.ps1

@@ -78,7 +78,8 @@ param(
     [ValidateNotNull()]
     [Microsoft.Azure.PowerShell.Cmdlets.ContainerInstance.Category('Azure')]
     [System.Management.Automation.PSObject]
-    # The credentials, account, tenant, and subscription used for communication with Azure.
+    # The DefaultProfile parameter is not functional.
+    # Use the SubscriptionId parameter when available if executing the cmdlet against a different subscription.
     ${DefaultProfile},
 
     [Parameter(DontShow)]
@@ -130,7 +131,7 @@ begin {
         $parameterSet = $PSCmdlet.ParameterSetName
 
         if ($null -eq [Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PowerShellVersion) {
-            [Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PowerShellVersion = $Host.Version.ToString()
+            [Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PowerShellVersion = $PSVersionTable.PSVersion.ToString()
         }         
         $preTelemetryId = [Microsoft.WindowsAzure.Commands.Common.MetricHelper]::TelemetryId
         if ($preTelemetryId -eq '') {