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.

Sign up for GitHub

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

Support both .NET 8 and .NET 9 #701

Merged
merged 11 commits into from
Nov 27, 2024
Merged

Support both .NET 8 and .NET 9 #701

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2b6a04a
Moving GitHub to .NET 9
neilr81 Nov 25, 2024
f942709
Updating to use .NET 9 package
neilr81 Nov 25, 2024
7767195
Update Directory.Packages.props
neilr81 Nov 25, 2024
7005572
Update global.json
neilr81 Nov 25, 2024
b1ae1f1
Merge branch 'main' into bugfix/net9
K-Cully Nov 26, 2024
1ee5339
Dual-targeting .NET 8 and 9.
artempushkin Nov 26, 2024
90502d8
Ok
artempushkin Nov 26, 2024
e6769bf
9 or greater
artempushkin Nov 26, 2024
0452b9c
Added dual .NET SDK intallation to pipelines.
artempushkin Nov 27, 2024
2ce231a
Fixed targets.
artempushkin Nov 27, 2024
01ee670
Fixed flaky tests.
artempushkin Nov 27, 2024
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
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
</PropertyGroup>

<PropertyGroup Label="Target Platforms" >
<LatestSupportedDotNetVersion>net8.0</LatestSupportedDotNetVersion>
<LatestSupportedDotNetVersion>net9.0</LatestSupportedDotNetVersion>
<OldestSupportedDotNetVersion>net8.0</OldestSupportedDotNetVersion>
<NetCoreVersions>$(LatestSupportedDotNetVersion)</NetCoreVersions>
<NetCoreVersions Condition="'$(LatestSupportedDotNetVersion)' != '$(OldestSupportedDotNetVersion)'">$(LatestSupportedDotNetVersion);$(OldestSupportedDotNetVersion)</NetCoreVersions>
Expand Down
72 changes: 36 additions & 36 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,46 +5,46 @@
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
</PropertyGroup>
<ItemGroup Label="Latest DotNet Package Versions. AutoUpdate" Condition="'$(TargetFramework)' == '$(LatestSupportedDotNetVersion)' OR '$(IsNetStandard)'">
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.11" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="8.0.11" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
<PackageVersion Include="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="9.0.0" />
<PackageVersion Include="System.Text.Json" Version="9.0.0" />
</ItemGroup>
<ItemGroup Label="Previous DotNet Package Versions. AutoUpdate" Condition="'$(TargetFramework)' == '$(OldestSupportedDotNetVersion)' And '$(OldestSupportedDotNetVersion)' != '$(LatestSupportedDotNetVersion)'">
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="7.0.20" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="7.0.1" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="7.0.0" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="7.0.0" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="7.0.20" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="7.0.1" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="7.0.0" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" PreserveMajor="true" />
<PackageVersion Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.1.1" PreserveMajor="true" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PreserveMajor="true" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" PreserveMajor="true" />
<PackageVersion Include="System.Text.Json" Version="7.0.4" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.11" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.1" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="8.0.11" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0" PreserveMajor="true" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" PreserveMajor="true" />
<PackageVersion Include="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0" PreserveMajor="true" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PreserveMajor="true" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" PreserveMajor="true" />
<PackageVersion Include="System.Text.Json" Version="8.0.5" PreserveMajor="true" />
</ItemGroup>
<ItemGroup Label="Package Versions. AutoUpdate">
<PackageVersion Include="MSTest.TestAdapter" Version="3.6.3" />
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.404",
"version": "9.0.100",
"rollForward": "latestMajor"
}
}
5 changes: 5 additions & 0 deletions tests/Diagnostics.HealthChecks.UnitTests/CertificatesValidityHealthCheckTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,12 @@ public async Task CheckHealthAsync_ShouldReturnUnhealthy_WhenCertificateNotYetVa
[TestMethod]
public async Task CheckHealthAsync_ShouldReturnUnhealthy_WhenCertificateDoesNotHavePrivateKey()
{
#if NET9_0
X509Certificate2 certWithoutPrivateKey = X509CertificateLoader.LoadCertificate(CreateCert(m_certSubjectName).Export(X509ContentType.Cert));
#else
X509Certificate2 certWithoutPrivateKey = new(CreateCert(m_certSubjectName).Export(X509ContentType.Cert));
#endif

m_certificateReaderMock.Setup(m => m.GetCertificateByCommonName(It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<StoreName>()))
.Returns(certWithoutPrivateKey);

Expand Down
Loading