actions/runner-images-sangeeth
1
0
Fork 0
mirror of https://github.com/actions/runner-images-sangeeth.git synced 2025-12-28 20:38:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

removed merge conflicts

Browse Source
This commit is contained in:
Dariy.Nurgaleev
2020-03-20 00:22:12 +07:00
parent 8875bb3585 0ddeb1ac4b
commit 98d3de4ca4
48 changed files with 513 additions and 674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
images/win/scripts/ImageHelpers/ImageHelpers.psm1
View File

@@ -14,9 +14,15 @@ Export-ModuleMember -Function @(
'Set-SystemVariable'
'Install-MSI'
'Install-EXE'
'Get-ToolcachePackages'
'Get-ToolsByName'
'Add-ContentToMarkdown'
'Add-SoftwareDetailsToMarkdown'
'Stop-SvcWithErrHandling'
'Set-SvcWithErrHandling'
'Get-VS19ExtensionVersion'
'Install-VsixExtension'
'Get-VSExtensionVersion'
'Get-WinVersion'
'Test-IsWin19'
'Test-IsWin16'
)

7
images/win/scripts/ImageHelpers/InstallHelpers.ps1
View File

@@ -161,6 +161,7 @@ Hashtable for service arguments
}
}
<<<<<<< HEAD
function Start-DownloadWithRetry
{
param (
@@ -201,6 +202,8 @@ function Start-DownloadWithRetry
}
=======
>>>>>>> upstream/master
function Install-VsixExtension
{
Param
@@ -351,3 +354,7 @@ function Test-IsWin16
{
(Get-WinVersion) -match "2016"
}
<<<<<<< HEAD
=======
>>>>>>> upstream/master