Merge pull request #4 from akv-platform/malob/more-deprecations

More deprecations
actions · Aug 5, 2021 · d7c2e9e · d7c2e9e
2 parents 3f50f05 + dcb11e2
commit d7c2e9e
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 59 deletions.
diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
@@ -31,17 +31,21 @@ if (Test-IsWin19)
 
 $markdown += New-MDHeader "Installed Software" -Level 2
 $markdown += New-MDHeader "Language and Runtime" -Level 3
-$markdown += New-MDList -Style Unordered -Lines (@(
+$languageTools = @(
     (Get-BashVersion),
     (Get-GoVersion),
     (Get-JuliaVersion),
     (Get-NodeVersion),
-    (Get-PerlVersion),
     (Get-PHPVersion),
     (Get-PythonVersion),
     (Get-RubyVersion)
-    ) | Sort-Object
 )
+if (Test-IsWin16 -or Test-IsWin19) {
+    $languageTools += @(
+        (Get-PerlVersion)
+    )
+}
+$markdown += New-MDList -Style Unordered -Lines ($languageTools | Sort-Object)
 
 $packageManagementList = @(
     (Get-ChocoVersion),
@@ -70,16 +74,20 @@ $markdown += Build-PackageManagementEnvironmentTable | New-MDTable
 $markdown += New-MDNewLine
 
 $markdown += New-MDHeader "Project Management" -Level 3
-$markdown += New-MDList -Style Unordered -Lines (@(
+$projectManagementTools = @(
     (Get-AntVersion),
     (Get-GradleVersion),
-    (Get-MavenVersion),
-    (Get-SbtVersion)
-    ) | Sort-Object
+    (Get-MavenVersion)
 )
+if (Test-IsWin16 -or Test-IsWin19) {
+    $projectManagementTools += @(
+        (Get-SbtVersion)
+    )
+}
+$markdown += New-MDList -Style Unordered -Lines ($projectManagementTools | Sort-Object)
 
 $markdown += New-MDHeader "Tools" -Level 3
-$markdown += New-MDList -Style Unordered -Lines (@(
+$toolsList = @(
     (Get-7zipVersion),
     (Get-AzCopyVersion),
     (Get-BazelVersion),
@@ -91,18 +99,14 @@ $markdown += New-MDList -Style Unordered -Lines (@(
     (Get-DockerVersion),
     (Get-DockerComposeVersion),
     (Get-GHCVersion),
-    (Get-GitVersion),
     (Get-GitLFSVersion),
     (Get-GVFSVersion),
-    (Get-GoogleCloudSDKVersion),
     (Get-InnoSetupVersion),
     (Get-JQVersion),
     (Get-KindVersion),
     (Get-KubectlVersion),
     (Get-MercurialVersion),
-    (Get-MinGWVersion),
     (Get-NewmanVersion),
-    (Get-NSISVersion),
     (Get-OpenSSLVersion),
     (Get-PackerVersion),
     (Get-PulumiVersion),
@@ -114,22 +118,34 @@ $markdown += New-MDList -Style Unordered -Lines (@(
     (Get-WinAppDriver),
     (Get-ZstdVersion),
     (Get-YAMLLintVersion)
-    ) | Sort-Object
 )
+if (Test-IsWin16 -or Test-IsWin19) {
+    $toolsList += @(
+        (Get-NSISVersion),
+        (Get-GoogleCloudSDKVersion),
+        (Get-MinGWVersion),
+        (Get-GitVersion)
+    )
+}
+$markdown += New-MDList -Style Unordered -Lines ($toolsList | Sort-Object)
 
 $markdown += New-MDHeader "CLI Tools" -Level 3
-$markdown += New-MDList -Style Unordered -Lines (@(
+$cliTools = @(
     (Get-AlibabaCLIVersion),
     (Get-AWSCLIVersion),
     (Get-AWSSAMVersion),
     (Get-AWSSessionManagerVersion),
     (Get-AzureCLIVersion),
     (Get-AzureDevopsExtVersion),
-    (Get-CloudFoundryVersion),
     (Get-GHVersion),
     (Get-HubVersion)
-    ) | Sort-Object
 )
+if (Test-IsWin16 -or Test-IsWin19) {
+    $cliTools += @(
+        (Get-CloudFoundryVersion)
+    )
+}
+$markdown += New-MDList -Style Unordered -Lines ($cliTools | Sort-Object)
 
 $markdown += New-MDHeader "Rust Tools" -Level 3
 $markdown += New-MDList -Style Unordered -Lines (@(

diff --git a/images/win/scripts/Tests/BizTalk.Tests.ps1 b/images/win/scripts/Tests/BizTalk.Tests.ps1
@@ -3,7 +3,7 @@
 ##  Desc:  Test BizTalk project build component installed.
 ################################################################################
 
-Describe "BizTalk Build Component Setup" -Skip:(Test-IsWin16) {
+Describe "BizTalk Build Component Setup" -Skip:(-not (Test-IsWin19)) {
     It "BizTalk Registry Check" {
         Test-Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\BizTalk Server\3.0" | Should -BeTrue
     }

diff --git a/images/win/scripts/Tests/CLI.Tools.Tests.ps1 b/images/win/scripts/Tests/CLI.Tools.Tests.ps1
@@ -39,7 +39,7 @@ Describe "GitHub CLI" {
     }
 }
 
-Describe "CloudFoundry CLI" {
+Describe "CloudFoundry CLI" -Skip:(Test-IsWin22) {
     It "cf is located in C:\cf-cli" {
         "C:\cf-cli\cf.exe" | Should -Exist
     }

diff --git a/images/win/scripts/Tests/ChocoPackages.Tests.ps1 b/images/win/scripts/Tests/ChocoPackages.Tests.ps1
@@ -16,7 +16,7 @@ Describe "Bicep" {
     }
 }
 
-Describe "GitVersion" {
+Describe "GitVersion" -Skip:(Test-IsWin22) {
     It "gitversion is installed" {
         "gitversion /version" | Should -ReturnZeroExitCode
     }
@@ -52,7 +52,7 @@ Describe "Packer" {
     }
 }
 
-Describe "Perl" {
+Describe "Perl" -Skip:(Test-IsWin22) {
     It "Perl" {
        "perl --version" | Should -ReturnZeroExitCode
     }

diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1
@@ -78,7 +78,7 @@ Describe "KubernetesTools" {
     }
 }
 
-Describe "Mingw64" {
+Describe "Mingw64" -Skip:(Test-IsWin22) {
     It "<ToolName>" -TestCases @(
         @{ ToolName = "gcc" }
         @{ ToolName = "g++" }
@@ -88,7 +88,7 @@ Describe "Mingw64" {
     }
 }
 
-Describe "GoogleCloudSDK"  {
+Describe "GoogleCloudSDK" -Skip:(Test-IsWin22) {
     It "<ToolName>" -TestCases @(
         @{ ToolName = "bq" }
         @{ ToolName = "gcloud" }
@@ -105,7 +105,7 @@ Describe "NET48" {
     }
 }
 
-Describe "NSIS" {
+Describe "NSIS" -Skip:(Test-IsWin22) {
     It "NSIS" {
        "makensis /VERSION" | Should -ReturnZeroExitCode
     }
@@ -121,7 +121,7 @@ Describe "PowerShell Core" {
     }
 }
 
-Describe "Sbt" {
+Describe "Sbt" -Skip:(Test-IsWin22) {
     It "sbt" {
         "sbt --version" | Should -ReturnZeroExitCode
     }

diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json
@@ -72,13 +72,7 @@
                 "2.1.0",
                 "6.13.1"
             ],
-            "zip_versions": [
-                "3.8.0",
-                "4.2.1",
-                "5.1.1",
-                "6.7.0"
-            ],
-            "default": "2.1.0"
+            "zip_versions": []
         },
         {
             "name": "azure",
@@ -87,33 +81,15 @@
                 "2.1.0",
                 "5.3.0"
             ],
-            "zip_versions": [
-                "3.8.0",
-                "4.2.1",
-                "5.1.1"
-            ],
-            "default": "2.1.0"
+            "zip_versions": []
         },
         {
             "name": "az",
             "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json",
             "versions": [
                 "6.1.0"
             ],
-            "zip_versions": [
-                "1.0.0",
-                "1.6.0",
-                "2.3.2",
-                "2.6.0",
-                "3.1.0",
-                "3.5.0",
-                "3.8.0",
-                "4.3.0",
-                "4.4.0",
-                "4.7.0",
-                "5.5.0",
-                "5.9.0"
-            ]
+            "zip_versions": []
         }
     ],
     "java": {
@@ -235,12 +211,10 @@
             { "name": "7zip.install" },
             { "name": "azcopy10" },
             { "name": "Bicep" },
-            { "name": "gitversion.portable" },
             { "name": "jq" },
             { "name": "NuGet.CommandLine" },
             { "name": "openssl.light" },
             { "name": "packer" },
-            { "name": "strawberryperl" },
             { "name": "pulumi" },
             { "name": "tortoisesvn" },
             { "name": "swig" },

diff --git a/images/win/windows2022.json b/images/win/windows2022.json
@@ -200,7 +200,6 @@
                 "{{ template_dir }}/scripts/Installers/Install-GitHub-CLI.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-PHP.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Rust.ps1",
-                "{{ template_dir }}/scripts/Installers/Install-Sbt.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Chrome.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Edge.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Firefox.ps1",
@@ -216,23 +215,18 @@
                 "{{ template_dir }}/scripts/Installers/Install-MysqlCli.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-SQLPowerShellTools.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-DotnetSDK.ps1",
-                "{{ template_dir }}/scripts/Installers/Install-Mingw64.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Haskell.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Stack.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-AzureCosmosDbEmulator.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Mercurial.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Zstd.ps1",
-                "{{ template_dir }}/scripts/Installers/Install-NSIS.ps1",
-                "{{ template_dir }}/scripts/Installers/Install-CloudFoundryCli.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Vcpkg.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-PostgreSQL.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-AliyunCli.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-RootCA.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-MongoDB.ps1",
-                "{{ template_dir }}/scripts/Installers/Install-GoogleCloudSDK.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-CodeQLBundle.ps1",
-                "{{ template_dir }}/scripts/Installers/Install-BizTalkBuildComponent.ps1",
                 "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1",
                 "{{ template_dir }}/scripts/Installers/Run-NGen.ps1"
             ]