Revert some changes.

Author: sergey-shandar

tools/StaticAnalysis/BreakingChangeAnalyzer/BreakingChangeAnalyzer.cs

@@ -41,7 +41,7 @@ public BreakingChangeAnalyzer()
         }
 
         /// <summary>
-        /// Given a set of directory paths containing PowerShell module folders, 
+        /// Given a set of directory paths containing PowerShell module folders,
         /// analyze the breaking changes in the modules and report any issues
         /// </summary>
         /// <param name="cmdletProbingDirs">Set of directory paths containing PowerShell module folders to be checked for breaking changes.</param>
@@ -53,7 +53,7 @@ public void Analyze(IEnumerable<string> cmdletProbingDirs)
         /// <summary>
         /// Given a set of directory paths containing PowerShell module folders,
         /// analyze the breaking changes in the modules and report any issues
-        /// 
+        ///
         /// Filters can be added to find breaking changes for specific modules
         /// </summary>
         /// <param name="cmdletProbingDirs">Set of directory paths containing PowerShell module folders to be checked for breaking changes.</param>
@@ -73,7 +73,7 @@ public void Analyze(
                 cmdletProbingDirs = directoryFilter(cmdletProbingDirs);
             }
 
-            foreach (var baseDirectory in cmdletProbingDirs.Where(s => !s.Contains("ServiceManagement") && 
+            foreach (var baseDirectory in cmdletProbingDirs.Where(s => !s.Contains("ServiceManagement") &&
                                                                         !s.Contains("Stack") && Directory.Exists(Path.GetFullPath(s))))
             {
                 List<string> probingDirectories = new List<string>();
@@ -85,10 +85,6 @@ public void Analyze(
                 foreach (var directory in probingDirectories)
                 {
                     var service = Path.GetFileName(directory);
-                    if (service.ToLower().EndsWith("experiments"))
-                    {
-                        return;
-                    }
 
                     var manifestFiles = Directory.EnumerateFiles(directory, "*.psd1").ToList();
 
@@ -108,8 +104,8 @@ public void Analyze(
                     var psd1FileName = Path.GetFileName(psd1);
 
                     PowerShell powershell = PowerShell.Create();
-                    powershell.AddScript("Import-LocalizedData -BaseDirectory " + parentDirectory + 
-                                        " -FileName " + psd1FileName + 
+                    powershell.AddScript("Import-LocalizedData -BaseDirectory " + parentDirectory +
+                                        " -FileName " + psd1FileName +
                                         " -BindingVariable ModuleMetadata; $ModuleMetadata.NestedModules");
 
                     var cmdletResult = powershell.Invoke();
@@ -120,17 +116,17 @@ public void Analyze(
                         foreach (var cmdletFileName in cmdletFiles)
                         {
                             var cmdletFileFullPath = Path.Combine(directory, Path.GetFileName(cmdletFileName));
-                            
+
                             if (File.Exists(cmdletFileFullPath))
                             {
                                 issueLogger.Decorator.AddDecorator(a => a.AssemblyFileName = cmdletFileFullPath, "AssemblyFileName");
                                 processedHelpFiles.Add(cmdletFileName);
-                                var proxy = 
+                                var proxy =
                                     EnvironmentHelpers.CreateProxy<CmdletBreakingChangeLoader>(directory, out _appDomain);
                                 var newModuleMetadata = proxy.GetModuleMetadata(cmdletFileFullPath);
 
                                 string fileName = cmdletFileName + ".json";
-                                string executingPath = 
+                                string executingPath =
                                     Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).AbsolutePath);
 
                                 string filePath = executingPath + "\\SerializedCmdlets\\" + fileName;

tools/StaticAnalysis/HelpAnalyzer/HelpAnalyzer.cs

@@ -63,11 +63,9 @@ private static bool IsAssemblyFile(string path)
             {
                 result = result && !regex.IsMatch(fileName);
             }
-
-            return result;
         }
         /// <summary>
-        /// Given a set of directory paths containing PowerShell module folders, analyze the help 
+        /// Given a set of directory paths containing PowerShell module folders, analyze the help
         /// in the module folders and report any issues
         /// </summary>
         /// <param name="scopes"></param>
@@ -155,7 +153,7 @@ private void AnalyzeMarkdownHelp(
             string savedDirectory)
         {
             var helpFolder = Directory.EnumerateDirectories(directory, "help").FirstOrDefault();
-            var service = Path.GetFileName(directory);            
+            var service = Path.GetFileName(directory);
             if (helpFolder == null)
             {
                 helpLogger.LogRecord(new HelpIssue()
@@ -197,14 +195,7 @@ private void AnalyzeMarkdownHelp(
                                     " -FileName " + psd1FileName +
                                     " -BindingVariable ModuleMetadata; $ModuleMetadata.NestedModules");
                 var cmdletResult = powershell.Invoke();
-
-                // used for webapp experimental cmdlets. Reason: no nested modules.
-                if (cmdletResult == null)
-                {
-                    return;
-                }
-
-                var cmdletFiles = cmdletResult.Where(i => i != null && !string.IsNullOrWhiteSpace(i.ToString()) && i.ToString().Length > 2).Select(c => c.ToString().Substring(2));
+                var cmdletFiles = cmdletResult.Select(c => c.ToString().Substring(2));
                 if (cmdletFiles.Any())
                 {
                     List<CmdletHelpMetadata> allCmdlets = new List<CmdletHelpMetadata>();
@@ -235,7 +226,7 @@ private void AnalyzeMarkdownHelp(
             }
         }
 
-        private void ValidateHelpRecords(IList<CmdletHelpMetadata> cmdlets, IList<string> helpRecords, 
+        private void ValidateHelpRecords(IList<CmdletHelpMetadata> cmdlets, IList<string> helpRecords,
             ReportLogger<HelpIssue> helpLogger)
         {
             foreach (var cmdlet in cmdlets)
@@ -247,7 +238,7 @@ private void ValidateHelpRecords(IList<CmdletHelpMetadata> cmdlets, IList<string
                         Target = cmdlet.ClassName,
                         Severity = 1,
                         ProblemId = MissingHelp,
-                        Description = string.Format("Help missing for cmdlet {0} implemented by class {1}", 
+                        Description = string.Format("Help missing for cmdlet {0} implemented by class {1}",
                         cmdlet.CmdletName, cmdlet.ClassName),
                         Remediation = string.Format("Add Help record for cmdlet {0} to help file.", cmdlet.CmdletName)
                     });

tools/UpdateModules.ps1

@@ -50,7 +50,7 @@ function Create-ModulePsm1
            elseif ($mod["RequiredVersion"])
            {
                $importedModules += "Import-Module " + $mod["ModuleName"] + " -RequiredVersion " + $mod["RequiredVersion"] + "`r`n"
-           }        
+           }
         }
      }
 
@@ -69,7 +69,7 @@ function Create-ModulePsm1
 
      $contructedCommands = Find-DefaultResourceGroupCmdlets -AddDefaultParameters $AddDefaultParameters -ModuleMetadata $ModuleMetadata -ModulePath $ModulePath
      $template = $template -replace "%COMMANDS%", $contructedCommands
-     
+
      Write-Host "Writing psm1 manifest to $templateOutputPath"
      $template | Out-File -FilePath $templateOutputPath -Force
      $file = Get-Item -Path $templateOutputPath
@@ -86,7 +86,7 @@ function Find-DefaultResourceGroupCmdlets
     )
     PROCESS
     {
-        if ($AddDefaultParameters) 
+        if ($AddDefaultParameters)
         {
         $nestedModules = $ModuleMetadata.NestedModules
         $AllCmdlets = @()
@@ -96,9 +96,9 @@ function Find-DefaultResourceGroupCmdlets
             $dllCmdlets = $Assembly.GetTypes() | Where-Object {$_.CustomAttributes.AttributeType.Name -contains "CmdletAttribute"}
             $AllCmdlets += $dllCmdlets
         }
-        
+
         $FilteredCommands = $AllCmdlets | Where-Object {Test-CmdletRequiredParameter -Cmdlet $_ -Parameter "ResourceGroupName"}
-    
+
         if ($FilteredCommands.Length -eq 0) {
             $contructedCommands = "@()"
         }
@@ -109,7 +109,7 @@ function Find-DefaultResourceGroupCmdlets
             }
             $contructedCommands = $contructedCommands -replace ".$",")"
         }
-    
+
         return $contructedCommands
         }
 
@@ -144,7 +144,7 @@ function Test-CmdletRequiredParameter
                 return $true
             }
         }
-        
+
         return $false
     }
 }
@@ -180,10 +180,10 @@ if ([string]::IsNullOrEmpty($buildConfig))
 if ([string]::IsNullOrEmpty($scope))
 {
     Write-Verbose "Default scope to all"
-    $scope = 'All'  
+    $scope = 'All'
 }
 
-Write-Host "Updating $scope package(and its dependencies)" 
+Write-Host "Updating $scope package(and its dependencies)"
 
 $packageFolder = "$PSScriptRoot\..\src\Package"
 
@@ -209,21 +209,21 @@ if (($scope -eq 'All') -or ($scope -eq 'AzureStorage')) {
     # Publish AzureStorage module
     Write-Host "Updating AzureStorage module from $modulePath"
     Create-ModulePsm1 -ModulePath $modulePath -TemplatePath $templateLocation $false
-} 
+}
 
 if (($scope -eq 'All') -or ($scope -eq 'ServiceManagement')) {
     $modulePath = "$packageFolder\$buildConfig\ServiceManagement\Azure"
     # Publish Azure module
     Write-Host "Updating ServiceManagement(aka Azure) module from $modulePath"
     Create-ModulePsm1 -ModulePath $modulePath -TemplatePath $templateLocation $false
-} 
+}
 
 $resourceManagerModules = Get-ChildItem -Path $resourceManagerRootFolder -Directory
-if ($scope -eq 'All') {  
+if ($scope -eq 'All') {
     foreach ($module in $resourceManagerModules) {
-        # filter out AzureRM.Profile which always gets published first 
-        # And "Azure.Storage" which is built out as test dependencies  
-        if (($module.Name -ne "AzureRM.Profile") -and ($module.Name -ne "Azure.Storage") -and (!$module.Name.Contains("Experiment"))) {
+        # filter out AzureRM.Profile which always gets published first
+        # And "Azure.Storage" which is built out as test dependencies
+        if (($module.Name -ne "AzureRM.Profile") -and ($module.Name -ne "Azure.Storage")) {
             $modulePath = $module.FullName
             Write-Host "Updating $module module from $modulePath"
             Create-ModulePsm1 -ModulePath $modulePath -TemplatePath $templateLocation $true
@@ -235,14 +235,14 @@ if ($scope -eq 'All') {
     if (Test-Path $modulePath) {
         Write-Host "Updating $scope module from $modulePath"
         Create-ModulePsm1 -ModulePath $modulePath -TemplatePath $templateLocation $false
-        Write-Host "Updated $scope module"        
+        Write-Host "Updated $scope module"
     } else {
         Write-Error "Can not find module with name $scope to publish"
     }
 }
 
 if (($scope -eq 'All') -or ($scope -eq 'AzureRM')) {
-    # Update AzureRM module    
+    # Update AzureRM module
     if ($Profile -eq "Stack")
     {
         $modulePath = "$PSScriptRoot\..\src\StackAdmin\AzureRM"
@@ -260,5 +260,5 @@ if (($scope -eq 'All') -or ($scope -eq 'AzureRM')) {
         Create-ModulePsm1 -ModulePath $modulePath -TemplatePath $templateLocation $false
         Write-Host "Updated Azure module"
     }
-} 
+}