-
Notifications
You must be signed in to change notification settings - Fork 346
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #640 from microsoft/main
Release 07-23-21
- Loading branch information
Showing
9 changed files
with
123 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| # Copyright (c) Microsoft Corporation. | ||
| # Licensed under the MIT License. | ||
|
|
||
| . $PSScriptRoot\Invoke-ScriptBlockHandler.ps1 | ||
|
|
||
| Function Get-VisualCRedistributableInstalledVersion { | ||
| [CmdletBinding()] | ||
| param( | ||
| [string]$ComputerName = $env:COMPUTERNAME, | ||
| [scriptblock]$CatchActionFunction | ||
| ) | ||
| begin { | ||
| Write-Verbose "Calling: $($MyInvocation.MyCommand)" | ||
| $softwareList = New-Object 'System.Collections.Generic.List[object]' | ||
| } | ||
| process { | ||
| $installedSoftware = Invoke-ScriptBlockHandler -ComputerName $ComputerName ` | ||
| -ScriptBlock { Get-ItemProperty HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\* } ` | ||
| -ScriptBlockDescription "Querying for software" ` | ||
| -CatchActionFunction $CatchActionFunction | ||
|
|
||
| foreach ($software in $installedSoftware) { | ||
|
|
||
| if ($software.DisplayName -like "Microsoft Visual C++ *") { | ||
| Write-Verbose "Microsoft Visual C++ Found: $($software.DisplayName)" | ||
| $softwareList.Add([PSCustomObject]@{ | ||
| DisplayName = $software.DisplayName | ||
| DisplayVersion = $software.DisplayVersion | ||
| InstallDate = $software.InstallDate | ||
| VersionIdentifier = $software.Version | ||
| }) | ||
| } | ||
| } | ||
| } | ||
| end { | ||
| Write-Verbose "Exiting: $($MyInvocation.MyCommand)" | ||
| return $softwareList | ||
| } | ||
| } | ||
|
|
||
| Function Get-VisualCRedistributableInfo { | ||
| [CmdletBinding()] | ||
| param ( | ||
| [Parameter(Mandatory = $true)] | ||
| [ValidateSet(2012, 2013)] | ||
| [int] | ||
| $Year | ||
| ) | ||
|
|
||
| if ($Year -eq 2012) { | ||
| return [PSCustomObject]@{ | ||
| VersionNumber = 184610406 | ||
| DownloadUrl = "https://www.microsoft.com/en-us/download/details.aspx?id=30679" | ||
| DisplayName = "Microsoft Visual C++ 2012*" | ||
| } | ||
| } else { | ||
| return [PSCustomObject]@{ | ||
| VersionNumber = 201367256 | ||
| DownloadUrl = "https://support.microsoft.com/en-us/topic/update-for-visual-c-2013-redistributable-package-d8ccd6a5-4e26-c290-517b-8da6cfdf4f10" | ||
| DisplayName = "Microsoft Visual C++ 2013*" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| Function Test-VisualCRedistributableInstalled { | ||
| [CmdletBinding()] | ||
| param ( | ||
| [Parameter(Mandatory = $true, Position = 0)] | ||
| [ValidateSet(2012, 2013)] | ||
| [int] | ||
| $Year, | ||
|
|
||
| [Parameter(Mandatory = $true, Position = 1)] | ||
| [object] | ||
| $Installed | ||
| ) | ||
|
|
||
| $desired = Get-VisualCRedistributableInfo $Year | ||
|
|
||
| return ($null -ne $Installed | Where-Object { $_.DisplayName -like $desired.DisplayName }) | ||
| } | ||
|
|
||
| Function Test-VisualCRedistributableUpToDate { | ||
| [CmdletBinding()] | ||
| param ( | ||
| [Parameter(Mandatory = $true, Position = 0)] | ||
| [ValidateSet(2012, 2013)] | ||
| [int] | ||
| $Year, | ||
|
|
||
| [Parameter(Mandatory = $true, Position = 1)] | ||
| [object] | ||
| $Installed | ||
| ) | ||
|
|
||
| $desired = Get-VisualCRedistributableInfo $Year | ||
|
|
||
| return ($null -ne ($Installed | Where-Object { | ||
| $_.DisplayName -like $desired.DisplayName -and $_.VersionIdentifier -eq $desired.VersionNumber | ||
| })) | ||
| } |