Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 9-29-2023 #1837

Merged
merged 3 commits into from
Sep 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,20 @@ function Invoke-AnalyzerOsInformation {
AddHtmlOverviewValues = $true
}
Add-AnalyzedResultInformation @params

if ($osInformation.NETFramework.MajorVersion -gt $recommendedNetVersion) {
# Generic information stating we are looking into supporting this version of .NET
# But don't use it till we update the supportability matrix
$displayValue = "Microsoft is working on .NET $($osInformation.NETFramework.FriendlyName) validation with Exchange" +
" and the recommendation is to not use .NET $($osInformation.NETFramework.FriendlyName) until it is officially added to the supportability matrix."

$params = $baseParams + @{
Details = $displayValue
DisplayWriteType = "Yellow"
DisplayCustomTabNumber = 2
}
Add-AnalyzedResultInformation @params
}
}

$displayValue = [string]::Empty
Expand Down
6 changes: 5 additions & 1 deletion Shared/Get-NETFrameworkVersion.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,12 @@ function Get-NETFrameworkVersion {
} elseif ($NetVersionKey -lt $netVersionDictionary["Net4d8"]) {
$friendlyName = "4.7.2"
$minValue = $netVersionDictionary["Net4d7d2"]
} elseif ($NetVersionKey -ge $netVersionDictionary["Net4d8"]) {
} elseif ($NetVersionKey -lt $netVersionDictionary["Net4d8d1"]) {
$friendlyName = "4.8"
$minValue = $netVersionDictionary["Net4d8"]
} elseif ($NetVersionKey -ge $netVersionDictionary["Net4d8d1"]) {
$friendlyName = "4.8.1"
$minValue = $netVersionDictionary["Net4d8d1"]
}
}
end {
Expand All @@ -100,6 +103,7 @@ function GetNetVersionDictionary {
"Net4d7d1" = 461308
"Net4d7d2" = 461808
"Net4d8" = 528040
"Net4d8d1" = 533320
}
}

Expand Down
13 changes: 13 additions & 0 deletions Shared/Tests/Get-NETFrameworkVersion.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,14 @@ Describe "Testing $scriptName" {
$result.MinimumValue | Should -Be $value
$result.RegistryValue | Should -Be ($value + 1)
}

It ".NET 4.8.1" {
$value = 533320
$result = Get-NETFrameworkVersion -NetVersionKey ($value + 1)
$result.FriendlyName | Should -Be "4.8.1"
$result.MinimumValue | Should -Be $value
$result.RegistryValue | Should -Be ($value + 1)
}
}

Context "Get Local .NET Version and debug" {
Expand Down Expand Up @@ -189,5 +197,10 @@ Describe "Testing $scriptName" {
$result = Get-NETFrameworkVersion -NetVersionShortName "Net4d8"
$result.FriendlyName = "4.8"
}

It "NET 4.8.1" {
$result = Get-NETFrameworkVersion -NetVersionShortName "Net4d8d1"
$result.FriendlyName = "4.8.1"
}
}
}