From 394c19d40893ca8bf8903e7f845e5ab4a42222e5 Mon Sep 17 00:00:00 2001 From: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com> Date: Wed, 27 Jul 2022 19:30:22 +0200 Subject: [PATCH 1/6] [macOS] Add Cmake 3.22.1 for Android (#5975) --- images/macos/toolsets/toolset-11.json | 3 ++- images/macos/toolsets/toolset-12.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 9b0ad6b10..290542b79 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -174,7 +174,8 @@ "addon-list": [], "additional-tools": [ "cmake;3.10.2.4988404", - "cmake;3.18.1" + "cmake;3.18.1", + "cmake;3.22.1" ], "ndk": { "versions": [ diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index 457154206..a098a1e0c 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -109,7 +109,8 @@ ], "addon-list": [], "additional-tools": [ - "cmake;3.18.1" + "cmake;3.18.1", + "cmake;3.22.1" ], "ndk": { "versions": [ From cd98711e9dbb26c69b8cfc9ebbec182d8e899f4c Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 28 Jul 2022 18:08:57 +0400 Subject: [PATCH 2/6] Add ndk-related environment variables to ubuntu (#5983) --- .../scripts/SoftwareReport/SoftwareReport.Android.psm1 | 10 ++++++++-- images/linux/scripts/installers/android.sh | 7 +++++++ images/linux/toolsets/toolset-1804.json | 1 + images/linux/toolsets/toolset-2004.json | 1 + images/linux/toolsets/toolset-2204.json | 1 + 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1 index 2c84696c4..b7ce2b8e1 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Android.psm1 @@ -156,13 +156,19 @@ function Get-AndroidGoogleAPIsVersions { function Get-AndroidNDKVersions { $ndkFolderPath = Join-Path (Get-AndroidSDKRoot) "ndk" $versions = Get-ChildItem -Path $ndkFolderPath -Name - return ($versions | Join-String -Separator "
") + $ndkDefaultVersion = Get-ToolsetValue "android.ndk.default" + $ndkDefaultFullVersion = Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkDefaultVersion.*" -Name | Select-Object -Last 1 + + return ($versions | ForEach-Object { + $defaultPostfix = ( $_ -eq $ndkDefaultFullVersion ) ? " (default)" : "" + $_ + $defaultPostfix + } | Join-String -Separator "
") } function Build-AndroidEnvironmentTable { $androidVersions = Get-Item env:ANDROID_* - $shouldResolveLink = 'ANDROID_NDK_LATEST_HOME' + $shouldResolveLink = 'ANDROID_NDK', 'ANDROID_NDK_HOME', 'ANDROID_NDK_ROOT', 'ANDROID_NDK_LATEST_HOME' return $androidVersions | Sort-Object -Property Name | ForEach-Object { [PSCustomObject] @{ "Name" = $_.Name diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index 1d5d3d7ea..1a34bf2f0 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -84,6 +84,7 @@ extras=$(get_toolset_value '.android.extra_list[]|"extras;" + .') addons=$(get_toolset_value '.android.addon_list[]|"add-ons;" + .') additional=$(get_toolset_value '.android.additional_tools[]') ANDROID_NDK_MAJOR_VERSIONS=($(get_toolset_value '.android.ndk.versions[]')) +ANDROID_NDK_MAJOR_DEFAULT=$(get_toolset_value '.android.ndk.default') components=("${extras[@]}" "${addons[@]}" "${additional[@]}") for ndk_version in "${ANDROID_NDK_MAJOR_VERSIONS[@]}" @@ -93,7 +94,13 @@ do done ANDROID_NDK_MAJOR_LATEST=(${ANDROID_NDK_MAJOR_VERSIONS[-1]}) +ndkDefaultFullVersion=$(get_full_ndk_version $ANDROID_NDK_MAJOR_DEFAULT) ndkLatestFullVersion=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LATEST) +ANDROID_NDK="$ANDROID_SDK_ROOT/ndk/$ndkDefaultFullVersion" +# ANDROID_NDK, ANDROID_NDK_HOME, and ANDROID_NDK_LATEST_HOME variables should be set as many customer builds depend on them https://github.com/actions/virtual-environments/issues/5879 +echo "ANDROID_NDK=${ANDROID_NDK}" | tee -a /etc/environment +echo "ANDROID_NDK_HOME=${ANDROID_NDK}" | tee -a /etc/environment +echo "ANDROID_NDK_ROOT=${ANDROID_NDK}" | tee -a /etc/environment echo "ANDROID_NDK_LATEST_HOME=$ANDROID_SDK_ROOT/ndk/$ndkLatestFullVersion" | tee -a /etc/environment availablePlatforms=($($SDKMANAGER --list | sed -n '/Available Packages:/,/^$/p' | grep "platforms;android-[0-9]" | cut -d"|" -f 1)) diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 9c268c2ed..264c6d96a 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -106,6 +106,7 @@ "cmake;3.22.1" ], "ndk": { + "default": "25", "versions": [ "23", "24", "25" ] diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 1e8568e29..9ec9940b2 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -103,6 +103,7 @@ "cmake;3.22.1" ], "ndk": { + "default": "25", "versions": [ "23", "24", "25" ] diff --git a/images/linux/toolsets/toolset-2204.json b/images/linux/toolsets/toolset-2204.json index c1beb9f8d..1b8f528b2 100644 --- a/images/linux/toolsets/toolset-2204.json +++ b/images/linux/toolsets/toolset-2204.json @@ -89,6 +89,7 @@ "cmake;3.22.1" ], "ndk": { + "default": "25", "versions": [ "23", "24", "25" ] From 1c6ef2dda5205bcf5bb9786a3a687084057339d3 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 29 Jul 2022 10:50:39 +0400 Subject: [PATCH 3/6] Add ndk-related environment variables (#5984) --- images/macos/provision/core/android-toolsets.sh | 7 +++++++ .../macos/software-report/SoftwareReport.Android.psm1 | 10 ++++++++-- images/macos/toolsets/toolset-10.15.json | 1 + images/macos/toolsets/toolset-11.json | 1 + images/macos/toolsets/toolset-12.json | 1 + 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/images/macos/provision/core/android-toolsets.sh b/images/macos/provision/core/android-toolsets.sh index c20dc7d77..ff5362fc4 100755 --- a/images/macos/provision/core/android-toolsets.sh +++ b/images/macos/provision/core/android-toolsets.sh @@ -32,6 +32,7 @@ ANDROID_EXTRA_LIST=($(get_toolset_value '.android."extra-list"[]')) ANDROID_ADDON_LIST=($(get_toolset_value '.android."addon-list"[]')) ANDROID_ADDITIONAL_TOOLS=($(get_toolset_value '.android."additional-tools"[]')) ANDROID_NDK_MAJOR_VERSIONS=($(get_toolset_value '.android.ndk."versions"[]')) +ANDROID_NDK_MAJOR_DEFAULT=$(get_toolset_value '.android.ndk.default') ANDROID_NDK_MAJOR_LATEST=$(get_toolset_value '.android.ndk."versions"[-1]') # Get the latest command line tools from https://developer.android.com/studio#cmdline-tools cmdlineToolsVersion=$(get_toolset_value '.android."cmdline-tools"') @@ -81,8 +82,14 @@ do echo y | $SDKMANAGER "ndk;$ndk_full_version" done +ndkDefault=$(get_full_ndk_version $ANDROID_NDK_MAJOR_DEFAULT) +ANDROID_NDK_HOME=$ANDROID_HOME/ndk/$ndkDefault ndkLatest=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LATEST) ANDROID_NDK_LATEST_HOME=$ANDROID_HOME/ndk/$ndkLatest +# ANDROID_NDK, ANDROID_NDK_HOME, and ANDROID_NDK_LATEST_HOME variables should be set as many customer builds depend on them https://github.com/actions/virtual-environments/issues/5879 +echo "export ANDROID_NDK=$ANDROID_NDK_HOME" >> "${HOME}/.bashrc" +echo "export ANDROID_NDK_HOME=$ANDROID_NDK_HOME" >> "${HOME}/.bashrc" +echo "export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME" >> "${HOME}/.bashrc" echo "export ANDROID_NDK_LATEST_HOME=$ANDROID_NDK_LATEST_HOME" >> "${HOME}/.bashrc" availablePlatforms=($($SDKMANAGER --list | grep "platforms;android-[0-9]" | cut -d"|" -f 1 | sort -u)) diff --git a/images/macos/software-report/SoftwareReport.Android.psm1 b/images/macos/software-report/SoftwareReport.Android.psm1 index 97b961483..e2db090fd 100644 --- a/images/macos/software-report/SoftwareReport.Android.psm1 +++ b/images/macos/software-report/SoftwareReport.Android.psm1 @@ -96,7 +96,7 @@ function Build-AndroidTable { function Build-AndroidEnvironmentTable { $androidVersions = Get-Item env:ANDROID_* - $shoulddResolveLink = 'ANDROID_NDK_LATEST_HOME' + $shoulddResolveLink = 'ANDROID_NDK', 'ANDROID_NDK_HOME', 'ANDROID_NDK_ROOT', 'ANDROID_NDK_LATEST_HOME' return $androidVersions | Sort-Object -Property Name | ForEach-Object { [PSCustomObject] @{ "Name" = $_.Name @@ -177,7 +177,13 @@ function Get-AndroidGoogleAPIsVersions { function Get-AndroidNDKVersions { $ndkFolderPath = Join-Path (Get-AndroidSDKRoot) "ndk" $versions += Get-ChildItem -Path $ndkFolderPath -Name - return ($versions | Join-String -Separator "
") + $ndkDefaultVersion = Get-ToolsetValue "android.ndk.default" + $ndkDefaultFullVersion = Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkDefaultVersion.*" -Name | Select-Object -Last 1 + + return ($versions | ForEach-Object { + $defaultPostfix = ( $_ -eq $ndkDefaultFullVersion ) ? " (default)" : "" + $_ + $defaultPostfix + } | Join-String -Separator "
") } function Get-IntelHaxmVersion { diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 76e6810da..a31f1c612 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -179,6 +179,7 @@ "cmake;3.18.1" ], "ndk": { + "default": "25", "versions": [ "23", "24", "25" ] diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json index 290542b79..c79617d6d 100644 --- a/images/macos/toolsets/toolset-11.json +++ b/images/macos/toolsets/toolset-11.json @@ -178,6 +178,7 @@ "cmake;3.22.1" ], "ndk": { + "default": "25", "versions": [ "23", "24", "25" ] diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json index a098a1e0c..a2473b211 100644 --- a/images/macos/toolsets/toolset-12.json +++ b/images/macos/toolsets/toolset-12.json @@ -113,6 +113,7 @@ "cmake;3.22.1" ], "ndk": { + "default": "25", "versions": [ "23", "24", "25" ] From 77dfaa7c15f613223e00a56440040c537bdf206b Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 29 Jul 2022 13:08:30 +0400 Subject: [PATCH 4/6] Add ndk-related environment variables to windows (#5985) --- images/win/scripts/Installers/Install-AndroidSDK.ps1 | 7 +++++++ .../scripts/SoftwareReport/SoftwareReport.Android.psm1 | 10 ++++++++-- images/win/toolsets/toolset-2019.json | 1 + images/win/toolsets/toolset-2022.json | 1 + 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/images/win/scripts/Installers/Install-AndroidSDK.ps1 b/images/win/scripts/Installers/Install-AndroidSDK.ps1 index 0401f4768..dbf2508f3 100644 --- a/images/win/scripts/Installers/Install-AndroidSDK.ps1 +++ b/images/win/scripts/Installers/Install-AndroidSDK.ps1 @@ -109,6 +109,7 @@ Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` # NDKs $ndkMajorVersions = $androidToolset.ndk.versions +$ndkDefaultMajorVersion = $androidToolset.ndk.default $ndkLatestMajorVersion = $ndkMajorVersions | Select-Object -Last 1 $androidNDKs = $ndkMajorVersions | Foreach-Object { @@ -120,10 +121,16 @@ Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` -AndroidPackages $androidNDKs $ndkLatestVersion = ($androidNDKs | Where-Object { $_ -match "ndk;$ndkLatestMajorVersion" }).Split(';')[1] +$ndkDefaultVersion = ($androidNDKs | Where-Object { $_ -match "ndk;$ndkDefaultMajorVersion" }).Split(';')[1] +$ndkRoot = "$sdkRoot\ndk\$ndkDefaultVersion" # Create env variables setx ANDROID_HOME $sdkRoot /M setx ANDROID_SDK_ROOT $sdkRoot /M +# ANDROID_NDK, ANDROID_NDK_HOME, and ANDROID_NDK_LATEST_HOME variables should be set as many customer builds depend on them https://github.com/actions/virtual-environments/issues/5879 +setx ANDROID_NDK $ndkRoot /M +setx ANDROID_NDK_HOME $ndkRoot /M +setx ANDROID_NDK_ROOT $ndkRoot /M $ndkLatestPath = "$sdkRoot\ndk\$ndkLatestVersion" if (Test-Path $ndkLatestPath) { diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 index 404929c46..ac614dd07 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1 @@ -164,8 +164,14 @@ function Get-AndroidNdkVersions { [object] $PackageInfo ) + $ndkDefaultFullVersion = Get-ChildItem $env:ANDROID_NDK_HOME -Name + $versions = $packageInfo | Where-Object { $_ -Match "ndk;" } | ForEach-Object { - (Split-TableRowByColumns $_)[1] + $version = (Split-TableRowByColumns $_)[1] + if ($version -eq $ndkDefaultFullVersion) { + $version += " (default)" + } + $version } return ($versions -Join "
") } @@ -173,7 +179,7 @@ function Get-AndroidNdkVersions { function Build-AndroidEnvironmentTable { $androidVersions = Get-Item env:ANDROID_* - $shoulddResolveLink = 'ANDROID_NDK_LATEST_HOME' + $shoulddResolveLink = 'ANDROID_NDK', 'ANDROID_NDK_HOME', 'ANDROID_NDK_ROOT', 'ANDROID_NDK_LATEST_HOME' return $androidVersions | Sort-Object -Property Name | ForEach-Object { [PSCustomObject] @{ "Name" = $_.Name diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json index 3024b66ec..9fcb22153 100644 --- a/images/win/toolsets/toolset-2019.json +++ b/images/win/toolsets/toolset-2019.json @@ -184,6 +184,7 @@ "patcher;v4" ], "ndk": { + "default": "25", "versions": [ "23", "24", "25" ] diff --git a/images/win/toolsets/toolset-2022.json b/images/win/toolsets/toolset-2022.json index 43c5618df..3b99dd55c 100644 --- a/images/win/toolsets/toolset-2022.json +++ b/images/win/toolsets/toolset-2022.json @@ -154,6 +154,7 @@ "patcher;v4" ], "ndk": { + "default": "25", "versions": [ "23", "24", "25" ] From 493f3c3ee19fc6f2f5456b1f8563f77f0096c3e1 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Fri, 29 Jul 2022 22:13:23 +0400 Subject: [PATCH 5/6] [windows] Add exe installation of MicrosoftAnalysisServices Visual Studio extension (#5989) * Add exe installation of MicrosoftAnalysisServices * Change condition to check FileName.EndsWith --- images/win/scripts/ImageHelpers/InstallHelpers.ps1 | 5 +++++ images/win/scripts/Installers/Install-Vsix.ps1 | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index 7ceb718a6..e898be5c5 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -249,6 +249,11 @@ function Get-VsixExtenstionFromMarketplace { $fileName = "Microsoft.DataTools.AnalysisServices.vsix" $downloadUri = "https://download.microsoft.com/download/c/8/9/c896a7f2-d0fd-45ac-90e6-ff61f67523cb/Microsoft.DataTools.AnalysisServices.vsix" } + # Starting from version 4.1 SqlServerIntegrationServicesProjects extension is distributed as exe file + "SSIS.SqlServerIntegrationServicesProjects" { + $fileName = "Microsoft.DataTools.IntegrationServices.exe" + $downloadUri = $assetUri + "/" + $fileName + } } return [PSCustomObject] @{ diff --git a/images/win/scripts/Installers/Install-Vsix.ps1 b/images/win/scripts/Installers/Install-Vsix.ps1 index 405a4562b..439fb291f 100644 --- a/images/win/scripts/Installers/Install-Vsix.ps1 +++ b/images/win/scripts/Installers/Install-Vsix.ps1 @@ -14,7 +14,12 @@ $vsVersion = $toolset.visualStudio.Version $vsixPackagesList | ForEach-Object { # Retrieve cdn endpoint to avoid HTTP error 429 https://github.com/actions/virtual-environments/issues/3074 $vsixPackage = Get-VsixExtenstionFromMarketplace -ExtensionMarketPlaceName $_ - Install-VsixExtension -Url $vsixPackage.DownloadUri -Name $vsixPackage.FileName -VSversion $vsVersion + if ($vsixPackage.FileName.EndsWith(".vsix")) { + Install-VsixExtension -Url $vsixPackage.DownloadUri -Name $vsixPackage.FileName -VSversion $vsVersion + } else { + $argumentList = ('/install', '/quiet', '/norestart') + Install-Binary -Url $vsixPackage.DownloadUri -Name $vsixPackage.FileName -ArgumentList $argumentList + } } Invoke-PesterTests -TestFile "Vsix" \ No newline at end of file From 8c24b03a8df7e9923c69a4b1aed4313cf7679c20 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Mon, 1 Aug 2022 15:35:36 +0200 Subject: [PATCH 6/6] Remove Windows Server 2016 related code from the repository (#5994) --- CONTRIBUTING.md | 4 +- README.md | 2 - docs/create-image-and-azure-resources.md | 4 +- helpers/GenerateResourcesAndImage.ps1 | 6 +- .../azure-pipelines/windows2016.yml | 20 - images/win/Windows2016-Readme.md | 597 ------------------ .../scripts/ImageHelpers/ImageHelpers.psm1 | 1 - .../scripts/ImageHelpers/InstallHelpers.ps1 | 5 - .../Installers/Configure-Antivirus.ps1 | 10 +- .../scripts/Installers/Configure-Shell.ps1 | 8 +- .../scripts/Installers/Install-DotnetSDK.ps1 | 2 +- images/win/scripts/Installers/Install-Git.ps1 | 4 - .../scripts/Installers/Install-VCRedist.ps1 | 23 +- images/win/scripts/Installers/Install-WDK.ps1 | 9 +- .../scripts/Installers/Update-ImageData.ps1 | 6 +- .../Installers/Windows2016/Install-SSDT.ps1 | 19 - .../Windows2016/Install-Win81SDK.ps1 | 10 - .../SoftwareReport/SoftwareReport.Common.psm1 | 2 +- .../SoftwareReport.Generator.ps1 | 12 +- .../SoftwareReport.VisualStudio.psm1 | 16 +- images/win/scripts/Tests/MSYS2.Tests.ps1 | 2 +- images/win/scripts/Tests/Tools.Tests.ps1 | 10 +- .../win/scripts/Tests/VisualStudio.Tests.ps1 | 2 +- .../scripts/Tests/WindowsFeatures.Tests.ps1 | 2 +- images/win/toolsets/toolset-2016.json | 454 ------------- images/win/windows2016.json | 322 ---------- 26 files changed, 36 insertions(+), 1516 deletions(-) delete mode 100644 images.CI/linux-and-win/azure-pipelines/windows2016.yml delete mode 100644 images/win/Windows2016-Readme.md delete mode 100644 images/win/scripts/Installers/Windows2016/Install-SSDT.ps1 delete mode 100644 images/win/scripts/Installers/Windows2016/Install-Win81SDK.ps1 delete mode 100644 images/win/toolsets/toolset-2016.json delete mode 100644 images/win/windows2016.json diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 56e49a81d..6e8f00214 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -32,13 +32,13 @@ Here are a few things you can do that will increase the likelihood of your pull ### General rules - For every new tool add validation scripts and update software report script to make sure that it is included to documentation - If the tool is available in other platforms (macOS, Windows, Linux), make sure you include it in as many as possible. -- If installing a few versions of the tool, consider putting the list of versions in the corresponding `toolset.json` file. It will help other customers to configure their builds flexibly. See [toolset-windows-2016.json](images/win/toolsets/toolset-2019.json) as example. +- If installing a few versions of the tool, consider putting the list of versions in the corresponding `toolset.json` file. It will help other customers to configure their builds flexibly. See [toolset-windows-2019.json](images/win/toolsets/toolset-2019.json) as example. - Use consistent naming across all files - Validation scripts should be simple and shouldn't change image content ### Windows - Add a script that will install the tool and put the script in the `scripts/Installers` folder. -There are a bunch of helper functions that could simplify your code: `Choco-Install`, `Install-Binary`, `Install-VsixExtension`, `Start-DownloadWithRetry`, `Test-IsWin16`, `Test-IsWin19` (find the full list of helpers in [ImageHelpers.psm1](images/win/scripts/ImageHelpers/ImageHelpers.psm1)). +There are a bunch of helper functions that could simplify your code: `Choco-Install`, `Install-Binary`, `Install-VsixExtension`, `Start-DownloadWithRetry`, `Test-IsWin19`, `Test-IsWin22` (find the full list of helpers in [ImageHelpers.psm1](images/win/scripts/ImageHelpers/ImageHelpers.psm1)). - Add a script that will validate the tool installation and put the script in the `scripts/Tests` folder. We use [Pester v5](https://github.com/pester/pester) for validation scripts. If the tests for the tool are complex enough, create a separate `*.Tests.ps1`. Otherwise, use `Tools.Tests.ps1` for simple tests. Add `Invoke-PesterTests -TestFile [-TestName ]` at the end of the installation script to make sure that your tests will be run. diff --git a/README.md b/README.md index cbaf5b367..2a7f37c2a 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,6 @@ For general questions about using the virtual environments or writing your Actio | macOS 10.15 deprecated | `macos-10.15` | [macOS-10.15] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=macos-10.15&redirect=1) | Windows Server 2022 | `windows-latest` or `windows-2022` | [windows-2022] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2022&redirect=1) | | Windows Server 2019 | `windows-2019` | [windows-2019] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2019&redirect=1) -| Windows Server 2016 | `windows-2016` | [windows-2016] | [![](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2016&badge=1)](https://actionvirtualenvironmentsstatus.azurewebsites.net/api/status?imageName=windows-2016&redirect=1) Note: Beta and Preview images are provided "as-is", "with all faults" and "as available" and are excluded from the service level agreement and warranty. Beta and Preview images may not be covered by customer support. @@ -54,7 +53,6 @@ You can also track upcoming changes using the [awaiting-deployment](https://gith [ubuntu-18.04]: https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1804-Readme.md [windows-2022]: https://github.com/actions/virtual-environments/blob/main/images/win/Windows2022-Readme.md [windows-2019]: https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md -[windows-2016]: https://github.com/actions/virtual-environments/blob/main/images/win/Windows2016-Readme.md [macOS-11]: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md [macOS-12]: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-12-Readme.md [macOS-10.15]: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md diff --git a/docs/create-image-and-azure-resources.md b/docs/create-image-and-azure-resources.md index 985b439f0..b9a3446fe 100644 --- a/docs/create-image-and-azure-resources.md +++ b/docs/create-image-and-azure-resources.md @@ -1,5 +1,5 @@ # Virtual-Environments -The virtual-environments project uses [Packer](https://www.packer.io/) to generate disk images for the following platforms: Windows 2016/2019/2022, Ubuntu 18.04/20.04. +The virtual-environments project uses [Packer](https://www.packer.io/) to generate disk images for the following platforms: Windows 2019/2022, Ubuntu 18.04/20.04/22.04. Each image is configured through a JSON template that Packer understands and which specifies where to build the image (Azure in this case), and what scripts to run to install software and prepare the disk. The Packer process initializes a connection to Azure subscription via Azure CLI, and automatically creates the temporary Azure resources required to build the source VM(temporary resource group, network interfaces, and VM from the "clean" image specified in the template). If the VM deployment succeeds, the build agent connects to the VM and starts to execute installation steps from the JSON template. @@ -66,7 +66,7 @@ Where: - `SubscriptionId` - The Azure subscription Id where resources will be created. - `ResourceGroupName` - The Azure resource group name where the Azure resources will be created. - `ImageGenerationRepositoryRoot` - The root path of the image generation repository source. -- `ImageType` - The type of the image being generated. Valid options are: "Windows2016", "Windows2019", "Windows2022", "Ubuntu1804", "Ubuntu2004", "Ubuntu2204". +- `ImageType` - The type of the image being generated. Valid options are: "Windows2019", "Windows2022", "Ubuntu1804", "Ubuntu2004", "Ubuntu2204". - `AzureLocation` - The location of the resources being created in Azure. For example "East US". The function automatically creates all required Azure resources and kicks off packer image generation for the selected image type. diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index f51c6cf0a..f964e7670 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -1,7 +1,6 @@ $ErrorActionPreference = 'Stop' enum ImageType { - Windows2016 = 0 Windows2019 = 1 Windows2022 = 2 Ubuntu1804 = 3 @@ -18,9 +17,6 @@ Function Get-PackerTemplatePath { ) switch ($ImageType) { - ([ImageType]::Windows2016) { - $relativeTemplatePath = Join-Path "win" "windows2016.json" - } ([ImageType]::Windows2019) { $relativeTemplatePath = Join-Path "win" "windows2019.json" } @@ -71,7 +67,7 @@ Function GenerateResourcesAndImage { .PARAMETER ImageGenerationRepositoryRoot The root path of the image generation repository source. .PARAMETER ImageType - The type of the image being generated. Valid options are: {"Windows2016", "Windows2019", "Windows2022", "Ubuntu1804", "Ubuntu2004"}. + The type of the image being generated. Valid options are: {"Windows2019", "Windows2022", "Ubuntu1804", "Ubuntu2004", "Ubuntu2204"}. .PARAMETER AzureLocation The location of the resources being created in Azure. For example "East US". .PARAMETER Force diff --git a/images.CI/linux-and-win/azure-pipelines/windows2016.yml b/images.CI/linux-and-win/azure-pipelines/windows2016.yml deleted file mode 100644 index 0220a38f2..000000000 --- a/images.CI/linux-and-win/azure-pipelines/windows2016.yml +++ /dev/null @@ -1,20 +0,0 @@ -schedules: -- cron: "0 0 * * *" - displayName: Daily - branches: - include: - - main - always: true - -trigger: none -pr: - autoCancel: true - branches: - include: - - main - -jobs: -- template: image-generation.yml - parameters: - image_type: windows2016 - image_readme_name: Windows2016-Readme.md \ No newline at end of file diff --git a/images/win/Windows2016-Readme.md b/images/win/Windows2016-Readme.md deleted file mode 100644 index a86198066..000000000 --- a/images/win/Windows2016-Readme.md +++ /dev/null @@ -1,597 +0,0 @@ -| Announcements | -|-| -| [windows-latest workflows will use Windows Server 2022](https://github.com/actions/virtual-environments/issues/4856) | -| [Windows-2016 environment will be removed on March 15, 2022](https://github.com/actions/virtual-environments/issues/4312) | -*** -# Microsoft Windows Server 2016 Datacenter -- OS Version: 10.0.14393 Build 4946 -- Image Version: 20220306.1 - -## Installed Software -### Language and Runtime -- Bash 4.4.23(2)-release -- Go 1.15.15 -- Julia 1.7.2 -- Kotlin 1.6.10 -- LLVM 13.0.1 -- Node 16.14.0 -- Perl 5.32.1 -- PHP 8.1.3 -- Python 3.7.9 -- Ruby 2.5.9p229 - -### Package Management -- Chocolatey 0.12.1 -- Composer 2.2.7 -- Helm 3.8.0 -- Miniconda 4.11.0 (pre-installed on the image but not added to PATH) -- NPM 8.3.1 -- NuGet 6.1.0.106 -- pip 22.0.3 (python 3.7) -- Pipx 1.0.0 -- RubyGems 2.7.6.3 -- Vcpkg (build from master \) -- Yarn 1.22.17 - -#### Environment variables -| Name | Value | -| ----------------------- | ------------ | -| VCPKG_INSTALLATION_ROOT | C:\vcpkg | -| CONDA | C:\Miniconda | - -### Project Management -- Ant 1.10.12 -- Gradle 7.4 -- Maven 3.8.4 -- sbt 1.6.2 - -### Tools -- 7zip 21.07 -- aria2 1.36.0 -- azcopy 10.14.0 -- Bazel 5.0.0 -- Bazelisk 1.11.0 -- Bicep 0.4.1272 -- Cabal 3.6.2.0 -- CMake 3.22.3 -- CodeQL Action Bundle 2.8.1 -- Docker 20.10.7 -- Docker-compose 1.29.2 -- Docker-wincred 0.6.4 -- ghc 9.2.1 -- Git 2.35.1.windows.2 -- Git LFS 3.0.2 -- Google Cloud SDK 375.0.0 -- InnoSetup 6.2.0 -- jq 1.6 -- Kind 0.11.1 -- Kubectl 1.23.4 -- Mercurial 5.0 -- Mingw-w64 8.1.0 -- Newman 5.3.2 -- NSIS v3.08 -- OpenSSL 1.1.1 -- Packer 1.7.10 -- Parcel 2.3.2 -- Pulumi v3.25.1 -- R 4.1.2 -- Service Fabric SDK 8.2.1486.9590 -- Stack 2.7.5 -- Subversion (SVN) 1.14.1 -- Swig 4.0.2 -- VSWhere 3.0.1 -- WinAppDriver 1.2.2009.02003 -- WiX Toolset v3.11.2.4516 -- yamllint 1.26.3 -- zstd 1.5.2 - -### CLI Tools -- Alibaba Cloud CLI 3.0.110 -- AWS CLI 2.4.23 -- AWS SAM CLI 1.40.1 -- AWS Session Manager CLI 1.2.295.0 -- Azure CLI 2.34.1 -- Azure DevOps CLI extension 0.23.0 -- Cloud Foundry CLI 6.53.0 -- GitHub CLI 2.5.2 -- Hub CLI 2.14.2 - -### Rust Tools -- Cargo 1.59.0 -- Rust 1.59.0 -- Rustdoc 1.59.0 -- Rustup 1.24.3 - -#### Packages -- bindgen 0.59.2 -- cargo-audit 0.16.0 -- cargo-outdated 0.11.0 -- cbindgen 0.20.0 -- Clippy 0.1.59 -- Rustfmt 1.4.38 - -### Browsers and webdrivers -- Google Chrome 99.0.4844.51 -- Chrome Driver 99.0.4844.51 -- Microsoft Edge 99.0.1150.30 -- Microsoft Edge Driver 99.0.1150.30 -- Mozilla Firefox 97.0.2 -- Gecko Driver 0.30.0 -- IE Driver 3.150.1.1 -- Selenium server 4.1.0 - -#### Environment variables -| Name | Value | -| ----------------- | ---------------------------------- | -| CHROMEWEBDRIVER | C:\SeleniumWebDrivers\ChromeDriver | -| EDGEWEBDRIVER | C:\SeleniumWebDrivers\EdgeDriver | -| GECKOWEBDRIVER | C:\SeleniumWebDrivers\GeckoDriver | -| SELENIUM_JAR_PATH | C:\selenium\selenium-server.jar | - -### Java -| Version | Vendor | Environment Variable | -| ------------------- | --------------- | -------------------- | -| 8.0.322+6 (default) | Eclipse Temurin | JAVA_HOME_8_X64 | -| 11.0.14+101 | Eclipse Temurin | JAVA_HOME_11_X64 | -| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 | -| 17.0.2+8 | Eclipse Temurin | JAVA_HOME_17_X64 | - -### Shells -| Name | Target | -| ------------- | --------------------------------- | -| gitbash.exe | C:\Program Files\Git\bin\bash.exe | -| msys2bash.cmd | C:\msys64\usr\bin\bash.exe | - -### MSYS2 -- Pacman 6.0.1 - -##### Notes: -``` -Location: C:\msys64 - -Note: MSYS2 is pre-installed on image but not added to PATH. -``` - -### Cached Tools -#### Go -| Version | Architecture | Environment Variable | -| ------- | ------------ | -------------------- | -| 1.15.15 (Default) | x64 | GOROOT_1_15_X64 | -| 1.16.14 | x64 | GOROOT_1_16_X64 | -| 1.17.7 | x64 | GOROOT_1_17_X64 | - -#### Node -| Version | Architecture | -| ------- | ------------ | -| 12.22.10 | x64 | -| 14.19.0 | x64 | -| 16.14.0 | x64 | - -#### Python -| Version | Architecture | -| ------- | ------------ | -| 2.7.18 | x64, x86 | -| 3.6.8 | x64, x86 | -| 3.7.9 (Default) | x64, x86 | -| 3.8.10 | x64, x86 | -| 3.9.10 | x64, x86 | -| 3.10.2 | x64 | - -#### Ruby -| Version | Architecture | -| ------- | ------------ | -| 2.4.10 | x64 | -| 2.5.9 (Default) | x64 | -| 2.6.9 | x64 | -| 2.7.5 | x64 | -| 3.0.3 | x64 | - -#### PyPy -| Python Version | PyPy Version | -| -------------- | ------------ | -| 2.7.18 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | -| 3.6.12 | PyPy 7.3.3 with MSC v.1927 32 bit | -| 3.7.12 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | -| 3.8.12 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | -| 3.9.10 | PyPy 7.3.8 with MSC v.1929 64 bit (AMD64) | - -### Databases -#### PostgreSQL -| Property | Value | -| -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | -| ServiceName | postgresql-x64-14 | -| Version | 14.2 | -| ServiceStatus | Stopped | -| ServiceStartType | Disabled | -| EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\14\bin
PGDATA=C:\Program Files\PostgreSQL\14\data
PGROOT=C:\Program Files\PostgreSQL\14 | -| Path | C:\Program Files\PostgreSQL\14 | -| UserName | postgres | -| Password | root | - -#### MongoDB -| Version | ServiceName | ServiceStatus | ServiceStartType | -| ------- | ----------- | ------------- | ---------------- | -| 5.0.6.0 | MongoDB | Running | Automatic | - -### Database tools -- Azure CosmosDb Emulator 2.14.5.0 -- DacFx 16.0.5400.1 -- MySQL 5.7.37.0 -- SQLPS 1.0 - -### Web Servers -| Name | Version | ConfigFile | ServiceName | ServiceStatus | ListenPort | -| ------ | ------- | ------------------------------------- | ----------- | ------------- | ---------- | -| Apache | 2.4.52 | C:\tools\Apache24\conf\httpd.conf | Apache | Stopped | 80 | -| Nginx | 1.21.6 | C:\tools\nginx-1.21.6\conf\nginx.conf | nginx | Stopped | 80 | - -### Visual Studio Enterprise 2017 -| Name | Version | Path | -| ----------------------------- | --------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2017 | 15.9.28307.1800 | C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise | - -#### Workloads, components and extensions: -| Package | Version | -| ------------------------------------------------------------------------- | ---------------- | -| Component.Anaconda3.x64 | 5.2.0 | -| Component.Android.NDK.R12B | 12.1.10 | -| Component.Android.NDK.R15C | 15.2.1 | -| Component.Android.SDK19.Private | 15.9.28107.0 | -| Component.Android.SDK21.Private | 15.9.28016.0 | -| Component.Android.SDK22.Private | 15.9.28016.0 | -| Component.Android.SDK23 | 15.9.28107.0 | -| Component.Android.SDK23.Private | 15.9.28016.0 | -| Component.Android.SDK25.Private | 15.9.28016.0 | -| Component.Android.SDK27 | 15.9.28016.0 | -| Component.Ant | 1.9.3.8 | -| Component.CordovaToolset.6.3.1 | 15.7.27625.0 | -| Component.Dotfuscator | 15.0.26208.0 | -| Component.Google.Android.Emulator.API27 | 15.9.28307.421 | -| Component.HAXM | 15.9.28307.421 | -| Component.Linux.CMake | 15.9.28307.102 | -| Component.MDD.Android | 15.0.26606.0 | -| Component.MDD.Linux | 15.6.27406.0 | -| Component.Microsoft.VisualStudio.RazorExtension | 15.0.26720.2 | -| Component.Microsoft.VisualStudio.Tools.Applications | 15.0.27520.3 | -| Component.Microsoft.VisualStudio.Web.AzureFunctions | 15.7.27617.1 | -| Component.Microsoft.Web.LibraryManager | 15.8.27705.0 | -| Component.Microsoft.Windows.DriverKit | 10.0.17740.0 | -| Component.OpenJDK | 15.9.28307.443 | -| Component.Redgate.ReadyRoll | 1.17.18155.10346 | -| Component.Redgate.SQLPrompt.VsPackage | 9.2.0.5601 | -| Component.Redgate.SQLSearch.VSExtension | 3.1.7.2062 | -| Component.UnityEngine.x64 | 15.9.28307.616 | -| Component.Unreal | 15.8.27729.1 | -| Component.Unreal.Android | 15.9.28307.341 | -| Component.WixToolset.VisualStudioExtension.Dev15 | 1.0.0.18 | -| Component.WixToolset.VisualStudioExtension.Schemas3 | 1.0.0.18 | -| Component.WixToolset.VisualStudioExtension.Schemas4 | 1.0.0.18 | -| Component.Xamarin | 15.9.28307.1177 | -| Component.Xamarin.Profiler | 15.0.27005.2 | -| Component.Xamarin.RemotedSimulator | 15.6.27323.2 | -| Microsoft.Component.Azure.DataLake.Tools | 15.9.28107.0 | -| Microsoft.Component.Blend.SDK.WPF | 15.6.27406.0 | -| Microsoft.Component.ClickOnce | 15.8.27825.0 | -| Microsoft.Component.CookiecutterTools | 15.9.28307.1500 | -| Microsoft.Component.MSBuild | 15.7.27520.0 | -| Microsoft.Component.NetFX.Core.Runtime | 15.0.26208.0 | -| Microsoft.Component.NetFX.Native | 15.0.26208.0 | -| Microsoft.Component.PythonTools | 15.9.28307.1500 | -| Microsoft.Component.PythonTools.UWP | 15.0.26606.0 | -| Microsoft.Component.PythonTools.Web | 15.9.28107.0 | -| Microsoft.Component.VC.Runtime.OSSupport | 15.6.27406.0 | -| Microsoft.Component.VC.Runtime.UCRTSDK | 15.6.27309.0 | -| Microsoft.ComponentGroup.Blend | 15.6.27406.0 | -| Microsoft.Net.Component.3.5.DeveloperTools | 15.6.27406.0 | -| Microsoft.Net.Component.4.5.1.TargetingPack | 15.6.27406.0 | -| Microsoft.Net.Component.4.5.2.TargetingPack | 15.6.27406.0 | -| Microsoft.Net.Component.4.5.TargetingPack | 15.6.27406.0 | -| Microsoft.Net.Component.4.6.1.SDK | 15.6.27406.0 | -| Microsoft.Net.Component.4.6.1.TargetingPack | 15.6.27406.0 | -| Microsoft.Net.Component.4.6.2.SDK | 15.6.27406.0 | -| Microsoft.Net.Component.4.6.2.TargetingPack | 15.6.27406.0 | -| Microsoft.Net.Component.4.6.TargetingPack | 15.6.27406.0 | -| Microsoft.Net.Component.4.7.1.SDK | 15.6.27406.0 | -| Microsoft.Net.Component.4.7.1.TargetingPack | 15.6.27406.0 | -| Microsoft.Net.Component.4.7.2.SDK | 15.8.27825.0 | -| Microsoft.Net.Component.4.7.2.TargetingPack | 15.8.27825.0 | -| Microsoft.Net.Component.4.7.SDK | 15.6.27406.0 | -| Microsoft.Net.Component.4.7.TargetingPack | 15.6.27406.0 | -| Microsoft.Net.Component.4.TargetingPack | 15.6.27406.0 | -| Microsoft.Net.ComponentGroup.4.6.2.DeveloperTools | 15.6.27406.0 | -| Microsoft.Net.ComponentGroup.4.7.1.DeveloperTools | 15.6.27406.0 | -| Microsoft.Net.ComponentGroup.4.7.2.DeveloperTools | 15.8.27825.0 | -| Microsoft.Net.ComponentGroup.4.7.DeveloperTools | 15.6.27406.0 | -| Microsoft.Net.ComponentGroup.DevelopmentPrerequisites | 15.8.27825.0 | -| Microsoft.Net.ComponentGroup.TargetingPacks.Common | 15.6.27406.0 | -| Microsoft.Net.Core.Component.SDK.1x | 15.9.28307.1259 | -| Microsoft.Net.Core.Component.SDK.2.1 | 15.9.28307.1684 | -| Microsoft.NetCore.1x.ComponentGroup.Web | 15.9.28307.1259 | -| Microsoft.NetCore.ComponentGroup.DevelopmentTools.2.1 | 15.9.28307.1684 | -| Microsoft.NetCore.ComponentGroup.Web.2.1 | 15.9.28307.1684 | -| Microsoft.VisualStudio.Component.AppInsights.Tools | 15.8.27825.0 | -| Microsoft.VisualStudio.Component.AspNet45 | 15.7.27625.0 | -| Microsoft.VisualStudio.Component.Azure.AuthoringTools | 15.9.28307.421 | -| Microsoft.VisualStudio.Component.Azure.ClientLibs | 15.0.26208.0 | -| Microsoft.VisualStudio.Component.Azure.Compute.Emulator | 15.9.28307.421 | -| Microsoft.VisualStudio.Component.Azure.MobileAppsSdk | 15.7.27625.0 | -| Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools | 15.9.28107.0 | -| Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools | 15.8.27825.0 | -| Microsoft.VisualStudio.Component.Azure.Storage.AzCopy | 15.0.26906.1 | -| Microsoft.VisualStudio.Component.Azure.Storage.Emulator | 15.9.28125.51 | -| Microsoft.VisualStudio.Component.Azure.Waverton | 15.9.28107.0 | -| Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools | 15.7.27617.1 | -| Microsoft.VisualStudio.Component.ClassDesigner | 15.0.26208.0 | -| Microsoft.VisualStudio.Component.CloudExplorer | 15.9.28230.55 | -| Microsoft.VisualStudio.Component.CodeClone | 15.0.26208.0 | -| Microsoft.VisualStudio.Component.CodeMap | 15.0.26208.0 | -| Microsoft.VisualStudio.Component.Common.Azure.Tools | 15.9.28107.0 | -| Microsoft.VisualStudio.Component.Cordova | 15.0.26606.0 | -| Microsoft.VisualStudio.Component.CoreEditor | 15.8.27729.1 | -| Microsoft.VisualStudio.Component.Debugger.JustInTime | 15.0.27005.2 | -| Microsoft.VisualStudio.Component.Debugger.Snapshot | 15.8.28010.0 | -| Microsoft.VisualStudio.Component.DependencyValidation.Enterprise | 15.0.26208.0 | -| Microsoft.VisualStudio.Component.DiagnosticTools | 15.8.27729.1 | -| Microsoft.VisualStudio.Component.DockerTools | 15.9.28307.1439 | -| Microsoft.VisualStudio.Component.DockerTools.BuildTools | 15.7.27617.1 | -| Microsoft.VisualStudio.Component.DslTools | 15.0.27005.2 | -| Microsoft.VisualStudio.Component.EntityFramework | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.FSharp | 15.8.27825.0 | -| Microsoft.VisualStudio.Component.FSharp.Desktop | 15.8.27825.0 | -| Microsoft.VisualStudio.Component.FSharp.WebTemplates | 15.9.28307.421 | -| Microsoft.VisualStudio.Component.GraphDocument | 15.0.27005.2 | -| Microsoft.VisualStudio.Component.Graphics | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.Graphics.Tools | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.Graphics.Win81 | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.IISExpress | 15.0.26208.0 | -| Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd | 15.8.27729.1 | -| Microsoft.VisualStudio.Component.JavaScript.Diagnostics | 15.8.27729.1 | -| Microsoft.VisualStudio.Component.JavaScript.ProjectSystem | 15.0.26606.0 | -| Microsoft.VisualStudio.Component.JavaScript.TypeScript | 15.9.28125.51 | -| Microsoft.VisualStudio.Component.LinqToSql | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.LiveUnitTesting | 15.0.26720.2 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Core | 15.8.27729.1 | -| Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites | 15.7.27625.0 | -| Microsoft.VisualStudio.Component.Merq | 15.8.27924.0 | -| Microsoft.VisualStudio.Component.MonoDebugger | 15.0.26720.2 | -| Microsoft.VisualStudio.Component.Node.Build | 15.8.27825.0 | -| Microsoft.VisualStudio.Component.Node.Tools | 15.8.27825.0 | -| Microsoft.VisualStudio.Component.NuGet | 15.9.28016.0 | -| Microsoft.VisualStudio.Component.NuGet.BuildTools | 15.9.28016.0 | -| Microsoft.VisualStudio.Component.PortableLibrary | 15.6.27309.0 | -| Microsoft.VisualStudio.Component.R.Open | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.RHost | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.Roslyn.Compiler | 15.6.27309.0 | -| Microsoft.VisualStudio.Component.Roslyn.LanguageServices | 15.8.27729.1 | -| Microsoft.VisualStudio.Component.RTools | 15.0.26919.1 | -| Microsoft.VisualStudio.Component.Sharepoint.Tools | 15.8.27924.0 | -| Microsoft.VisualStudio.Component.SQL.ADAL | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.SQL.CLR | 15.0.26208.0 | -| Microsoft.VisualStudio.Component.SQL.CMDUtils | 15.0.26208.0 | -| Microsoft.VisualStudio.Component.SQL.DataSources | 15.0.26621.2 | -| Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime | 15.7.27617.1 | -| Microsoft.VisualStudio.Component.SQL.NCLI | 15.0.26208.0 | -| Microsoft.VisualStudio.Component.SQL.SSDT | 15.9.28107.0 | -| Microsoft.VisualStudio.Component.Static.Analysis.Tools | 15.0.26208.0 | -| Microsoft.VisualStudio.Component.TeamOffice | 15.7.27625.0 | -| Microsoft.VisualStudio.Component.TestTools.CodedUITest | 15.0.26606.0 | -| Microsoft.VisualStudio.Component.TestTools.Core | 15.7.27520.0 | -| Microsoft.VisualStudio.Component.TestTools.WebLoadTest | 15.8.27729.1 | -| Microsoft.VisualStudio.Component.TextTemplating | 15.0.26208.0 | -| Microsoft.VisualStudio.Component.TypeScript.2.0 | 15.8.27729.1 | -| Microsoft.VisualStudio.Component.TypeScript.2.1 | 15.8.27729.1 | -| Microsoft.VisualStudio.Component.TypeScript.2.2 | 15.8.27729.1 | -| Microsoft.VisualStudio.Component.TypeScript.2.3 | 15.8.27729.1 | -| Microsoft.VisualStudio.Component.TypeScript.3.1 | 15.0.28218.60 | -| Microsoft.VisualStudio.Component.Unity | 15.7.27617.1 | -| Microsoft.VisualStudio.Component.UWP.Support | 15.9.28119.51 | -| Microsoft.VisualStudio.Component.UWP.VC.ARM64 | 15.0.28125.51 | -| Microsoft.VisualStudio.Component.VC.140 | 15.7.27617.1 | -| Microsoft.VisualStudio.Component.VC.ATL | 15.7.27625.0 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM | 15.7.27625.0 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre | 15.7.27625.0 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64 | 15.7.27625.0 | -| Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre | 15.7.27625.0 | -| Microsoft.VisualStudio.Component.VC.ATL.Spectre | 15.7.27625.0 | -| Microsoft.VisualStudio.Component.VC.ATLMFC | 15.7.27625.0 | -| Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre | 15.7.27625.0 | -| Microsoft.VisualStudio.Component.VC.ClangC2 | 15.7.27520.0 | -| Microsoft.VisualStudio.Component.VC.CLI.Support | 15.6.27309.0 | -| Microsoft.VisualStudio.Component.VC.CMake.Project | 15.9.28307.102 | -| Microsoft.VisualStudio.Component.VC.CoreIde | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.VC.DiagnosticTools | 15.0.26823.1 | -| Microsoft.VisualStudio.Component.VC.Modules.x86.x64 | 15.6.27309.0 | -| Microsoft.VisualStudio.Component.VC.Redist.14.Latest | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre | 15.9.28230.55 | -| Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre | 15.9.28230.55 | -| Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre | 15.9.28230.55 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest | 15.9.28307.616 | -| Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest | 15.8.27906.1 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM | 15.8.27825.0 | -| Microsoft.VisualStudio.Component.VC.Tools.ARM64 | 15.9.28230.55 | -| Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | 15.9.28230.55 | -| Microsoft.VisualStudio.Component.VisualStudioData | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.VSSDK | 15.8.27729.1 | -| Microsoft.VisualStudio.Component.Wcf.Tooling | 15.8.27924.0 | -| Microsoft.VisualStudio.Component.Web | 15.8.27825.0 | -| Microsoft.VisualStudio.Component.WebDeploy | 15.8.27729.1 | -| Microsoft.VisualStudio.Component.Windows10SDK | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.Windows10SDK.10240 | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.Windows10SDK.10586 | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.Windows10SDK.14393 | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.Windows10SDK.15063.Desktop | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.Windows10SDK.15063.UWP | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.Windows10SDK.15063.UWP.Native | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop.arm | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.Windows10SDK.16299.UWP | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.Windows10SDK.16299.UWP.Native | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.Windows10SDK.17134 | 15.9.28307.102 | -| Microsoft.VisualStudio.Component.Windows10SDK.17763 | 15.9.28307.102 | -| Microsoft.VisualStudio.Component.Windows81SDK | 15.6.27406.0 | -| Microsoft.VisualStudio.Component.WinXP | 15.8.27924.0 | -| Microsoft.VisualStudio.Component.Workflow | 15.8.27825.0 | -| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Managed | 15.0.26208.0 | -| Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native | 15.0.26208.0 | -| Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices | 15.0.26504.0 | -| Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites | 15.9.28107.0 | -| Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools | 15.0.27005.2 | -| Microsoft.VisualStudio.ComponentGroup.AzureFunctions | 15.7.27617.1 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core | 15.8.27729.1 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Win81 | 15.6.27406.0 | -| Microsoft.VisualStudio.ComponentGroup.NativeDesktop.WinXP | 15.8.27705.0 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Cordova | 15.9.28307.102 | -| Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard | 15.9.28307.1439 | -| Microsoft.VisualStudio.ComponentGroup.UWP.VC | 15.9.28307.102 | -| Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin | 15.9.28307.102 | -| Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites | 15.7.27625.0 | -| Microsoft.VisualStudio.ComponentGroup.Web | 15.9.28219.51 | -| Microsoft.VisualStudio.ComponentGroup.Web.CloudTools | 15.8.27729.1 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions | 15.8.27825.0 | -| Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine | 15.8.27729.1 | -| Microsoft.VisualStudio.Web.Mvc4.ComponentGroup | 15.6.27406.0 | -| Microsoft.VisualStudio.Workload.Azure | 15.9.28307.1684 | -| Microsoft.VisualStudio.Workload.CoreEditor | 15.0.27205.0 | -| Microsoft.VisualStudio.Workload.Data | 15.9.28307.1684 | -| Microsoft.VisualStudio.Workload.DataScience | 15.9.28307.421 | -| Microsoft.VisualStudio.Workload.ManagedDesktop | 15.9.28307.1062 | -| Microsoft.VisualStudio.Workload.ManagedGame | 15.0.27005.2 | -| Microsoft.VisualStudio.Workload.NativeCrossPlat | 15.0.27205.0 | -| Microsoft.VisualStudio.Workload.NativeDesktop | 15.9.28307.102 | -| Microsoft.VisualStudio.Workload.NativeGame | 15.9.28307.102 | -| Microsoft.VisualStudio.Workload.NativeMobile | 15.9.28107.0 | -| Microsoft.VisualStudio.Workload.NetCoreTools | 15.9.28307.1684 | -| Microsoft.VisualStudio.Workload.NetCrossPlat | 15.9.28307.1684 | -| Microsoft.VisualStudio.Workload.NetWeb | 15.9.28307.1684 | -| Microsoft.VisualStudio.Workload.Node | 15.9.28107.0 | -| Microsoft.VisualStudio.Workload.Office | 15.9.28307.1684 | -| Microsoft.VisualStudio.Workload.Python | 15.9.28307.1758 | -| Microsoft.VisualStudio.Workload.Universal | 15.9.28307.1684 | -| Microsoft.VisualStudio.Workload.VisualStudioExtension | 15.7.27625.0 | -| Microsoft.VisualStudio.Workload.WebCrossPlat | 15.9.28307.341 | -| SSDT Microsoft Analysis Services Projects | 2.9.6 | -| SSDT Microsoft Reporting Services Projects | 2.6 | -| SSDT SQL Server Integration Services Projects | 2.6.3 | -| Windows Driver Kit | 10.0.17740.0 | -| Windows Driver Kit Visual Studio Extension | 10.1.17763.1 | -| WIX Toolset Studio 2017 Extension | 1.0.0.18 | -| WixToolset.WixToolsetVisualStudio2017Extension | 1.0.0.18 | - -#### Microsoft Visual C++: -| Name | Architecture | Version | -| -------------------------------------------- | ------------ | ----------- | -| Microsoft Visual C++ 2010 Redistributable | x64 | 10.0.30319 | -| Microsoft Visual C++ 2010 Redistributable | x86 | 10.0.40219 | -| Microsoft Visual C++ 2012 Additional Runtime | x64 | 11.0.61030 | -| Microsoft Visual C++ 2012 Minimum Runtime | x64 | 11.0.61030 | -| Microsoft Visual C++ 2013 Additional Runtime | x64 | 12.0.40660 | -| Microsoft Visual C++ 2013 Minimum Runtime | x64 | 12.0.40660 | -| Microsoft Visual C++ 2013 Additional Runtime | x86 | 12.0.21005 | -| Microsoft Visual C++ 2013 Minimum Runtime | x86 | 12.0.21005 | -| Microsoft Visual C++ 2017 Debug Runtime | x64 | 14.16.27033 | -| Microsoft Visual C++ 2017 Debug Runtime | x86 | 14.16.27033 | -| Microsoft Visual C++ 2022 Additional Runtime | x64 | 14.31.31103 | -| Microsoft Visual C++ 2022 Minimum Runtime | x64 | 14.31.31103 | -| Microsoft Visual C++ 2022 Additional Runtime | x86 | 14.31.31103 | -| Microsoft Visual C++ 2022 Minimum Runtime | x86 | 14.31.31103 | - -#### Installed Windows SDKs -`Location C:\Program Files (x86)\Windows Kits\10\Extension SDKs\WindowsDesktop` -- 10.0.10240.0 -- 10.0.10586.0 -- 10.0.14393.0 -- 10.0.15063.0 -- 10.0.16299.0 -- 10.0.17134.0 -- 10.0.17763.0 - -### .NET Core SDK -`Location C:\Program Files\dotnet\sdk` -- 1.1.14 2.1.526 3.1.120 3.1.202 3.1.302 3.1.416 5.0.104 5.0.211 5.0.303 5.0.405 - -### .NET Core Runtime -`Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.All` -- 2.1.30 - -`Location: C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App` -- 2.1.30 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.14 - -`Location: C:\Program Files\dotnet\shared\Microsoft.NETCore.App` -- 1.0.16 1.1.13 2.1.30 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.14 - -`Location: C:\Program Files\dotnet\shared\Microsoft.WindowsDesktop.App` -- 3.1.4 3.1.6 3.1.20 3.1.22 5.0.4 5.0.9 5.0.14 - -### .NET Framework -`Type: Developer Pack` -`Location C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX Tools` -- 4.6.1 4.6.2 4.7 4.7.1 4.7.2 4.8 - -### .NET tools -- nbgv 3.4.255+06fb9182bf - -### PowerShell Tools -- PowerShell 7.2.1 - -#### Azure Powershell Modules -| Module | Version | Path | -| ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------ | -| Az | 1.0.0.zip
1.6.0.zip
2.3.2.zip
2.6.0.zip
3.1.0.zip
3.5.0.zip
3.8.0.zip
4.3.0.zip
4.4.0.zip
4.7.0.zip
5.5.0.zip
5.9.0.zip
6.6.0.zip
7.1.0 | C:\Modules\az_\ | -| Azure | 2.1.0 [Installed]
3.8.0.zip
4.2.1.zip
5.1.1.zip
5.3.0 | C:\Modules\azure_\ | -| AzureRM | 2.1.0 [Installed]
3.8.0.zip
4.2.1.zip
5.1.1.zip
6.7.0.zip
6.13.1 | C:\Modules\azurerm_\ | -``` -Azure PowerShell module 2.1.0 and AzureRM PowerShell module 2.1.0 are installed -and are available via 'Get-Module -ListAvailable'. -All other versions are saved but not installed. -``` - -#### Powershell Modules -| Module | Version | -| ------------------ | ---------------- | -| AWSPowerShell | 4.1.37 | -| DockerMsftProvider | 1.0.0.8 | -| MarkdownPS | 1.9 | -| Microsoft.Graph | 1.9.2 | -| Pester | 3.4.0
5.3.1 | -| PowerShellGet | 1.0.0.1
2.2.5 | -| PSScriptAnalyzer | 1.20.0 | -| PSWindowsUpdate | 2.2.0.2 | -| SqlServer | 21.1.18256 | -| VSSetup | 2.2.16 | - -### Android -| Package Name | Version | -| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Android Command Line Tools | 4.0 | -| Android SDK Build-tools | 32.0.0
31.0.0
30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | -| Android SDK Platforms | android-32 (rev 1)
android-31 (rev 1)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4) | -| Android SDK Platform-Tools | 33.0.0 | -| Android SDK Tools | 25.2.5 | -| Android Support Repository | 47.0.0 | -| CMake | 3.10.2
3.18.1 | -| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 21.4.7075529 (default)
22.1.7171670
23.1.7779620 | -| SDK Patch Applier v4 | 1 | - -#### Environment variables -| Name | Value | -| ----------------------- | ---------------------------------------------------------------------------- | -| ANDROID_HOME | C:\Android\android-sdk | -| ANDROID_NDK_HOME | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | -| ANDROID_NDK_LATEST_HOME | C:\Android\android-sdk\ndk\23.1.7779620 | -| ANDROID_NDK_PATH | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | -| ANDROID_NDK_ROOT | C:\Android\android-sdk\ndk-bundle -> C:\Android\android-sdk\ndk\21.4.7075529 | -| ANDROID_SDK_ROOT | C:\Android\android-sdk | - -### Cached Docker images -| Repository:Tag | Digest | Created | -| ------------------------------------------------------------------------- | ------------------------------------------------------------------------ | ---------- | -| mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016 | sha256:b9e3d42db02f6ea7ac05eb244e5c588076997e92513b88a46b0a0bfd04a5b8e1 | 2022-02-08 | -| mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016 | sha256:ca99697a9354bbe9045512201be313167c74e65d6d6d2fe68d60f37629b3becc | 2022-02-08 | -| mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016 | sha256:88439200c6701c2654ea0b5abc61f17df59966b0c27209137da8db4426dcbdec | 2022-02-16 | -| mcr.microsoft.com/windows/nanoserver:10.0.14393.953 | sha256:fc60bd5ae0e61b334ce1cf1bcbf20c10c36b4c5482a01da319c9c989f9e6e268 | 2017-03-08 | -| mcr.microsoft.com/windows/servercore:ltsc2016 | sha256:fad7ed8aa70fd6748bc814dc872a431c34136bdded9476386a5ff2e73d6ba9f0 | 2022-02-02 | - - diff --git a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 index cdd4ea5b3..2a2b5131f 100644 --- a/images/win/scripts/ImageHelpers/ImageHelpers.psm1 +++ b/images/win/scripts/ImageHelpers/ImageHelpers.psm1 @@ -35,7 +35,6 @@ Export-ModuleMember -Function @( 'Get-WinVersion' 'Test-IsWin22' 'Test-IsWin19' - 'Test-IsWin16' 'Choco-Install' 'Send-RequestToCocolateyPackages' 'Get-LatestChocoPackageVersion' diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 index e898be5c5..c16372151 100644 --- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 +++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1 @@ -436,11 +436,6 @@ function Test-IsWin19 (Get-WinVersion) -match "2019" } -function Test-IsWin16 -{ - (Get-WinVersion) -match "2016" -} - function Extract-7Zip { Param ( diff --git a/images/win/scripts/Installers/Configure-Antivirus.ps1 b/images/win/scripts/Installers/Configure-Antivirus.ps1 index 34c78cef7..c5fc2012b 100644 --- a/images/win/scripts/Installers/Configure-Antivirus.ps1 +++ b/images/win/scripts/Installers/Configure-Antivirus.ps1 @@ -19,12 +19,10 @@ $avPreference = @( @{DisableRealtimeMonitoring = $true} ) -if (-not (Test-IsWin16)) { - $avPreference += @( - @{EnableControlledFolderAccess = "Disable"} - @{EnableNetworkProtection = "Disabled"} - ) -} +$avPreference += @( + @{EnableControlledFolderAccess = "Disable"} + @{EnableNetworkProtection = "Disabled"} +) $avPreference | Foreach-Object { $avParams = $_ diff --git a/images/win/scripts/Installers/Configure-Shell.ps1 b/images/win/scripts/Installers/Configure-Shell.ps1 index f72b7a3c2..f9ac96155 100644 --- a/images/win/scripts/Installers/Configure-Shell.ps1 +++ b/images/win/scripts/Installers/Configure-Shell.ps1 @@ -15,9 +15,5 @@ C:\msys64\usr\bin\bash.exe -leo pipefail %* # gitbash <--> C:\Program Files\Git\bin\bash.exe New-Item -ItemType SymbolicLink -Path "$shellPath\gitbash.exe" -Target "$env:ProgramFiles\Git\bin\bash.exe" | Out-Null -# WSL is available on Windows Server 2019 and Windows Server 2022 -if (-not (Test-IsWin16)) -{ - # wslbash <--> C:\Windows\System32\bash.exe - New-Item -ItemType SymbolicLink -Path "$shellPath\wslbash.exe" -Target "$env:SystemRoot\System32\bash.exe" | Out-Null -} +# wslbash <--> C:\Windows\System32\bash.exe +New-Item -ItemType SymbolicLink -Path "$shellPath\wslbash.exe" -Target "$env:SystemRoot\System32\bash.exe" | Out-Null diff --git a/images/win/scripts/Installers/Install-DotnetSDK.ps1 b/images/win/scripts/Installers/Install-DotnetSDK.ps1 index 54f7f40b8..2fde13dec 100644 --- a/images/win/scripts/Installers/Install-DotnetSDK.ps1 +++ b/images/win/scripts/Installers/Install-DotnetSDK.ps1 @@ -53,7 +53,7 @@ function Invoke-Warmup ( function Fix-ImportPublishProfile ( $SdkVersion ) { - if ((Test-IsWin16) -or (Test-IsWin19)) { + if (Test-IsWin19) { # Fix for issue https://github.com/dotnet/sdk/issues/1276. This will be fixed in 3.1. $sdkTargetsName = "Microsoft.NET.Sdk.ImportPublishProfile.targets" $sdkTargetsUrl = "https://raw.githubusercontent.com/dotnet/sdk/82bc30c99f1325dfaa7ad450be96857a4fca2845/src/Tasks/Microsoft.NET.Build.Tasks/targets/${sdkTargetsName}" diff --git a/images/win/scripts/Installers/Install-Git.ps1 b/images/win/scripts/Installers/Install-Git.ps1 index e2d3cd435..4bc561e0c 100644 --- a/images/win/scripts/Installers/Install-Git.ps1 +++ b/images/win/scripts/Installers/Install-Git.ps1 @@ -20,10 +20,6 @@ Choco-Install -PackageName hub # Add to PATH Add-MachinePathItem "C:\Program Files\Git\bin" -if (Test-IsWin16) { - $env:Path += ";$env:ProgramFiles\Git\usr\bin\" -} - # Add well-known SSH host keys to ssh_known_hosts ssh-keyscan -t rsa,ecdsa,ed25519 github.com >> "C:\Program Files\Git\etc\ssh\ssh_known_hosts" ssh-keyscan -t rsa ssh.dev.azure.com >> "C:\Program Files\Git\etc\ssh\ssh_known_hosts" diff --git a/images/win/scripts/Installers/Install-VCRedist.ps1 b/images/win/scripts/Installers/Install-VCRedist.ps1 index 473fed3a2..469dd24d1 100644 --- a/images/win/scripts/Installers/Install-VCRedist.ps1 +++ b/images/win/scripts/Installers/Install-VCRedist.ps1 @@ -1,17 +1,10 @@ -if (Test-IsWin16) { - # Install vcredist140 - Choco-Install -PackageName vcredist140 -} - -if (Test-IsWin19) { - # Install vcredist2010 - $Vc2010x86Name = "vcredist_x86.exe" - $Vc2010x86URI = "https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/${Vc2010x86Name}" - $Vc2010x64Name = "vcredist_x64.exe" - $Vc2010x64URI = "https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/${Vc2010x64Name}" - $ArgumentList = ("/install", "/quiet", "/norestart") - Install-Binary -Url $Vc2010x86URI -Name $Vc2010x86Name -ArgumentList $ArgumentList - Install-Binary -Url $Vc2010x64URI -Name $Vc2010x64Name -ArgumentList $ArgumentList -} +# Install vcredist2010 +$Vc2010x86Name = "vcredist_x86.exe" +$Vc2010x86URI = "https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/${Vc2010x86Name}" +$Vc2010x64Name = "vcredist_x64.exe" +$Vc2010x64URI = "https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/${Vc2010x64Name}" +$ArgumentList = ("/install", "/quiet", "/norestart") +Install-Binary -Url $Vc2010x86URI -Name $Vc2010x86Name -ArgumentList $ArgumentList +Install-Binary -Url $Vc2010x64URI -Name $Vc2010x64Name -ArgumentList $ArgumentList Invoke-PesterTests -TestFile "Tools" -TestName "VCRedist" diff --git a/images/win/scripts/Installers/Install-WDK.ps1 b/images/win/scripts/Installers/Install-WDK.ps1 index 9528be456..d92d0d3a3 100644 --- a/images/win/scripts/Installers/Install-WDK.ps1 +++ b/images/win/scripts/Installers/Install-WDK.ps1 @@ -14,18 +14,13 @@ if (Test-IsWin22) { $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2166289" $FilePath = "C:\Program Files (x86)\Windows Kits\10\Vsix\VS2019\WDK.vsix" $VSver = "2019" -} elseif (Test-IsWin16) { - $winSdkUrl = "https://go.microsoft.com/fwlink/p/?LinkID=2023014" - $wdkUrl = "https://go.microsoft.com/fwlink/?linkid=2026156" - $FilePath = "C:\Program Files (x86)\Windows Kits\10\Vsix\WDK.vsix" - $VSver = "2017" } else { throw "Invalid version of Visual Studio is found. Either 2017,2019 or 2022 are required" } $argumentList = ("/features", "+", "/quiet") -if ((Test-IsWin16) -or (Test-IsWin19)) { +if (Test-IsWin19) { # `winsdksetup.exe /features + /quiet` installs all features without showing the GUI Install-Binary -Url $winSdkUrl -Name "winsdksetup.exe" -ArgumentList $argumentList } @@ -36,7 +31,7 @@ Install-Binary -Url $wdkUrl -Name "wdksetup.exe" -ArgumentList $argumentList # Need to install the VSIX to get the build targets when running VSBuild # Windows 2022 - Skip installation due to a regression # https://docs.microsoft.com/en-us/windows-hardware/drivers/download-the-wdk -if ((Test-IsWin16) -or (Test-IsWin19)) { +if (Test-IsWin19) { $FilePath = Resolve-Path -Path $FilePath Install-VsixExtension -FilePath $FilePath -Name "WDK.vsix" -VSversion $VSver -InstallOnly } diff --git a/images/win/scripts/Installers/Update-ImageData.ps1 b/images/win/scripts/Installers/Update-ImageData.ps1 index 754ce77a1..c2dc6e965 100644 --- a/images/win/scripts/Installers/Update-ImageData.ps1 +++ b/images/win/scripts/Installers/Update-ImageData.ps1 @@ -15,12 +15,8 @@ if (Test-IsWin22) { $imageLabel = "windows-2019" $softwareUrl = "${githubUrl}/win19/${imageVersion}/images/win/Windows2019-Readme.md" $releaseUrl="https://github.com/actions/virtual-environments/releases/tag/win19%2F${imageVersion}" -} elseif (Test-IsWin16) { - $imageLabel = "windows-2016" - $softwareUrl = "${githubUrl}/win16/${imageVersion}/images/win/Windows2016-Readme.md" - $releaseUrl="https://github.com/actions/virtual-environments/releases/tag/win16%2F${imageVersion}" } else { - throw "Invalid platform version is found. Either Windows Server 2016 or 2019 or 2022 are required" + throw "Invalid platform version is found. Either Windows Server 2019 or 2022 are required" } $json = @" diff --git a/images/win/scripts/Installers/Windows2016/Install-SSDT.ps1 b/images/win/scripts/Installers/Windows2016/Install-SSDT.ps1 deleted file mode 100644 index e67d0cb2a..000000000 --- a/images/win/scripts/Installers/Windows2016/Install-SSDT.ps1 +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -## File: Install-SSDT.ps1 -## Desc: Install SQL Server Data Tools for Windows -################################################################################ - -#SSDT for Visual Studio 2017 -#The link down below points to the latest version of SSDT for Visual Studio 2017 -$InstallerName = "SSDT-Setup-ENU.exe" -$InstallerUrl = "https://go.microsoft.com/fwlink/?linkid=2124518" -$logFilePath = "$env:TEMP\ssdtlog.txt" -$ArgumentList = ("/install", "INSTALLALL", "/passive", "/norestart", "/log `"$logFilePath`"") - -Install-Binary -Url $InstallerUrl -Name $InstallerName -ArgumentList $ArgumentList - -Write-Host "******** SSDT SETUP LOG START ********" -Write-Host $(Get-Content $logFilePath | Out-String) -Write-Host "******** SSDT SETUP LOG END ********" - -Invoke-PesterTests -TestFile "SSDTExtensions" diff --git a/images/win/scripts/Installers/Windows2016/Install-Win81SDK.ps1 b/images/win/scripts/Installers/Windows2016/Install-Win81SDK.ps1 deleted file mode 100644 index 897b8bffe..000000000 --- a/images/win/scripts/Installers/Windows2016/Install-Win81SDK.ps1 +++ /dev/null @@ -1,10 +0,0 @@ -################################################################################ -## File: Install-Win81SDK.ps1 -## Desc: Install Windows 8.1 SDK -################################################################################ - -$InstallerName = "sdksetup.exe" -$InstallerUrl = "http://download.microsoft.com/download/B/0/C/B0C80BA3-8AD6-4958-810B-6882485230B5/standalonesdk/${InstallerName}" -$ArgumentList = ("/quiet", "/norestart") - -Install-Binary -Url $InstallerUrl -Name $InstallerName -ArgumentList $ArgumentList diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 980dd2dc7..1c36a9844 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -349,7 +349,7 @@ function Build-PackageManagementEnvironmentTable { "Value" = $env:VCPKG_INSTALLATION_ROOT } ) - if ((Test-IsWin16) -or (Test-IsWin19)) { + if (Test-IsWin19) { $envVariables += @( @{ "Name" = "CONDA" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index cf34a2fa4..d659ac7b3 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -121,7 +121,7 @@ $toolsList = @( (Get-ZstdVersion), (Get-YAMLLintVersion) ) -if ((Test-IsWin16) -or (Test-IsWin19)) { +if (Test-IsWin19) { $toolsList += @( (Get-GoogleCloudSDKVersion), (Get-ParcelVersion) @@ -140,7 +140,7 @@ $cliTools = @( (Get-GHVersion), (Get-HubVersion) ) -if ((Test-IsWin16) -or (Test-IsWin19)) { +if (Test-IsWin19) { $cliTools += @( (Get-CloudFoundryVersion) ) @@ -220,14 +220,10 @@ $databaseTools = @( (Get-AzCosmosDBEmulatorVersion), (Get-DacFxVersion), (Get-MySQLVersion), - (Get-SQLPSVersion) + (Get-SQLPSVersion), + (Get-SQLOLEDBDriverVersion) ) -if (-not (Test-IsWin16)) -{ - $databaseTools += Get-SQLOLEDBDriverVersion -} - $markdown += New-MDList -Style Unordered -Lines ($databaseTools | Sort-Object) $markdown += Build-WebServersSection diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 index a29f7e8c9..f278098dc 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1 @@ -38,19 +38,6 @@ function Get-VisualStudioExtensions { } } - # SSDT extensions for VS2017 - $vs = (Get-VisualStudioVersion).Name.Split()[-1] - if (Test-IsWin16) - { - $analysisPackageVersion = Get-VSExtensionVersion -packageName '04a86fc2-dbd5-4222-848e-911638e487fe' - $reportingPackageVersion = Get-VSExtensionVersion -packageName '717ad572-c4b7-435c-c166-c2969777f718' - $integrationPackageName = Get-VSExtensionVersion -packageName 'd1b09713-c12e-43cc-9ef4-6562298285ab' - $ssdtPackages = @( - @{Package = 'SSDT Microsoft Analysis Services Projects'; Version = $analysisPackageVersion} - @{Package = 'SSDT SQL Server Integration Services Projects'; Version = $reportingPackageVersion} - @{Package = 'SSDT Microsoft Reporting Services Projects'; Version = $integrationPackageName} - ) - } # SDK if (Test-IsWin19) { @@ -60,8 +47,9 @@ function Get-VisualStudioExtensions { ) } - if ((Test-IsWin16) -or (Test-IsWin19)) { + if (Test-IsWin19) { # Wix + $vs = (Get-VisualStudioVersion).Name.Split()[-1] $wixExtensionVersion = ($vsPackages | Where-Object {$_.Id -match 'WixToolset.VisualStudioExtension.Dev' -and $_.type -eq 'vsix'}).Version $wixPackages = @( @{Package = "WIX Toolset Studio $vs Extension"; Version = $wixExtensionVersion} diff --git a/images/win/scripts/Tests/MSYS2.Tests.ps1 b/images/win/scripts/Tests/MSYS2.Tests.ps1 index 85e1fc512..da2444fdf 100644 --- a/images/win/scripts/Tests/MSYS2.Tests.ps1 +++ b/images/win/scripts/Tests/MSYS2.Tests.ps1 @@ -16,7 +16,7 @@ Describe "MSYS2 packages" { @{ ToolName = "bash.exe" } ) - if ((Test-IsWin16) -or (Test-IsWin19)) { + if (Test-IsWin19) { $TestCases += @( @{ ToolName = "tar.exe" } @{ ToolName = "make.exe" } diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index 08f27f715..1086a3ec5 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -160,16 +160,12 @@ Describe "Vcpkg" { } Describe "VCRedist" -Skip:(Test-IsWin22) { - It "vcredist_140" -Skip:(Test-IsWin19) { - "C:\Windows\System32\vcruntime140.dll" | Should -Exist - } - - It "vcredist_2010_x64" -Skip:(Test-IsWin16) { + It "vcredist_2010_x64" { "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1D8E6291-B0D5-35EC-8441-6616F567A0F7}" | Should -Exist "C:\Windows\System32\msvcr100.dll" | Should -Exist } - It "vcredist_2010_x64" -Skip:(Test-IsWin16) { + It "vcredist_2010_x64" { "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1D8E6291-B0D5-35EC-8441-6616F567A0F7}" | Should -Exist "C:\Windows\System32\msvcr100.dll" | Should -Exist } @@ -201,7 +197,7 @@ Describe "Kotlin" { } } -Describe "SQL OLEDB Driver" -Skip:(Test-IsWin16) { +Describe "SQL OLEDB Driver" { It "SQL OLEDB Driver" { "HKLM:\SOFTWARE\Microsoft\MSOLEDBSQL" | Should -Exist } diff --git a/images/win/scripts/Tests/VisualStudio.Tests.ps1 b/images/win/scripts/Tests/VisualStudio.Tests.ps1 index e60fce92b..79643f0d2 100644 --- a/images/win/scripts/Tests/VisualStudio.Tests.ps1 +++ b/images/win/scripts/Tests/VisualStudio.Tests.ps1 @@ -25,7 +25,7 @@ Describe "Visual Studio" { } Describe "Windows 10 SDK" { - It "Verifies 17763 SDK is installed" -Skip:((Test-IsWin16) -or (Test-IsWin19)) { + It "Verifies 17763 SDK is installed" -Skip:(Test-IsWin19) { "${env:ProgramFiles(x86)}\Windows Kits\10\DesignTime\CommonConfiguration\Neutral\UAP\10.0.17763.0\UAP.props" | Should -Exist } } \ No newline at end of file diff --git a/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 b/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 index 7c754967c..973105396 100644 --- a/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 +++ b/images/win/scripts/Tests/WindowsFeatures.Tests.ps1 @@ -51,7 +51,7 @@ Describe "GDIProcessHandleQuota" { } } -Describe "Test Signed Drivers" -Skip:(Test-IsWin16) { +Describe "Test Signed Drivers" { It "bcdedit testsigning should be Yes"{ "$(bcdedit)" | Should -Match "testsigning\s+Yes" } diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json deleted file mode 100644 index 1a0aaab6d..000000000 --- a/images/win/toolsets/toolset-2016.json +++ /dev/null @@ -1,454 +0,0 @@ -{ - "toolcache": [ - { - "name": "Ruby", - "arch": "x64", - "platform" : "win32", - "versions": [ - "2.4", - "2.5", - "2.6", - "2.7", - "3.0" - ], - "default": "2.5" - }, - { - "name": "Python", - "url" : "https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json", - "arch": "x64", - "platform" : "win32", - "versions": [ - "2.7.*", - "3.6.*", - "3.7.*", - "3.8.*", - "3.9.*", - "3.10.*" - ], - "default": "3.7.*" - }, - { - "name": "Python", - "url" : "https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json", - "arch": "x86", - "platform" : "win32", - "versions": [ - "2.7.*", - "3.6.*", - "3.7.*", - "3.8.*", - "3.9.*" - ] - }, - { - "name": "PyPy", - "arch": "x86", - "platform" : "win64", - "versions": [ - "2.7", - "3.6", - "3.7", - "3.8", - "3.9" - ] - }, - { - "name": "node", - "url" : "https://raw.githubusercontent.com/actions/node-versions/main/versions-manifest.json", - "arch": "x64", - "platform" : "win32", - "versions": [ - "12.*", - "14.*", - "16.*" - ] - }, - { - "name": "go", - "url" : "https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json", - "arch": "x64", - "platform" : "win32", - "versions": [ - "1.16.*", - "1.17.*", - "1.18.*" - ], - "default": "1.17.*" - } - ], - "powershellModules": [ - {"name": "DockerMsftProvider"}, - {"name": "MarkdownPS"}, - {"name": "Pester"}, - {"name": "PowerShellGet"}, - {"name": "PSScriptAnalyzer"}, - {"name": "PSWindowsUpdate"}, - {"name": "SqlServer"}, - {"name": "VSSetup"}, - {"name": "Microsoft.Graph"}, - {"name": "AWSPowershell"} - ], - "azureModules": [ - { - "name": "azurerm", - "blob_url": "https://vstsagenttools.blob.core.windows.net/tools/azurepowershellmodules/", - "versions": [ - "2.1.0", - "6.13.1" - ], - "zip_versions": [ - "3.8.0", - "4.2.1", - "5.1.1", - "6.7.0" - ], - "default": "2.1.0" - }, - { - "name": "azure", - "blob_url": "https://vstsagenttools.blob.core.windows.net/tools/azurepowershellmodules/", - "versions": [ - "2.1.0", - "5.3.0" - ], - "zip_versions": [ - "3.8.0", - "4.2.1", - "5.1.1" - ], - "default": "2.1.0" - }, - { - "name": "az", - "url" : "https://raw.githubusercontent.com/Azure/az-ps-module-versions/main/versions-manifest.json", - "versions": [ - "7.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", - "6.6.0" - ] - } - ], - "java": { - "default": "8", - "default_vendor": "Temurin-Hotspot", - "vendors": [ - { - "name": "Temurin-Hotspot", - "versions": [ "8", "11", "17" ] - }, - { - "name": "Adopt", - "versions": [ "8", "11", "13" ] - } - ] - }, - "android": { - "cmdline-tools": "latest", - "platform_min_version": "19", - "build_tools_min_version": "19.1.0", - "extra_list": [ - "android;m2repository", - "google;m2repository", - "google;google_play_services", - "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2", - "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1", - "m2repository;com;android;support;constraint;constraint-layout;1.0.2", - "m2repository;com;android;support;constraint;constraint-layout;1.0.1" - ], - "addon_list": [ - "addon-google_apis-google-24", - "addon-google_apis-google-23", - "addon-google_apis-google-22", - "addon-google_apis-google-21" - ], - "additional_tools": [ - "cmake;3.10.2.4988404", - "cmake;3.18.1", - "patcher;v4" - ], - "ndk": { - "default": "21", - "versions": [ - "21", "22", "23" - ] - } - }, - "mingw": { - "version": "8.1.0" - }, - "MsysPackages": { - "msys2": [ - "base-devel", - "compression" - ], - "mingw": [ - { - "arch": "mingw-w64-x86_64", - "exec_dir": "mingw64", - "runtime_packages": [ - { - "name": "clang", - "executables": [ - "clang", - "g++", - "gcc" - ] - }, - { - "name": "cmake", - "executables": [ - "cmake", - "cpack", - "ctest" - ] - }, - { - "name": "ragel", - "executables": [ - "ragel" - ] - } - ], - "additional_packages": [ - "clang-tools-extra", - "libxml2", - "llvm", - "toolchain" - ] - }, - { - "arch": "mingw-w64-i686", - "exec_dir": "mingw32", - "runtime_packages": [ - { - "name": "clang", - "executables": [ - "clang", - "g++", - "gcc" - ] - }, - { - "name": "cmake", - "executables": [ - "cmake", - "cpack", - "ctest" - ] - }, - { - "name": "ragel", - "executables": [ - "ragel" - ] - } - ], - "additional_packages": [ - "libxml2", - "llvm", - "toolchain" - ] - } - ] - }, - "windowsFeatures": [ - { "name": "NET-Framework-Features", "includeAllSubFeatures": true }, - { "name": "NET-Framework-45-Features", "includeAllSubFeatures": true }, - { "name": "BITS", "includeAllSubFeatures": true }, - { "name": "DSC-Service" }, - { "name": "FS-iSCSITarget-Server", "includeAllSubFeatures": true, "includeManagementTools": true }, - { "name": "Containers" } - ], - "visualStudio": { - "version" : "2017", - "subversion" : "15", - "edition" : "Enterprise", - "channel": "release", - "workloads": [ - "Microsoft.Net.Component.4.6.2.SDK", - "Microsoft.Net.Component.4.6.2.TargetingPack", - "Microsoft.Net.ComponentGroup.4.6.2.DeveloperTools", - "Microsoft.Net.Component.4.7.SDK", - "Microsoft.Net.Component.4.7.TargetingPack", - "Microsoft.Net.ComponentGroup.4.7.DeveloperTools", - "Microsoft.Net.Component.4.7.1.SDK", - "Microsoft.Net.Component.4.7.1.TargetingPack", - "Microsoft.Net.ComponentGroup.4.7.1.DeveloperTools", - "Microsoft.Net.Component.4.7.2.SDK", - "Microsoft.Net.Component.4.7.2.TargetingPack", - "Microsoft.Net.ComponentGroup.4.7.2.DeveloperTools", - "Microsoft.Net.Core.Component.SDK.1x", - "Microsoft.NetCore.1x.ComponentGroup.Web", - "Microsoft.VisualStudio.Component.Azure.Storage.AzCopy", - "Microsoft.VisualStudio.Component.VC.140", - "Component.Dotfuscator", - "Microsoft.VisualStudio.Component.VC.ATL", - "Microsoft.VisualStudio.Component.VC.ATL.ARM", - "Microsoft.VisualStudio.Component.VC.ATL.ARM64", - "Microsoft.VisualStudio.Component.VC.ATLMFC", - "Microsoft.VisualStudio.Component.VC.ClangC2", - "Microsoft.VisualStudio.Component.VC.CLI.Support", - "Microsoft.VisualStudio.Component.VC.Modules.x86.x64", - "Microsoft.VisualStudio.Component.Windows10SDK.10240", - "Microsoft.VisualStudio.Component.Windows10SDK.10586", - "Microsoft.VisualStudio.Component.Windows10SDK.14393", - "Microsoft.VisualStudio.Component.Windows10SDK.15063.Desktop", - "Component.Unreal", - "Component.Unreal.Android", - "Component.Android.SDK23", - "Microsoft.VisualStudio.Component.TestTools.WebLoadTest", - "Microsoft.VisualStudio.Web.Mvc4.ComponentGroup", - "Component.Linux.CMake", - "Microsoft.Component.PythonTools.UWP", - "Microsoft.Component.VC.Runtime.OSSupport", - "Microsoft.VisualStudio.Component.VC.Tools.ARM", - "Microsoft.VisualStudio.ComponentGroup.UWP.VC", - "Microsoft.VisualStudio.Component.VSSDK", - "Microsoft.VisualStudio.Component.LinqToSql", - "Microsoft.VisualStudio.Component.TestTools.CodedUITest", - "Microsoft.VisualStudio.Component.TestTools.Core", - "Microsoft.VisualStudio.Component.TypeScript.2.0", - "Microsoft.VisualStudio.Component.TypeScript.2.1", - "Microsoft.VisualStudio.Component.TypeScript.2.2", - "Microsoft.VisualStudio.Component.VC.Tools.ARM64", - "Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop.arm", - "Microsoft.VisualStudio.Component.DslTools", - "Microsoft.VisualStudio.Component.Windows81SDK", - "Microsoft.VisualStudio.Component.WinXP", - "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Win81", - "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.WinXP", - "Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Managed", - "Microsoft.Component.Blend.SDK.WPF", - "Microsoft.Component.VC.Runtime.UCRTSDK", - "Microsoft.VisualStudio.Component.Sharepoint.Tools", - "Microsoft.VisualStudio.Component.TeamOffice", - "Microsoft.VisualStudio.Component.VC.ATL.Spectre", - "Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.ATL.ARM64.Spectre", - "Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre", - "Microsoft.VisualStudio.Component.Windows10SDK.17134", - "Microsoft.VisualStudio.Component.Windows10SDK.17763", - "Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre", - "Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre", - "Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre", - "Microsoft.VisualStudio.Component.Workflow", - "Microsoft.VisualStudio.Workload.Office" - ], - "vsix": [ - "WixToolset.WixToolsetVisualStudio2017Extension" - ] - }, - "docker": { - "images": [ - "mcr.microsoft.com/windows/servercore:ltsc2016", - "mcr.microsoft.com/windows/nanoserver:10.0.14393.953", - "mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016", - "mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016", - "mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2016" - ] - }, - "pipx": [ - { - "package": "yamllint", - "cmd": "yamllint --version" - } - ], - "selenium": { - "version": "4", - "binary_name": "selenium-server" - }, - "npm": { - "global_packages": [ - { "name": "yarn", "test": "yarn --version" }, - { "name": "newman", "test": "newman --version" }, - { "name": "lerna", "test": "lerna --version" }, - { "name": "typescript", "test": "tsc --version" }, - { "name": "cordova" }, - { "name": "grunt-cli", "test": "grunt --version" }, - { "name": "gulp-cli", "test": "gulp --version" }, - { "name": "parcel", "test": "parcel --version" }, - { "name": "webpack" }, - { "name": "webpack-cli" }, - { "name": "node-sass" } - ] - }, - "dotnet": { - "versions": [ - "3.1", - "5.0" - ], - "tools": [ - { "name": "nbgv", "test": "nbgv --version", "getversion": "nbgv --version" } - ], - "warmup": true - }, - "choco": { - "common_packages": [ - { "name": "7zip.install" }, - { "name": "aria2" }, - { "name": "azcopy10" }, - { "name": "Bicep" }, - { "name": "gitversion.portable" }, - { "name": "innosetup" }, - { "name": "jq" }, - { "name": "NuGet.CommandLine" }, - { - "name": "openssl.light", - "args": [ "--version=1.1.1.20181020" ] - }, - { "name": "packer" }, - { "name": "strawberryperl" }, - { "name": "pulumi" }, - { "name": "tortoisesvn" }, - { "name": "swig" }, - { "name": "vswhere" }, - { - "name": "julia", - "args": [ "--ia", "/DIR=C:\\Julia" ] - }, - { - "name": "cmake.install", - "args": [ "--installargs", "ADD_CMAKE_TO_PATH=\"System\"" ] - } - ] - }, - "node": { - "default": "16" - }, - "mysql": { - "version": "5.7" - }, - "mongodb": { - "version": "5.0" - }, - "nsis": { - "version": "3.08" - }, - "php": { - "version": "8.1" - }, - "llvm": { - "version": "13" - }, - "postgresql": { - "version": "14" - }, - "kotlin": { - "version": "latest", - "binary_name": "kotlin-compiler" - } -} diff --git a/images/win/windows2016.json b/images/win/windows2016.json deleted file mode 100644 index 901d164d4..000000000 --- a/images/win/windows2016.json +++ /dev/null @@ -1,322 +0,0 @@ -{ - "variables": { - "client_id": "{{env `ARM_CLIENT_ID`}}", - "client_secret": "{{env `ARM_CLIENT_SECRET`}}", - "client_cert_path": "{{env `ARM_CLIENT_CERT_PATH`}}", - "subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}", - "tenant_id": "{{env `ARM_TENANT_ID`}}", - "object_id": "{{env `ARM_OBJECT_ID`}}", - "resource_group": "{{env `ARM_RESOURCE_GROUP`}}", - "storage_account": "{{env `ARM_STORAGE_ACCOUNT`}}", - "build_resource_group_name": "{{env `BUILD_RESOURCE_GROUP_NAME`}}", - "temp_resource_group_name": "{{env `TEMP_RESOURCE_GROUP_NAME`}}", - "location": "{{env `ARM_RESOURCE_LOCATION`}}", - "virtual_network_name": "{{env `VNET_NAME`}}", - "virtual_network_resource_group_name": "{{env `VNET_RESOURCE_GROUP`}}", - "virtual_network_subnet_name": "{{env `VNET_SUBNET`}}", - "private_virtual_network_with_public_ip": "{{env `PRIVATE_VIRTUAL_NETWORK_WITH_PUBLIC_IP`}}", - "allowed_inbound_ip_addresses": "{{env `AGENT_IP`}}", - "vm_size": "Standard_D8s_v4", - "image_folder": "C:\\image", - "imagedata_file": "C:\\imagedata.json", - "helper_script_folder": "C:\\Program Files\\WindowsPowerShell\\Modules\\", - "psmodules_root_folder": "C:\\Modules", - "agent_tools_directory": "C:\\hostedtoolcache\\windows", - "install_user": "installer", - "install_password": null, - "capture_name_prefix": "packer", - "image_version": "dev", - "image_os": "win16" - }, - "sensitive-variables": [ - "install_password", - "client_secret" - ], - "builders": [ - { - "name": "vhd", - "type": "azure-arm", - "client_id": "{{user `client_id`}}", - "client_secret": "{{user `client_secret`}}", - "client_cert_path": "{{user `client_cert_path`}}", - "subscription_id": "{{user `subscription_id`}}", - "object_id": "{{user `object_id`}}", - "tenant_id": "{{user `tenant_id`}}", - "os_disk_size_gb": "256", - "location": "{{user `location`}}", - "vm_size": "{{user `vm_size`}}", - "resource_group_name": "{{user `resource_group`}}", - "storage_account": "{{user `storage_account`}}", - "build_resource_group_name": "{{user `build_resource_group_name`}}", - "temp_resource_group_name": "{{user `temp_resource_group_name`}}", - "capture_container_name": "images", - "capture_name_prefix": "{{user `capture_name_prefix`}}", - "virtual_network_name": "{{user `virtual_network_name`}}", - "virtual_network_resource_group_name": "{{user `virtual_network_resource_group_name`}}", - "virtual_network_subnet_name": "{{user `virtual_network_subnet_name`}}", - "private_virtual_network_with_public_ip": "{{user `private_virtual_network_with_public_ip`}}", - "allowed_inbound_ip_addresses": "{{user `allowed_inbound_ip_addresses`}}", - "os_type": "Windows", - "image_publisher": "MicrosoftWindowsServer", - "image_offer": "WindowsServer", - "image_sku": "2016-Datacenter", - "communicator": "winrm", - "winrm_use_ssl": "true", - "winrm_insecure": "true", - "winrm_username": "packer" - } - ], - "provisioners": [ - { - "type": "powershell", - "inline": [ - "New-Item -Path {{user `image_folder`}} -ItemType Directory -Force" - ] - }, - { - "type": "file", - "source": "{{ template_dir }}/scripts/ImageHelpers", - "destination": "{{user `helper_script_folder`}}" - }, - { - "type": "file", - "source": "{{ template_dir }}/scripts/SoftwareReport", - "destination": "{{user `image_folder`}}" - }, - { - "type": "file", - "source": "{{ template_dir }}/post-generation", - "destination": "C:/" - }, - { - "type": "file", - "source": "{{ template_dir }}/scripts/Tests", - "destination": "{{user `image_folder`}}" - }, - { - "type": "file", - "source": "{{template_dir}}/toolsets/toolset-2016.json", - "destination": "{{user `image_folder`}}\\toolset.json" - }, - { - "type": "windows-shell", - "inline": [ - "net user {{user `install_user`}} {{user `install_password`}} /add /passwordchg:no /passwordreq:yes /active:yes /Y", - "net localgroup Administrators {{user `install_user`}} /add", - "winrm set winrm/config/service/auth @{Basic=\"true\"}", - "winrm get winrm/config/service/auth" - ] - }, - { - "type": "powershell", - "inline": [ - "if (-not ((net localgroup Administrators) -contains '{{user `install_user`}}')) { exit 1 }" - ] - }, - { - "type": "powershell", - "environment_vars": [ - "IMAGE_VERSION={{user `image_version`}}", - "IMAGE_OS={{user `image_os`}}", - "AGENT_TOOLSDIRECTORY={{user `agent_tools_directory`}}", - "IMAGEDATA_FILE={{user `imagedata_file`}}" - ], - "scripts": [ - "{{ template_dir }}/scripts/Installers/Configure-Antivirus.ps1", - "{{ template_dir }}/scripts/Installers/Install-PowerShellModules.ps1", - "{{ template_dir }}/scripts/Installers/Install-WindowsFeatures.ps1", - "{{ template_dir }}/scripts/Installers/Install-Choco.ps1", - "{{ template_dir }}/scripts/Installers/Initialize-VM.ps1", - "{{ template_dir }}/scripts/Installers/Update-ImageData.ps1", - "{{ template_dir }}/scripts/Installers/Update-DotnetTLS.ps1" - ], - "execution_policy": "unrestricted" - }, - { - "type": "windows-restart", - "restart_timeout": "30m" - }, - { - "type": "powershell", - "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-VCRedist.ps1", - "{{ template_dir }}/scripts/Installers/Install-Docker.ps1", - "{{ template_dir }}/scripts/Installers/Install-PowershellCore.ps1", - "{{ template_dir }}/scripts/Installers/Install-WebPlatformInstaller.ps1" - ] - }, - { - "type": "windows-restart", - "restart_timeout": "30m" - }, - { - "type": "powershell", - "valid_exit_codes": [ - 0, - 3010 - ], - "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-VS.ps1", - "{{ template_dir }}/scripts/Installers/Install-KubernetesTools.ps1", - "{{ template_dir }}/scripts/Installers/Install-NET48.ps1", - "{{ template_dir }}/scripts/Installers/Windows2016/Install-SSDT.ps1" - ], - "elevated_user": "{{user `install_user`}}", - "elevated_password": "{{user `install_password`}}" - }, - { - "type": "powershell", - "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-ServiceFabricSDK.ps1" - ], - "execution_policy": "remotesigned" - }, - { - "type": "windows-restart", - "restart_timeout": "30m" - }, - { - "type": "powershell", - "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-Wix.ps1", - "{{ template_dir }}/scripts/Installers/Install-WDK.ps1", - "{{ template_dir }}/scripts/Installers/Install-Vsix.ps1", - "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1", - "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1", - "{{ template_dir }}/scripts/Installers/Install-CommonUtils.ps1", - "{{ template_dir }}/scripts/Installers/Install-AliyunCli.ps1", - "{{ template_dir }}/scripts/Installers/Install-PostgreSQL.ps1", - "{{ template_dir }}/scripts/Installers/Install-JavaTools.ps1", - "{{ template_dir }}/scripts/Installers/Install-Kotlin.ps1", - "{{ template_dir }}/scripts/Installers/Install-Ruby.ps1", - "{{ template_dir }}/scripts/Installers/Install-PyPy.ps1", - "{{ template_dir }}/scripts/Installers/Install-Toolset.ps1", - "{{ template_dir }}/scripts/Installers/Configure-Toolset.ps1", - "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1", - "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1", - "{{ template_dir }}/scripts/Installers/Install-AndroidSDK.ps1", - "{{ template_dir }}/scripts/Installers/Install-Pipx.ps1", - "{{ template_dir }}/scripts/Installers/Install-PipxPackages.ps1", - "{{ template_dir }}/scripts/Installers/Install-Sbt.ps1", - "{{ template_dir }}/scripts/Installers/Install-Git.ps1", - "{{ 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-Chrome.ps1", - "{{ template_dir }}/scripts/Installers/Install-Edge.ps1", - "{{ template_dir }}/scripts/Installers/Install-Firefox.ps1", - "{{ template_dir }}/scripts/Installers/Install-Selenium.ps1", - "{{ template_dir }}/scripts/Installers/Install-IEWebDriver.ps1", - "{{ template_dir }}/scripts/Installers/Install-Apache.ps1", - "{{ template_dir }}/scripts/Installers/Install-Nginx.ps1", - "{{ template_dir }}/scripts/Installers/Install-LLVM.ps1" - ] - }, - { - "type": "windows-shell", - "inline": [ - "wmic product where \"name like '%%microsoft azure powershell%%'\" call uninstall /nointeractive" - ] - }, - { - "type": "powershell", - "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-AzureModules.ps1", - "{{ template_dir }}/scripts/Installers/Install-WinAppDriver.ps1", - "{{ template_dir }}/scripts/Installers/Install-R.ps1", - "{{ template_dir }}/scripts/Installers/Install-AWS.ps1", - "{{ template_dir }}/scripts/Installers/Install-DACFx.ps1", - "{{ 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-Msys2.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-Miniconda.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-MongoDB.ps1", - "{{ template_dir }}/scripts/Installers/Install-GoogleCloudSDK.ps1", - "{{ template_dir }}/scripts/Installers/Install-CodeQLBundle.ps1", - "{{ template_dir }}/scripts/Installers/Disable-JITDebugger.ps1" - ] - }, - { - "type": "powershell", - "scripts": [ - "{{ template_dir }}/scripts/Installers/Install-WindowsUpdates.ps1", - "{{ template_dir }}/scripts/Installers/Configure-DynamicPort.ps1", - "{{ template_dir }}/scripts/Installers/Configure-GDIProcessHandleQuota.ps1", - "{{ template_dir }}/scripts/Installers/Configure-Shell.ps1", - "{{ template_dir }}/scripts/Installers/Enable-DeveloperMode.ps1" - ], - "elevated_user": "{{user `install_user`}}", - "elevated_password": "{{user `install_password`}}" - }, - { - "type": "windows-restart", - "check_registry": true, - "restart_check_command": "powershell -command \"& {if ((-not (Get-Process TiWorker.exe -ErrorAction SilentlyContinue)) -and (-not [System.Environment]::HasShutdownStarted) ) { Write-Output 'Restart complete' }}\"", - "restart_timeout": "30m" - }, - { - "type": "powershell", - "pause_before": "2m", - "scripts": [ - "{{ template_dir }}/scripts/Installers/Wait-WindowsUpdatesForInstall.ps1", - "{{ template_dir }}/scripts/Tests/RunAll-Tests.ps1" - ] - }, - { - "type": "powershell", - "inline": [ - "if (-not (Test-Path {{user `image_folder`}}\\Tests\\testResults.xml)) { throw '{{user `image_folder`}}\\Tests\\testResults.xml not found' }" - ] - }, - { - "type": "powershell", - "inline": [ - "pwsh -File '{{user `image_folder`}}\\SoftwareReport\\SoftwareReport.Generator.ps1'" - ], - "environment_vars": [ - "IMAGE_VERSION={{user `image_version`}}" - ] - }, - { - "type": "powershell", - "inline": [ - "if (-not (Test-Path C:\\InstalledSoftware.md)) { throw 'C:\\InstalledSoftware.md not found' }" - ] - }, - { - "type": "file", - "source": "C:\\InstalledSoftware.md", - "destination": "{{ template_dir }}/Windows2016-Readme.md", - "direction": "download" - }, - { - "type": "powershell", - "skip_clean": true, - "scripts": [ - "{{ template_dir }}/scripts/Installers/Finalize-VM.ps1" - ] - }, - { - "type": "windows-restart", - "restart_timeout": "30m" - }, - { - "type": "powershell", - "inline": [ - "if( Test-Path $Env:SystemRoot\\System32\\Sysprep\\unattend.xml ){ rm $Env:SystemRoot\\System32\\Sysprep\\unattend.xml -Force}", - "& $env:SystemRoot\\System32\\Sysprep\\Sysprep.exe /oobe /generalize /quiet /quit", - "while($true) { $imageState = Get-ItemProperty HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Setup\\State | Select ImageState; if($imageState.ImageState -ne 'IMAGE_STATE_GENERALIZE_RESEAL_TO_OOBE') { Write-Output $imageState.ImageState; Start-Sleep -s 10 } else { break } }" - ] - } - ] -}