Chenlei fix the issue of StackEdge (#12069)

Co-authored-by: wyunchi-ms <[email protected]>
Azure · Jun 5, 2020 · 12c76b9 · 12c76b9
1 parent 6d9947a
commit 12c76b9
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 6 deletions.
diff --git a/tools/VersionController/Models/VersionBumper.cs b/tools/VersionController/Models/VersionBumper.cs
@@ -6,6 +6,7 @@
 using System.Reflection;
 using System.Text.RegularExpressions;
 using Tools.Common.Models;
+using VersionController.Utilities;
 
 namespace VersionController.Models
 {
@@ -296,7 +297,7 @@ private void UpdateDependentModules()
                                                    .Where(f => !f.Contains("Netcore") &&
                                                                !f.Contains("bin") &&
                                                                !f.Contains("dll-Help") &&
-                                                               !f.Contains("Stack"))
+                                                               !ModuleFilter.IsAzureStackModule(f))
                                                    .ToList();
                 foreach (var moduleManifestPath in moduleManifestPaths)
                 {

diff --git a/tools/VersionController/Models/VersionFileHelper.cs b/tools/VersionController/Models/VersionFileHelper.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using VersionController.Utilities;
 
 namespace VersionController.Models
 {
@@ -65,11 +66,11 @@ public VersionFileHelper(string rootDirectory, string outputModuleManifestPath,
         public string ChangeLogPath => Directory.GetFiles(ProjectDirectory, "ChangeLog.md").FirstOrDefault();
 
         public List<string> AssemblyInfoPaths => Directory.GetFiles(SrcDirectory, "AssemblyInfo.cs", SearchOption.AllDirectories)
-                                                            .Where(f => !f.Contains("Stack") && !f.Contains(".Test"))
+                                                            .Where(f => !ModuleFilter.IsAzureStackModule(f) && !f.Contains(".Test"))
                                                             .ToList();
 
-        public string GalleryModuleDirectory => Path.Combine(OutputModuleDirectory, ModuleName);
+        public string GalleryModuleDirectory => OutputModuleDirectory;
 
-        public string GalleryModuleVersionDirectory => Directory.GetDirectories(GalleryModuleDirectory).FirstOrDefault();
+        public string GalleryModuleVersionDirectory => GalleryModuleDirectory;
     }
 }
diff --git a/tools/VersionController/Program.cs b/tools/VersionController/Program.cs
@@ -7,6 +7,7 @@
 using System.Reflection;
 using Tools.Common.Models;
 using VersionController.Models;
+using VersionController.Utilities;
 
 namespace VersionController
 {
@@ -105,7 +106,7 @@ private static void BumpVersions()
             foreach (var directory in _projectDirectories)
             {
                 var changeLogs = Directory.GetFiles(directory, "ChangeLog.md", SearchOption.AllDirectories)
-                                            .Where(f => (!f.Contains("Stack") || f.Contains("StackEdge")) && IsChangeLogUpdated(f))
+                                            .Where(f => !ModuleFilter.IsAzureStackModule(f) && IsChangeLogUpdated(f))
                                             .Select(f => GetModuleManifestPath(Directory.GetParent(f).FullName))
                                             .Where(m => m.Contains(_moduleNameFilter))
                                             .ToList();
@@ -170,7 +171,7 @@ private static void ValidateVersionBump()
             foreach (var directory in _projectDirectories)
             {
                 var changeLogs = Directory.GetFiles(directory, "ChangeLog.md", SearchOption.AllDirectories)
-                                            .Where(f => !f.Contains("Stack"))
+                                            .Where(f => !ModuleFilter.IsAzureStackModule(f))
                                             .Select(f => GetModuleManifestPath(Directory.GetParent(f).FullName))
                                             .Where(m => !string.IsNullOrEmpty(m) && m.Contains(_moduleNameFilter))
                                             .ToList();

diff --git a/tools/VersionController/Utilities/ModuleFilter.cs b/tools/VersionController/Utilities/ModuleFilter.cs
@@ -0,0 +1,41 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+
+namespace VersionController.Utilities
+{
+    class ModuleFilter
+    {
+        public static bool IsAzureStackModule(String fileName)
+        {
+            bool isAzureStackModule = false;
+            if (fileName.Contains("Stack"))
+            {
+                isAzureStackModule = true;
+            }
+            var executingAssemblyPath = Assembly.GetExecutingAssembly().Location;
+            var versionControllerDirectory = Directory.GetParent(executingAssemblyPath).FullName;
+            var whiteListFile = Path.Combine(versionControllerDirectory, "WhiteList.csv");
+            if (File.Exists(whiteListFile))
+            {
+                var lines = File.ReadAllLines(whiteListFile).Skip(1).Where(c => !string.IsNullOrEmpty(c));
+                foreach (var line in lines)
+                {
+                    var cols = line.Split(",").Select(c => c.StartsWith("\"") ? c.Substring(1) : c)
+                                              .Select(c => c.EndsWith("\"") ? c.Substring(0, c.Length - 1) : c)
+                                              .Select(c => c.Trim()).ToArray();
+                    if (cols.Length >= 1)
+                    {
+                        if (fileName.Contains(cols[0]))
+                        {
+                            isAzureStackModule = false;
+                            break;
+                        }
+                    }
+                }
+            }
+            return isAzureStackModule;
+        }
+    }
+}
diff --git a/tools/VersionController/VersionController.Netcore.csproj b/tools/VersionController/VersionController.Netcore.csproj
@@ -48,6 +48,7 @@
 
   <ItemGroup>
     <Content Include="MinimalVersion.csv" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="WhiteList.csv" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
 </Project>
diff --git a/tools/VersionController/WhiteList.csv b/tools/VersionController/WhiteList.csv
@@ -0,0 +1,2 @@
+Module
+StackEdge