mirror of
https://github.com/actions/runner-images-sangeeth.git
synced 2026-01-09 03:40:42 +08:00
Merge branch 'main' into v-malob/12beta6
This commit is contained in:
Maxim Lobanov
@@ -32,9 +32,7 @@ function Get-ClangVersions {
|
||||
}
|
||||
|
||||
function Get-ErlangVersion {
|
||||
$result = Get-CommandResult "erl -version"
|
||||
$result.Output -match "version (?<version>\d+\.\d+\.\d+)" | Out-Null
|
||||
$version = $Matches.version
|
||||
$version = (erl -eval 'erlang:display(erlang:system_info(version)), halt().' -noshell).Trim('"')
|
||||
return "Erlang $version"
|
||||
}
|
||||
|
||||
|
||||
@@ -14,6 +14,9 @@ Import-Module (Join-Path $PSScriptRoot "SoftwareReport.Java.psm1") -DisableNameC
|
||||
Import-Module (Join-Path $PSScriptRoot "SoftwareReport.Rust.psm1") -DisableNameChecking
|
||||
Import-Module (Join-Path $PSScriptRoot "SoftwareReport.Tools.psm1") -DisableNameChecking
|
||||
|
||||
# Restore file owner in user profile
|
||||
Restore-UserOwner
|
||||
|
||||
$markdown = ""
|
||||
|
||||
if ($env:ANNOUNCEMENTS) {
|
||||
|
||||
@@ -49,3 +49,7 @@ function New-MDNewLine {
|
||||
$newLineSymbol = [System.Environment]::NewLine
|
||||
return $newLineSymbol * $Count
|
||||
}
|
||||
|
||||
function Restore-UserOwner {
|
||||
sudo chown -R ${env:USER}: $env:HOME
|
||||
}
|
||||
@@ -4,7 +4,7 @@ function Get-7zipVersion {
|
||||
}
|
||||
|
||||
function Get-AnsibleVersion {
|
||||
$ansibleVersion = sudo ansible --version | Select-Object -First 1 | Take-OutputPart -Part 1
|
||||
$ansibleVersion = ansible --version | Select-Object -First 1 | Take-OutputPart -Part 1
|
||||
return "Ansible $ansibleVersion"
|
||||
}
|
||||
|
||||
@@ -19,12 +19,12 @@ function Get-AzCopy10Version {
|
||||
}
|
||||
|
||||
function Get-BazelVersion {
|
||||
$bazelVersion = sudo bazel --version | Select-String "bazel" | Take-OutputPart -Part 1
|
||||
$bazelVersion = bazel --version | Select-String "bazel" | Take-OutputPart -Part 1
|
||||
return "Bazel $bazelVersion"
|
||||
}
|
||||
|
||||
function Get-BazeliskVersion {
|
||||
$bazeliskVersion = sudo bazelisk version 2>&1 | Select-String "Bazelisk version:" | Take-OutputPart -Part 2 | Take-OutputPart -Part 0 -Delimiter "v"
|
||||
$bazeliskVersion = bazelisk version 2>&1 | Select-String "Bazelisk version:" | Take-OutputPart -Part 2 | Take-OutputPart -Part 0 -Delimiter "v"
|
||||
return "Bazelisk $bazeliskVersion"
|
||||
}
|
||||
|
||||
@@ -92,7 +92,7 @@ function Get-GitFTPVersion {
|
||||
}
|
||||
|
||||
function Get-GoogleCloudSDKVersion {
|
||||
return "$(sudo gcloud --version | Select-Object -First 1)"
|
||||
return "$(gcloud --version | Select-Object -First 1)"
|
||||
}
|
||||
|
||||
function Get-HavegedVersion {
|
||||
@@ -101,7 +101,7 @@ function Get-HavegedVersion {
|
||||
}
|
||||
|
||||
function Get-HerokuVersion {
|
||||
$herokuVersion = sudo heroku version | Take-OutputPart -Part 0 | Take-OutputPart -Part 1 -Delimiter "/"
|
||||
$herokuVersion = heroku version | Take-OutputPart -Part 0 | Take-OutputPart -Part 1 -Delimiter "/"
|
||||
return "Heroku $herokuVersion"
|
||||
}
|
||||
|
||||
@@ -201,12 +201,12 @@ function Get-JqVersion {
|
||||
}
|
||||
|
||||
function Get-AzureCliVersion {
|
||||
$azcliVersion = sudo az -v | Select-String "azure-cli" | Take-OutputPart -Part -1
|
||||
$azcliVersion = az -v | Select-String "azure-cli" | Take-OutputPart -Part -1
|
||||
return "Azure CLI (azure-cli) $azcliVersion"
|
||||
}
|
||||
|
||||
function Get-AzureDevopsVersion {
|
||||
$azdevopsVersion = sudo az -v | Select-String "azure-devops" | Take-OutputPart -Part -1
|
||||
$azdevopsVersion = az -v | Select-String "azure-devops" | Take-OutputPart -Part -1
|
||||
return "Azure CLI (azure-devops) $azdevopsVersion"
|
||||
}
|
||||
|
||||
@@ -238,7 +238,7 @@ function Get-GitHubCliVersion {
|
||||
}
|
||||
|
||||
function Get-NetlifyCliVersion {
|
||||
$netlifyVersion = sudo netlify --version | Take-OutputPart -Part 0 | Take-OutputPart -Part 1 -Delimiter "/"
|
||||
$netlifyVersion = netlify --version | Take-OutputPart -Part 0 | Take-OutputPart -Part 1 -Delimiter "/"
|
||||
return "Netlify CLI $netlifyVersion"
|
||||
}
|
||||
|
||||
|
||||
@@ -45,6 +45,17 @@ function Switch-Xcode {
|
||||
Invoke-Expression "sudo xcode-select --switch ${XcodeRootPath}"
|
||||
}
|
||||
|
||||
function Test-XcodeStableRelease {
|
||||
param(
|
||||
[Parameter(Mandatory)]
|
||||
[string] $XcodeRootPath
|
||||
)
|
||||
|
||||
$licenseInfoPlistPath = Join-Path $XcodeRootPath "Contents" "Resources" "LicenseInfo.plist"
|
||||
$releaseType = & defaults read $licenseInfoPlistPath "licenseType"
|
||||
return -not ($releaseType -match "beta")
|
||||
}
|
||||
|
||||
function Get-XcodeSimulatorsInfo {
|
||||
param(
|
||||
[string] $Filter
|
||||
@@ -102,6 +113,6 @@ function Test-XcodeStableVersion {
|
||||
if ($Version -match "GM") {
|
||||
return $false
|
||||
}
|
||||
|
||||
|
||||
return $true
|
||||
}
|
||||
@@ -19,7 +19,7 @@ binst_common_utils=(
|
||||
helm
|
||||
aliyun-cli
|
||||
bazelisk
|
||||
github/gh/gh
|
||||
gh
|
||||
p7zip
|
||||
ant
|
||||
yamllint
|
||||
|
||||
@@ -46,7 +46,8 @@ function Get-XcodeInfoList {
|
||||
$versionInfo = Get-XcodeVersionInfo
|
||||
$versionInfo.Path = $xcodeRootPath
|
||||
$versionInfo.IsDefault = ($xcodeRootPath -eq $defaultXcodeRootPath)
|
||||
|
||||
$versionInfo.IsStable = Test-XcodeStableRelease -XcodeRootPath $xcodeRootPath
|
||||
|
||||
$xcodeInfo.Add($xcodeRootPath, [PSCustomObject] @{
|
||||
VersionInfo = $versionInfo
|
||||
SDKInfo = Get-XcodeSDKList
|
||||
@@ -91,6 +92,7 @@ function Build-XcodeTable {
|
||||
$xcodeList = $xcodeInfo.Values | ForEach-Object { $_.VersionInfo } | Sort-Object $sortRules
|
||||
return $xcodeList | ForEach-Object {
|
||||
$defaultPostfix = If ($_.IsDefault) { " (default)" } else { "" }
|
||||
$betaPostfix = If ($_.IsStable) { "" } else { " (beta)" }
|
||||
return [PSCustomObject] @{
|
||||
"Version" = $_.Version.ToString() + $betaPostfix + $defaultPostfix
|
||||
"Build" = $_.Build
|
||||
|
||||
@@ -82,6 +82,11 @@
|
||||
"source": "{{ template_dir }}/scripts/SoftwareReport",
|
||||
"destination": "{{user `image_folder`}}"
|
||||
},
|
||||
{
|
||||
"type": "file",
|
||||
"source": "{{ template_dir }}/post-generation",
|
||||
"destination": "C:/post-generation"
|
||||
},
|
||||
{
|
||||
"type": "file",
|
||||
"source": "{{ template_dir }}/scripts/Tests",
|
||||
|
||||
@@ -82,6 +82,11 @@
|
||||
"source": "{{ template_dir }}/scripts/SoftwareReport",
|
||||
"destination": "{{user `image_folder`}}"
|
||||
},
|
||||
{
|
||||
"type": "file",
|
||||
"source": "{{ template_dir }}/post-generation",
|
||||
"destination": "C:/post-generation"
|
||||
},
|
||||
{
|
||||
"type": "file",
|
||||
"source": "{{ template_dir }}/scripts/Tests",
|
||||
@@ -168,12 +173,6 @@
|
||||
"type": "windows-restart",
|
||||
"restart_timeout": "10m"
|
||||
},
|
||||
{
|
||||
"type": "powershell",
|
||||
"scripts": [
|
||||
"{{ template_dir }}/scripts/Installers/Update-DockerImages.ps1"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "powershell",
|
||||
"valid_exit_codes": [
|
||||
|
||||
8
images/win/post-generation/Dotnet.ps1
Normal file
8
images/win/post-generation/Dotnet.ps1
Normal file
@@ -0,0 +1,8 @@
|
||||
$latestPath = [System.Environment]::GetEnvironmentVariable('PATH', [System.EnvironmentVariableTarget]::Machine)
|
||||
$dotnetPath = "$env:USERPROFILE\.dotnet\tools"
|
||||
|
||||
if (-not $latestPath.Contains($dotnetPath))
|
||||
{
|
||||
$latestPath = "$dotnetPath;$latestPath"
|
||||
[System.Environment]::SetEnvironmentVariable('PATH', $latestPath, [System.EnvironmentVariableTarget]::Machine)
|
||||
}
|
||||
12
images/win/post-generation/RustJunction.ps1
Normal file
12
images/win/post-generation/RustJunction.ps1
Normal file
@@ -0,0 +1,12 @@
|
||||
# Create Rust junction points to cargo and rustup folder
|
||||
$cargoTarget = "$env:USERPROFILE\.cargo"
|
||||
if (-not (Test-Path $cargoTarget))
|
||||
{
|
||||
New-Item -ItemType Junction -Path $cargoTarget -Target "C:\Rust\.cargo"
|
||||
}
|
||||
|
||||
$rustupTarget = "$env:USERPROFILE\.rustup"
|
||||
if (-not (Test-Path $rustupTarget))
|
||||
{
|
||||
New-Item -ItemType Junction -Path $rustupTarget -Target "C:\Rust\.rustup"
|
||||
}
|
||||
4
images/win/post-generation/VSConfiguration.ps1
Normal file
4
images/win/post-generation/VSConfiguration.ps1
Normal file
@@ -0,0 +1,4 @@
|
||||
$vsInstallRoot = Get-VisualStudioPath
|
||||
$devEnvPath = "$vsInstallRoot\Common7\IDE\devenv.exe"
|
||||
|
||||
cmd.exe /c "`"$devEnvPath`" /updateconfiguration"
|
||||
@@ -27,10 +27,6 @@ Function Set-DefaultVariables
|
||||
}
|
||||
}
|
||||
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
Import-Module -Name ImageHelpers -Force -DisableNameChecking
|
||||
|
||||
# Define executables for cached tools
|
||||
$toolsEnvironmentVariables = @{
|
||||
Python = @{
|
||||
|
||||
@@ -62,8 +62,6 @@ Function Set-DefaultRubyVersion {
|
||||
Invoke-Expression "gem update --system"
|
||||
}
|
||||
|
||||
Import-Module -Name ImageHelpers -Force
|
||||
|
||||
$FeedPrefix = "https://npm.pkg.github.com"
|
||||
$AccessToken = $env:GITHUB_FEED_TOKEN
|
||||
|
||||
|
||||
@@ -6,8 +6,6 @@
|
||||
Write-Host "Cleanup WinSxS"
|
||||
Dism.exe /online /Cleanup-Image /StartComponentCleanup /ResetBase
|
||||
|
||||
$ErrorActionPreference = 'silentlycontinue'
|
||||
|
||||
Write-Host "Clean up various directories"
|
||||
@(
|
||||
"C:\\Recovery",
|
||||
@@ -30,4 +28,5 @@ Write-Host "Clean up various directories"
|
||||
$winInstallDir = "$env:windir\\Installer"
|
||||
New-Item -Path $winInstallDir -ItemType Directory -Force
|
||||
|
||||
$ErrorActionPreference = 'Continue'
|
||||
# Remove AllUsersAllHosts profile
|
||||
Remove-Item $profile.AllUsersAllHosts -Force
|
||||
|
||||
@@ -30,6 +30,9 @@ function Disable-UserAccessControl {
|
||||
Write-Host "User Access Control (UAC) has been disabled."
|
||||
}
|
||||
|
||||
# Enable $ErrorActionPreference='Stop' for AllUsersAllHosts
|
||||
Add-Content -Path $profile.AllUsersAllHosts -Value '$ErrorActionPreference="Stop"'
|
||||
|
||||
# Set TLS1.2
|
||||
[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12"
|
||||
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
## Desc: Install Azure CosmosDb Emulator
|
||||
####################################################################################
|
||||
|
||||
Import-Module -Name ImageHelpers -Force
|
||||
|
||||
$InstallerName = "AzureCosmosDBEmulator.msi"
|
||||
$InstallerUrl = "https://aka.ms/cosmosdb-emulator"
|
||||
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
## Desc: Install Azure PowerShell modules
|
||||
################################################################################
|
||||
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
# The correct Modules need to be saved in C:\Modules
|
||||
$installPSModulePath = $env:PSMODULES_ROOT_FOLDER
|
||||
if (-not (Test-Path -LiteralPath $installPSModulePath))
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
## Desc: Install Google Chrome
|
||||
################################################################################
|
||||
|
||||
Import-Module -Name ImageHelpers -Force
|
||||
|
||||
# Download and install latest Chrome browser
|
||||
$ChromeInstallerFile = "chrome_installer.exe"
|
||||
$ChromeInstallerUrl = "https://dl.google.com/chrome/install/375.126/${ChromeInstallerFile}"
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
## Desc: Install Cloud Foundry CLI
|
||||
################################################################################
|
||||
|
||||
Import-Module -Name ImageHelpers
|
||||
|
||||
# Download the latest cf cli exe
|
||||
$CloudFoundryCliName = "cf-cli.zip"
|
||||
$CloudFoundryCliUrl = "https://packages.cloudfoundry.org/stable?release=windows64-exe&source=github"
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
## Desc: Install SQL Server® Data-Tier Application Framework (DACFx) for Windows
|
||||
####################################################################################
|
||||
|
||||
Import-Module -Name ImageHelpers -Force
|
||||
|
||||
$InstallerName = "DacFramework.msi"
|
||||
$InstallerUrl = "https://go.microsoft.com/fwlink/?linkid=2134206"
|
||||
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
## Desc: Install Mozilla Firefox
|
||||
################################################################################
|
||||
|
||||
Import-Module -Name ImageHelpers -Force
|
||||
|
||||
# Install and configure Firefox browser
|
||||
Write-Host "Install latest Firefox browser..."
|
||||
$VersionsManifest = Invoke-RestMethod "https://product-details.mozilla.org/1.0/firefox_versions.json"
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
## Desc: Install Git for Windows
|
||||
################################################################################
|
||||
|
||||
Import-Module -Name ImageHelpers
|
||||
|
||||
function getSimpleValue([string] $url, [string] $filename ) {
|
||||
$fullpath = "${env:Temp}\$filename"
|
||||
Invoke-WebRequest -Uri $url -OutFile $fullpath
|
||||
@@ -40,5 +38,10 @@ Choco-Install -PackageName hub
|
||||
|
||||
Add-MachinePathItem "C:\Program Files\Git\bin"
|
||||
|
||||
# Add well-known SSH host keys to ssh_known_hosts
|
||||
|
||||
ssh-keyscan -t rsa 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"
|
||||
|
||||
Invoke-PesterTests -TestFile "Git" -TestName "Git"
|
||||
Invoke-PesterTests -TestFile "CLI.Tools" -TestName "Hub CLI"
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
## Desc: Install various JDKs and java tools
|
||||
################################################################################
|
||||
|
||||
Import-Module -Name ImageHelpers -Force
|
||||
|
||||
function Set-JavaPath {
|
||||
param (
|
||||
[string] $Version,
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
## Desc: Install the latest version of Miniconda and set $env:CONDA
|
||||
################################################################################
|
||||
|
||||
Import-Module -Name ImageHelpers -Force
|
||||
|
||||
$CondaDestination = "C:\Miniconda"
|
||||
|
||||
# Lock to Miniconda 4.6 until we do the work to run `conda init` for the vsts user
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
## Desc: Install .NET 4.8
|
||||
################################################################################
|
||||
|
||||
Import-Module -Name ImageHelpers -Force
|
||||
|
||||
# .NET 4.8 Dev pack
|
||||
$InstallerName = "ndp48-devpack-enu.exe"
|
||||
$InstallerUrl = "https://download.visualstudio.microsoft.com/download/pr/014120d7-d689-4305-befd-3cb711108212/0307177e14752e359fde5423ab583e43/${InstallerName}"
|
||||
|
||||
@@ -4,8 +4,6 @@
|
||||
## Must run after python is configured
|
||||
################################################################################
|
||||
|
||||
Import-Module -Name ImageHelpers -Force
|
||||
|
||||
$PrefixPath = 'C:\npm\prefix'
|
||||
$CachePath = 'C:\npm\cache'
|
||||
|
||||
|
||||
@@ -2,9 +2,6 @@
|
||||
## File: Install-PHP.ps1
|
||||
## Desc: Install PHP
|
||||
################################################################################
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
Import-Module -Name ImageHelpers
|
||||
|
||||
# Install latest PHP in chocolatey
|
||||
$installDir = "c:\tools\php"
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
#Define user and password for PostgreSQL database
|
||||
$pgUser = "postgres"
|
||||
$pgPwd = "root"
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
# Set TLS1.2
|
||||
[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12"
|
||||
|
||||
|
||||
@@ -82,9 +82,6 @@ function Install-PyPy
|
||||
}
|
||||
}
|
||||
|
||||
$ErrorActionPreference = "Stop"
|
||||
Import-Module -Name ImageHelpers -Force -DisableNameChecking
|
||||
|
||||
# Get PyPy content from toolset
|
||||
$pypyTools = Get-ToolsetContent | Select-Object -ExpandProperty toolcache | Where-Object Name -eq "PyPy"
|
||||
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
## Desc: Install Rust for Windows
|
||||
################################################################################
|
||||
|
||||
Import-Module -Name ImageHelpers
|
||||
|
||||
# Rust Env
|
||||
$env:RUSTUP_HOME = "C:\Rust\.rustup"
|
||||
$env:CARGO_HOME = "C:\Rust\.cargo"
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
## Desc: Install SQL PowerShell tool
|
||||
################################################################################
|
||||
|
||||
Import-Module -Name ImageHelpers -Force
|
||||
|
||||
$BaseUrl = "https://download.microsoft.com/download/8/7/2/872BCECA-C849-4B40-8EBE-21D48CDF1456/ENU/x64"
|
||||
|
||||
# install required MSIs
|
||||
|
||||
@@ -2,9 +2,6 @@
|
||||
## File: Install-Sbt.ps1
|
||||
## Desc: Install sbt for Windows
|
||||
################################################################################
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
Import-Module -Name ImageHelpers
|
||||
|
||||
# Install the latest version of sbt.
|
||||
# See https://chocolatey.org/packages/sbt
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
## Desc: Install Selenium Server standalone
|
||||
################################################################################
|
||||
|
||||
Import-Module -Name ImageHelpers -Force
|
||||
|
||||
# Acquire latest Selenium release number from GitHub API
|
||||
$latestReleaseUrl = "https://api.github.com/repos/SeleniumHQ/selenium/releases/latest"
|
||||
try {
|
||||
|
||||
@@ -29,10 +29,6 @@ Function Install-Asset {
|
||||
Pop-Location
|
||||
}
|
||||
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
Import-Module -Name ImageHelpers -Force
|
||||
|
||||
# Get toolcache content from toolset
|
||||
$ToolsToInstall = @("Python", "Node", "Boost", "Go")
|
||||
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
## Desc: Install Visual Studio
|
||||
################################################################################
|
||||
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$toolset = Get-ToolsetContent
|
||||
$requiredComponents = $toolset.visualStudio.workloads | ForEach-Object { "--add $_" }
|
||||
$workLoads = @(
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
## Desc: Install vcpkg
|
||||
################################################################################
|
||||
|
||||
Import-Module -Name ImageHelpers -Force
|
||||
|
||||
$Uri = 'https://github.com/Microsoft/vcpkg.git'
|
||||
$InstallDir = 'C:\vcpkg'
|
||||
$VcpkgExecPath = 'vcpkg.exe'
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
## Desc: Install the Visual Studio Extensions from toolset.json
|
||||
###################################################################################
|
||||
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$toolset = Get-ToolsetContent
|
||||
$vsixPackagesList = $toolset.visualStudio.vsix
|
||||
if (-not $vsixPackagesList) {
|
||||
|
||||
@@ -4,9 +4,6 @@
|
||||
################################################################################
|
||||
|
||||
# Requires Windows SDK with the same version number as the WDK
|
||||
|
||||
Import-Module -Name ImageHelpers -Force
|
||||
|
||||
if (Test-IsWin19)
|
||||
{
|
||||
$winSdkUrl = "https://go.microsoft.com/fwlink/p/?linkid=2120843"
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
## Desc: Install Windows Application Driver (WinAppDriver)
|
||||
####################################################################################
|
||||
|
||||
Import-Module -Name ImageHelpers -Force
|
||||
|
||||
$InstallerName = "WindowsApplicationDriver.msi"
|
||||
$InstallerUrl = "https://github.com/Microsoft/WinAppDriver/releases/download/v1.1/${InstallerName}"
|
||||
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
## Desc: Install WIX.
|
||||
################################################################################
|
||||
|
||||
Import-Module -Name ImageHelpers -Force
|
||||
|
||||
Choco-Install -PackageName wixtoolset -ArgumentList "--force"
|
||||
|
||||
if(Test-IsWin19)
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
## Desc: Install and update Android SDK and tools
|
||||
################################################################################
|
||||
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
# Install the standard Android SDK licenses. In the past, there wasn't a better way to do this,
|
||||
# so we are base64-encoding a zip of the licenses directory from another installation.
|
||||
# To create this base64 string, create a zip file that contains nothing but a 'licenses' folder,
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
## Desc: Install SQL Server Data Tools for Windows
|
||||
################################################################################
|
||||
|
||||
Import-Module -Name ImageHelpers -Force
|
||||
|
||||
#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"
|
||||
|
||||
@@ -3,8 +3,6 @@
|
||||
## Desc: Install Windows 8.1 SDK
|
||||
################################################################################
|
||||
|
||||
Import-Module -Name ImageHelpers -Force
|
||||
|
||||
$InstallerName = "sdksetup.exe"
|
||||
$InstallerUrl = "http://download.microsoft.com/download/B/0/C/B0C80BA3-8AD6-4958-810B-6882485230B5/standalonesdk/${InstallerName}"
|
||||
$ArgumentList = ("/quiet", "/norestart")
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
Import-Module MarkdownPS
|
||||
Import-Module (Join-Path $PSScriptRoot "SoftwareReport.Android.psm1") -DisableNameChecking
|
||||
Import-Module (Join-Path $PSScriptRoot "SoftwareReport.Browsers.psm1") -DisableNameChecking
|
||||
@@ -74,7 +72,6 @@ $markdown += New-MDList -Style Unordered -Lines @(
|
||||
|
||||
$markdown += New-MDHeader "Tools" -Level 3
|
||||
$markdown += New-MDList -Style Unordered -Lines @(
|
||||
(Get-AzCosmosDBEmulatorVersion),
|
||||
(Get-AzCopyVersion),
|
||||
(Get-BazelVersion),
|
||||
(Get-BazeliskVersion),
|
||||
@@ -91,15 +88,12 @@ $markdown += New-MDList -Style Unordered -Lines @(
|
||||
(Get-KubectlVersion),
|
||||
(Get-KindVersion),
|
||||
(Get-MinGWVersion),
|
||||
(Get-MySQLVersion),
|
||||
(Get-MercurialVersion),
|
||||
(Get-NSISVersion),
|
||||
(Get-NewmanVersion),
|
||||
(Get-OpenSSLVersion),
|
||||
(Get-PackerVersion),
|
||||
(Get-PulumiVersion),
|
||||
(Get-SQLPSVersion),
|
||||
(Get-SQLServerPSVersion),
|
||||
(Get-SVNVersion),
|
||||
(Get-GHCVersion),
|
||||
(Get-CabalVersion),
|
||||
@@ -168,6 +162,14 @@ $markdown += New-MDHeader "Databases" -Level 3
|
||||
$markdown += Build-DatabasesMarkdown
|
||||
$markdown += New-MDNewLine
|
||||
|
||||
$markdown += New-MDHeader "Database tools" -Level 3
|
||||
$markdown += New-MDList -Style Unordered -Lines @(
|
||||
(Get-AzCosmosDBEmulatorVersion),
|
||||
(Get-SQLPSVersion),
|
||||
(Get-MySQLVersion)
|
||||
)
|
||||
$markdown += New-MDNewLine
|
||||
|
||||
$vs = Get-VisualStudioVersion
|
||||
$markdown += New-MDHeader "$($vs.Name)" -Level 3
|
||||
$markdown += $vs | New-MDTable
|
||||
|
||||
@@ -125,12 +125,6 @@ function Get-SQLPSVersion {
|
||||
return "SQLPS $version"
|
||||
}
|
||||
|
||||
function Get-SQLServerPSVersion {
|
||||
$module = Get-Module -Name SQLServer -ListAvailable
|
||||
$version = $module.Version
|
||||
return "SQLServer PS $version"
|
||||
}
|
||||
|
||||
function Get-SVNVersion {
|
||||
$svnVersion = $(svn --version --quiet)
|
||||
return "Subversion (SVN) $svnVersion"
|
||||
|
||||
Reference in New Issue
Block a user