Adds support for 7.5.0 and net9.0

ironmansoftware · Jan 28, 2025 · eee6bc4 · eee6bc4
1 parent 445e01c
commit eee6bc4
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 18 deletions.
diff --git a/PowerShellTools.Shared/Project/PropertyPages/AdvancedPropertyPageViewModel.cs b/PowerShellTools.Shared/Project/PropertyPages/AdvancedPropertyPageViewModel.cs
@@ -48,27 +48,31 @@ public AdvancedPropertyPageViewModel(IVisualStudio visualStudio)
             PowerShellVersions = new[]
             {
                 "Windows PowerShell",
-                "7.0.0",
-                "7.0.1",
-                "7.0.2",
-                "7.0.3",
-                "7.0.6",
-                "7.1.0",
-                "7.1.1",
-                "7.1.2",
-                "7.1.3",
-                "7.1.4",
-                "7.1.5",
                 "7.2.0",
                 "7.2.1",
+                "7.2.10",
+                "7.2.12",
+                "7.2.13",
+                "7.2.14",
+                "7.2.16",
+                "7.2.17",
+                "7.2.18",
                 "7.2.2",
+                "7.2.21",
+                "7.2.22",
+                "7.2.23",
+                "7.2.24",
                 "7.2.3",
                 "7.2.4",
                 "7.2.5",
                 "7.2.6",
                 "7.2.7",
+                "7.2.8",
+                "7.2.9",
                 "7.3.0",
                 "7.3.1",
+                "7.3.10",
+                "7.3.11",
                 "7.3.2",
                 "7.3.3",
                 "7.3.4",
@@ -77,9 +81,15 @@ public AdvancedPropertyPageViewModel(IVisualStudio visualStudio)
                 "7.3.7",
                 "7.3.8",
                 "7.3.9",
-                "7.3.10",
-                "7.4.0"
-
+                "7.4.0",
+                "7.4.1",
+                "7.4.2",
+                "7.4.3",
+                "7.4.4",
+                "7.4.5",
+                "7.4.6",
+                "7.4.7",
+                "7.5.0"
             };
 
             NetVersions = new[]
@@ -89,6 +99,7 @@ public AdvancedPropertyPageViewModel(IVisualStudio visualStudio)
                 "net471",
                 "net472",
                 "net480",
+                "net481",
                 "netcoreapp31",
                 "net5.0",
                 "net6.0",
@@ -251,6 +262,18 @@ public string PowerShellVersion
                     DotNetVersionEnabled = false;
                 }
 
+                if (Version.TryParse(value, out Version version4) && version2.Major == 7 && version2.Minor == 4)
+                {
+                    NetVersion = "net8.0";
+                    DotNetVersionEnabled = false;
+                }
+
+                if (Version.TryParse(value, out Version version5) && version2.Major == 7 && version2.Minor == 5)
+                {
+                    NetVersion = "net9.0";
+                    DotNetVersionEnabled = false;
+                }
+
                 PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(PowerShellVersion)));
             }
         }

diff --git a/PowerShellToolsPro.Packager/PackageProcess.cs b/PowerShellToolsPro.Packager/PackageProcess.cs
@@ -129,10 +129,10 @@ public string FileVersion
 
     public class ValidateStage : Stage
     {
-        public string[] validPSVersions = new[] { "7.0.0", "7.0.1", "7.0.2", "7.0.3", "7.0.6", "7.1.0", "7.1.1", "7.1.2", "7.1.3", "7.1.4", "7.1.5", "7.2.0", "7.2.1", "7.2.2", "7.2.3", "7.2.4", "7.2.5", "7.2.6", "7.2.7", "7.3.0", "7.3.1", "7.3.2", "7.3.3", "7.3.4", "7.3.5", "7.3.6", "7.3.7", "7.3.8", "7.3.9", "7.3.10", "7.4.0" };
-        public string[] validNetVersionsForSystemDefault = new[] { "net462", "net470", "net471", "net472", "net480" };
-        public string[] validNetVersionsForNew = new[] { "netcoreapp31", "net50", "net60", "net70", "net80" };
-        public string[] validNetVersions = new[] { "net462", "net470", "net471", "net472", "net480", "netcoreapp31", "net50", "net60", "net70", "net80" };
+        public string[] validPSVersions = new[] { "7.2.0", "7.2.1", "7.2.10", "7.2.12", "7.2.13", "7.2.14", "7.2.16", "7.2.17", "7.2.18", "7.2.2", "7.2.21", "7.2.22", "7.2.23", "7.2.24", "7.2.3", "7.2.4", "7.2.5", "7.2.6", "7.2.7", "7.2.8", "7.2.9", "7.3.0", "7.3.1", "7.3.10", "7.3.11", "7.3.2", "7.3.3", "7.3.4", "7.3.5", "7.3.6", "7.3.7", "7.3.8", "7.3.9", "7.4.0", "7.4.1", "7.4.2", "7.4.3", "7.4.4", "7.4.5", "7.4.6", "7.4.7", "7.5.0" };
+        public string[] validNetVersionsForSystemDefault = new[] { "net462", "net470", "net471", "net472", "net480", "net481" };
+        public string[] validNetVersionsForNew = new[] { "netcoreapp31", "net50", "net60", "net70", "net80", "net81", "net90" };
+        public string[] validNetVersions = new[] { "net462", "net470", "net471", "net472", "net480", "net481", "netcoreapp31", "net50", "net60", "net70", "net80", "net90" };
 
         public override StageResult Execute(PackageProcess process, StageResult previousStage)
         {