Merge pull request Azure#6538 from maddieclayton/fixtypes

Fix Output Types

Author: Maddie Clayton

.gitignore

@@ -218,6 +218,8 @@ pingme.txt
 groupMapping*.json
 /tools/index.json
 /Package/index.json
+/tools/outputtypes.json
+/Package/outputtypes.json
 
 *.msi
 *.wixpdb

build.proj

@@ -280,7 +280,7 @@
 
     <Exec ContinueOnError="false"
       Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot; . $(LibraryToolsFolder)\NewHelpIndex.ps1 -OutputFile $(PackageDirectory)\index.json -BuildConfig $(Configuration) &quot;" 
-	  Condition=" '$(Scope)' == 'All' or '$(Scope)' == 'Latest' and $(CodeSign) == 'true'"/>
+	    Condition=" ('$(Scope)' == 'All' or '$(Scope)' == 'Latest') and $(CodeSign) == 'true'"/>
 
     <!-- Copying modules to be signed -->
 
@@ -314,6 +314,11 @@
           Condition= " '$(Scope)' == 'All' or '$(Scope)' == 'Stack' "/>
 
     <CallTarget Targets="CodeSignBinaries" Condition=" '$(CodeSign)' == 'true' " />
+
+    <Exec ContinueOnError="false"
+      Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot; . $(LibraryToolsFolder)\NewOutputTypeIndex.ps1 -OutputFile $(PackageDirectory)\outputtypes.json -BuildConfig $(Configuration) &quot;" 
+      Condition=" ('$(Scope)' == 'All' or '$(Scope)' == 'Latest') and $(CodeSign) == 'true'"/>
+      
     <!-- AzureRM -->
     <Copy SourceFiles="$(PackageDirectory)\$(Configuration)\AzureRM.psd1"
           DestinationFolder="$(LibraryToolsFolder)\AzureRM" Condition= " '$(Scope)' == 'All' or '$(Scope)' == 'Latest' "/>
@@ -582,9 +587,8 @@
 
     <Message Importance="high" Text="Running dependency analysis..." />
 
-    <Exec Command="$(MSBuildProjectDirectory)\src\Package\StaticAnalysis.exe $(MSBuildProjectDirectory)\src\Package\$(Configuration) $(MSBuildProjectDirectory)\src\Package true $(SkipHelp)"
-          Condition="'$(Scope)' != 'Stack'"
-          ContinueOnError="True"/>
+    <Exec Command="$(MSBuildProjectDirectory)\src\Package\StaticAnalysis.exe $(MSBuildProjectDirectory)\src\Package\$(Configuration) $(MSBuildProjectDirectory)\src\Package true $(SkipHelp) @(ModulesChanged)"
+          Condition="'$(Scope)' != 'Stack'"/>
 
     <Exec Command="$(PackageDirectory)\StaticAnalysis.exe $(StackPackageFolder)\$(Configuration) $(StackPackageFolder)"
           Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'"

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fixed formatting of OutputTypes in help files
 
 ## Version 0.5.1
 * Set minimum dependency of module to PowerShell 5.0

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Commands/Synchronize-AzureASInstance.cs

@@ -37,7 +37,7 @@ namespace Microsoft.Azure.Commands.AnalysisServices.Dataplane
     /// </summary>
     [Cmdlet(VerbsData.Sync, "AzureAnalysisServicesInstance", SupportsShouldProcess = true)]
     [Alias("Sync-AzureAsInstance")]
-    [OutputType(typeof(ScaleOutServerDatabaseSyncDetails[]))]
+    [OutputType(typeof(ScaleOutServerDatabaseSyncDetails))]
     public class SynchronizeAzureAzureAnalysisServer : AzurePSCmdlet
     {
         private static TimeSpan DefaultPollingInterval = TimeSpan.FromSeconds(30);

src/ResourceManager/MachineLearning/Commands.MachineLearning/ChangeLog.md

@@ -18,7 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
-* Fixed formatting of OutputType in help files
+* Fixed formatting of OutputTypes in help files
 
 ## Version 0.18.0
 * Set minimum dependency of module to PowerShell 5.0

src/ResourceManager/MachineLearning/Commands.MachineLearning/Cmdlets/CommitmentPlans/MoveAzureMLCommitmentAssociation.cs

@@ -20,7 +20,7 @@
 namespace Microsoft.Azure.Commands.MachineLearning
 {
     [Cmdlet(VerbsCommon.Move, CommitmentPlansCmdletBase.CommitmentAssociationCommandletSuffix, SupportsShouldProcess = true)]
-    [OutputType(typeof(CommitmentPlan), typeof(CommitmentPlan[]))]
+    [OutputType(typeof(CommitmentPlan))]
     public class MoveAzureMLCommitmentAssociation : CommitmentPlansCmdletBase
     {
         [Parameter(Mandatory = true, HelpMessage = "The name of the resource group for the Azure ML commitment association.")]

src/ResourceManager/Reservations/Commands.Reservations/AzureRM.Reservations.psd1

@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '0.1.3'
+ModuleVersion = '0.1.4'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -72,9 +72,9 @@ NestedModules = @('.\Microsoft.Azure.Commands.Reservations.dll')
 FunctionsToExport = @()
 
 # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
-CmdletsToExport = 'Get-AzureRmReservationOrder', 'Get-AzureRmReservation', 
-               'Get-AzureRmReservationHistory', 'Update-AzureRmReservation', 
-               'Merge-AzureRmReservation', 'Split-AzureRmReservation', 
+CmdletsToExport = 'Get-AzureRmReservationOrder', 'Get-AzureRmReservation',
+               'Get-AzureRmReservationHistory', 'Update-AzureRmReservation',
+               'Merge-AzureRmReservation', 'Split-AzureRmReservation',
                'Get-AzureRmReservationOrderId', 'Get-AzureRmReservationCatalog'
 
 # Variables to export from this module
@@ -110,8 +110,15 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Change Guid paramters to Guid type, not string
-* Set minimum dependency of module to PowerShell 5.0'
+        ReleaseNotes = '* Updated to the latest .NET SDK version 1.8.0-preview
+* Updated Cmdlet Get-AzureRmReservationCatalog
+    - Added parameters ReservedResourceType and Location.
+    - Removed Size and Tier from Catalog response.
+    - Renamed Capabilities to SkuProperties in Catalog response.
+* Updated Cmdlet Update-AzureRmReservation
+    - Added optional InstanceFlexibility parameter.
+* Added properties to Reservation response.
+* Fixed formatting of OutputType in help files'
 
         # Prerelease string of this module
         # Prerelease = ''
@@ -123,7 +130,7 @@ PrivateData = @{
         # ExternalModuleDependencies = @()
 
     } # End of PSData hashtable
-    
+
  } # End of PrivateData hashtable
 
 # HelpInfo URI of this module

src/ResourceManager/Reservations/Commands.Reservations/ChangeLog.md

@@ -19,6 +19,8 @@
         - Additional information about change #1
 -->
 ## Current Release
+
+## Version 0.1.4
 * Updated to the latest .NET SDK version 1.8.0-preview
 * Updated Cmdlet Get-AzureRmReservationCatalog
     - Added parameters ReservedResourceType and Location.

src/ResourceManager/Reservations/Commands.Reservations/Properties/AssemblyInfo.cs

@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Reservations")]
@@ -14,8 +14,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
@@ -25,12 +25,12 @@
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.3.0")]
-[assembly: AssemblyFileVersion("0.1.3.0")]
+[assembly: AssemblyVersion("0.1.4.0")]
+[assembly: AssemblyFileVersion("0.1.4.0")]

src/ResourceManager/SignalR/ChangeLog.md renamed to src/ResourceManager/SignalR/Commands.SignalR/ChangeLog.md

@@ -17,10 +17,8 @@
     * Overview of change #1
         - Additional information about change #1
 -->
-## Current
-
+## Current Release
 * `New-AzureRmSignalR` uses a new version of `Strategy` library (4.0).
 
 ## 0.1.1
-
 * `New-AzureRmSignalR` null reference bug fix.

tools/NewOutputTypeIndex.ps1

@@ -0,0 +1,48 @@
+param(
+    [Parameter(Mandatory = $false)]
+    [string] $BuildConfig = "Debug",
+    [Parameter(Mandatory = $false)]
+    [string] $OutputFile = "$PSScriptRoot/outputtypes.json"
+)
+
+# Get all psd1 files
+$psd1Files = Get-Childitem $PSScriptRoot\..\src\Package\$BuildConfig\ResourceManager -Recurse | where {$_.Name -like "*.psd1" }
+$psd1Files += Get-Childitem $PSScriptRoot\..\src\Package\$BuildConfig\Storage -Recurse | where {$_.Name -like "*.psd1" }
+
+$profilePsd1 = $psd1Files | Where-Object {$_.Name -like "*AzureRM.Profile.psd1"}
+Import-LocalizedData -BindingVariable "psd1File" -BaseDirectory $profilePsd1.DirectoryName -FileName $profilePsd1.Name
+foreach ($nestedModule in $psd1File.RequiredAssemblies)
+{
+    $dllPath = Join-Path -Path $profilePsd1.DirectoryName -ChildPath $nestedModule
+    $Assembly = [Reflection.Assembly]::LoadFrom($dllPath)
+}
+
+
+$outputTypes = New-Object System.Collections.Generic.HashSet[string]
+
+$psd1Files | ForEach {
+    Import-LocalizedData -BindingVariable "psd1File" -BaseDirectory $_.DirectoryName -FileName $_.Name
+    foreach ($nestedModule in $psd1File.NestedModules)
+    {
+        $dllPath = Join-Path -Path $_.DirectoryName -ChildPath $nestedModule
+        $Assembly = [Reflection.Assembly]::LoadFrom($dllPath)
+        $exportedTypes = $Assembly.GetTypes()
+        foreach ($exportedType in $exportedTypes)
+        {
+            foreach ($attribute in $exportedType.CustomAttributes)
+            {
+                if ($attribute.AttributeType.Name -eq "OutputTypeAttribute")
+                {
+                    $cmdletOutputTypes = $attribute.ConstructorArguments.Value.Value
+                    foreach ($cmdletOutputType in $cmdletOutputTypes)
+                    {
+                        $outputTypes.Add($cmdletOutputType.FullName) | Out-Null
+                    }
+                }
+            }
+        }
+    }
+}
+
+$json = ConvertTo-Json $outputTypes
+$json | Out-File "$OutputFile"

tools/StaticAnalysis/Exceptions/Azure.AnalysisServices/BreakingChangeIssues.csv

@@ -1 +1,2 @@
 "AssemblyFileName","ClassName","Target","Severity","ProblemId","Description","Remediation"
+"Microsoft.Azure.Commands.AnalysisServices.Dataplane.dll","Microsoft.Azure.Commands.AnalysisServices.Dataplane.SynchronizeAzureAzureAnalysisServer","Sync-AzureAnalysisServicesInstance","0","1020","The cmdlet 'Sync-AzureAnalysisServicesInstance' no longer has output type 'Microsoft.Azure.Commands.AnalysisServices.Dataplane.Models.ScaleOutServerDatabaseSyncDetails[]'.","Make cmdlet 'Sync-AzureAnalysisServicesInstance' return type 'Microsoft.Azure.Commands.AnalysisServices.Dataplane.Models.ScaleOutServerDatabaseSyncDetails[]'."

tools/StaticAnalysis/Exceptions/AzureRM.MachineLearning/BreakingChangeIssues.csv

@@ -3,3 +3,4 @@
 "Microsoft.Azure.Commands.MachineLearning.dll","Microsoft.Azure.Commands.MachineLearning.GetAzureMLCommitmentPlanUsageHistory","Get-AzureRmMlCommitmentPlanUsageHistory","0","1020","The cmdlet 'Get-AzureRmMlCommitmentPlanUsageHistory' no longer has output type 'Microsoft.Azure.Management.MachineLearning.CommitmentPlans.Models.PlanUsageHistory[]'.","Make cmdlet 'Get-AzureRmMlCommitmentPlanUsageHistory' return type 'Microsoft.Azure.Management.MachineLearning.CommitmentPlans.Models.PlanUsageHistory[]'."
 "Microsoft.Azure.Commands.MachineLearning.dll","Microsoft.Azure.Commands.MachineLearning.GetAzureMLCommitmentPlan","Get-AzureRmMlCommitmentPlan","0","1020","The cmdlet 'Get-AzureRmMlCommitmentPlan' no longer has output type 'Microsoft.Azure.Management.MachineLearning.CommitmentPlans.Models.CommitmentPlan[]'.","Make cmdlet 'Get-AzureRmMlCommitmentPlan' return type 'Microsoft.Azure.Management.MachineLearning.CommitmentPlans.Models.CommitmentPlan[]'."
 "Microsoft.Azure.Commands.MachineLearning.dll","Microsoft.Azure.Commands.MachineLearning.GetAzureMLWebService","Get-AzureRmMlWebService","0","1020","The cmdlet 'Get-AzureRmMlWebService' no longer has output type 'Microsoft.Azure.Management.MachineLearning.WebServices.Models.WebService[]'.","Make cmdlet 'Get-AzureRmMlWebService' return type 'Microsoft.Azure.Management.MachineLearning.WebServices.Models.WebService[]'."
+"Microsoft.Azure.Commands.MachineLearning.dll","Microsoft.Azure.Commands.MachineLearning.MoveAzureMLCommitmentAssociation","Move-AzureRmMlCommitmentAssociation","0","1020","The cmdlet 'Move-AzureRmMlCommitmentAssociation' no longer has output type 'Microsoft.Azure.Management.MachineLearning.CommitmentPlans.Models.CommitmentPlan[]'.","Make cmdlet 'Move-AzureRmMlCommitmentAssociation' return type 'Microsoft.Azure.Management.MachineLearning.CommitmentPlans.Models.CommitmentPlan[]'."