Merge pull request #2331 from eerhardt/UpdateToNet9

eerhardt · web-flow · commit 9d0d146eb702 · 2024-12-04T09:53:57.000-06:00
Update to currently supported Target Frameworks.
diff --git a/.github/workflows/healthchecks_arangodb_ci.yml b/.github/workflows/healthchecks_arangodb_ci.yml
@@ -42,9 +42,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
       - name: Restore
         run: |
           dotnet restore ./src/HealthChecks.ArangoDb/HealthChecks.ArangoDb.csproj &&
diff --git a/.github/workflows/healthchecks_consul_ci.yml b/.github/workflows/healthchecks_consul_ci.yml
@@ -42,9 +42,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
       - name: Restore
         run: |
           dotnet restore ./src/HealthChecks.Consul/HealthChecks.Consul.csproj &&
diff --git a/.github/workflows/healthchecks_elasticsearch_ci.yml b/.github/workflows/healthchecks_elasticsearch_ci.yml
@@ -42,9 +42,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
       - run:
           ln -s /usr/libexec/docker/cli-plugins/docker-compose /usr/local/bin/docker-compose
       - name: Restore
diff --git a/.github/workflows/healthchecks_eventstore_ci.yml b/.github/workflows/healthchecks_eventstore_ci.yml
@@ -45,9 +45,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
       - name: Restore
         run: |
           dotnet restore ./src/HealthChecks.EventStore/HealthChecks.EventStore.csproj &&
diff --git a/.github/workflows/healthchecks_eventstore_grpc_ci.yml b/.github/workflows/healthchecks_eventstore_grpc_ci.yml
@@ -44,9 +44,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
       - name: Restore
         run: |
           dotnet restore ./src/HealthChecks.EventStore.gRPC/HealthChecks.EventStore.gRPC.csproj &&
diff --git a/.github/workflows/healthchecks_gremlin_ci.yml b/.github/workflows/healthchecks_gremlin_ci.yml
@@ -44,9 +44,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
       - name: Restore
         run: |
           dotnet restore ./src/HealthChecks.Gremlin/HealthChecks.Gremlin.csproj &&
diff --git a/.github/workflows/healthchecks_ibmmq_ci.yml b/.github/workflows/healthchecks_ibmmq_ci.yml
@@ -47,9 +47,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
       - name: Restore
         run: |
           dotnet restore ./src/HealthChecks.IbmMQ/HealthChecks.IbmMQ.csproj &&
diff --git a/.github/workflows/healthchecks_influxdb_ci.yml b/.github/workflows/healthchecks_influxdb_ci.yml
@@ -36,9 +36,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
       - name: Restore
         run: |
           dotnet restore ./src/HealthChecks.InfluxDB/HealthChecks.InfluxDB.csproj &&
diff --git a/.github/workflows/healthchecks_kafka_ci.yml b/.github/workflows/healthchecks_kafka_ci.yml
@@ -57,9 +57,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
       - name: Restore
         run: |
           dotnet restore ./src/HealthChecks.Kafka/HealthChecks.Kafka.csproj &&
diff --git a/.github/workflows/healthchecks_milvus_ci.yml b/.github/workflows/healthchecks_milvus_ci.yml
@@ -40,9 +40,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
       - name: Restore
         run: |
           dotnet restore ./src/HealthChecks.Milvus/HealthChecks.Milvus.csproj &&          
diff --git a/.github/workflows/healthchecks_mongodb_ci.yml b/.github/workflows/healthchecks_mongodb_ci.yml
@@ -41,9 +41,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
       - name: Restore
         run: |
           dotnet restore ./src/HealthChecks.MongoDb/HealthChecks.MongoDb.csproj &&
diff --git a/.github/workflows/healthchecks_mysql_ci.yml b/.github/workflows/healthchecks_mysql_ci.yml
@@ -43,9 +43,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
       - name: Restore
         run: |
           dotnet restore ./src/HealthChecks.MySql/HealthChecks.MySql.csproj &&
diff --git a/.github/workflows/healthchecks_nats_ci.yml b/.github/workflows/healthchecks_nats_ci.yml
@@ -43,9 +43,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
       - name: Restore
         run: |
           dotnet restore ./src/HealthChecks.Nats/HealthChecks.Nats.csproj &&
diff --git a/.github/workflows/healthchecks_network_ci.yml b/.github/workflows/healthchecks_network_ci.yml
@@ -68,9 +68,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
       - name: Restore
         run: |
           dotnet restore ./src/HealthChecks.Network/HealthChecks.Network.csproj &&
diff --git a/.github/workflows/healthchecks_npgsql_ci.yml b/.github/workflows/healthchecks_npgsql_ci.yml
@@ -44,9 +44,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
       - name: Restore
         run: |
           dotnet restore ./src/HealthChecks.NpgSql/HealthChecks.NpgSql.csproj &&
diff --git a/.github/workflows/healthchecks_openidconnectserver_ci.yml b/.github/workflows/healthchecks_openidconnectserver_ci.yml
@@ -41,9 +41,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
       - name: Restore
         run: |
           dotnet restore ./src/HealthChecks.OpenIdConnectServer/HealthChecks.OpenIdConnectServer.csproj &&
diff --git a/.github/workflows/healthchecks_oracle_ci.yml b/.github/workflows/healthchecks_oracle_ci.yml
@@ -43,9 +43,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
       - name: Restore
         run: |
           dotnet restore ./src/HealthChecks.Oracle/HealthChecks.Oracle.csproj &&
diff --git a/.github/workflows/healthchecks_publisher_cloudwatch_ci.yml b/.github/workflows/healthchecks_publisher_cloudwatch_ci.yml
@@ -38,9 +38,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
       - name: Restore
         run: |
           dotnet restore ./src/HealthChecks.Publisher.CloudWatch/HealthChecks.Publisher.CloudWatch.csproj &&
diff --git a/.github/workflows/healthchecks_qdrant_ci.yml b/.github/workflows/healthchecks_qdrant_ci.yml
@@ -43,9 +43,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
       - name: Restore
         run: |
           dotnet restore ./src/HealthChecks.Qdrant/HealthChecks.Qdrant.csproj &&          
diff --git a/.github/workflows/healthchecks_rabbitmq_ci.yml b/.github/workflows/healthchecks_rabbitmq_ci.yml
@@ -41,9 +41,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
       - name: Restore
         run: |
           dotnet restore ./src/HealthChecks.Rabbitmq/HealthChecks.Rabbitmq.csproj &&
diff --git a/.github/workflows/healthchecks_ravendb_ci.yml b/.github/workflows/healthchecks_ravendb_ci.yml
@@ -43,9 +43,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
       - name: Restore
         run: |
           dotnet restore ./src/HealthChecks.RavenDB/HealthChecks.RavenDB.csproj &&
diff --git a/.github/workflows/healthchecks_redis_ci.yml b/.github/workflows/healthchecks_redis_ci.yml
@@ -41,9 +41,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
       - name: Restore
         run: |
           dotnet restore ./src/HealthChecks.Redis/HealthChecks.Redis.csproj &&
diff --git a/.github/workflows/healthchecks_solr_ci.yml b/.github/workflows/healthchecks_solr_ci.yml
@@ -55,9 +55,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
       - name: Restore
         run: |
           dotnet restore ./src/HealthChecks.Solr/HealthChecks.Solr.csproj &&
diff --git a/.github/workflows/healthchecks_sqlserver_ci.yml b/.github/workflows/healthchecks_sqlserver_ci.yml
@@ -44,9 +44,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
       - name: Restore
         run: |
           dotnet restore ./src/HealthChecks.SqlServer/HealthChecks.SqlServer.csproj &&
diff --git a/.github/workflows/healthchecks_ui_cd.yml b/.github/workflows/healthchecks_ui_cd.yml
@@ -17,9 +17,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
       - name: Restore UI
         run: dotnet restore ./src/HealthChecks.UI/HealthChecks.UI.csproj
       - name: Restore UI.Client
diff --git a/.github/workflows/healthchecks_ui_cd_preview.yml b/.github/workflows/healthchecks_ui_cd_preview.yml
@@ -18,9 +18,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
       - name: Restore UI
         run: dotnet restore ./src/HealthChecks.UI/HealthChecks.UI.csproj
       - name: Restore UI.Client
diff --git a/.github/workflows/healthchecks_ui_ci.yml b/.github/workflows/healthchecks_ui_ci.yml
@@ -63,9 +63,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
       - name: Restore
         run: |
           dotnet restore ./src/HealthChecks.UI/HealthChecks.UI.csproj &&
diff --git a/.github/workflows/reusable_cd_preview_workflow.yml b/.github/workflows/reusable_cd_preview_workflow.yml
@@ -25,9 +25,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
       - name: Restore
         run: dotnet restore ${{inputs.PROJECT_PATH}}
       - name: Build
diff --git a/.github/workflows/reusable_cd_workflow.yml b/.github/workflows/reusable_cd_workflow.yml
@@ -22,9 +22,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
       - name: Restore
         run: dotnet restore ${{inputs.PROJECT_PATH}}
       - name: Build
diff --git a/.github/workflows/reusable_ci_workflow.yml b/.github/workflows/reusable_ci_workflow.yml
@@ -22,9 +22,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
       - name: Restore
         run: |
           dotnet restore ${{inputs.PROJECT_PATH}} &&
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -10,7 +10,7 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Nullable>enable</Nullable>
-    <NoWarn>$(NoWarn);1591;IDISP013;AD0001;</NoWarn> <!--TODO: temporary solution, remove AD0001 after https://github.com/dotnet/aspnetcore/issues/50836 fixed-->
+    <NoWarn>$(NoWarn);1591;IDISP013;</NoWarn>
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
   </PropertyGroup>
 
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -43,9 +43,8 @@
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.0" />
     <PackageVersion Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="6.0.21" Condition="'$(TargetFramework)' == 'net6.0'" />
-    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="7.0.10" Condition="'$(TargetFramework)' == 'net7.0'" />
-    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.0" Condition="'$(TargetFramework)' == 'net8.0'" />
+    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.11" Condition="'$(TargetFramework)' == 'net8.0'" />
+    <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.0" Condition="'$(TargetFramework)' == 'net9.0'" />
     <PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.46.0" />
     <PackageVersion Include="Microsoft.Azure.Devices" Version="1.40.0" />
     <PackageVersion Include="Microsoft.Azure.DocumentDB.Core" Version="2.20.0" />
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -20,7 +20,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <DefaultNetCoreApp>net6.0</DefaultNetCoreApp>
+    <DefaultNetCoreApp>net8.0</DefaultNetCoreApp>
     <DefaultLibraryTargetFrameworks>$(DefaultNetCoreApp);netstandard2.0</DefaultLibraryTargetFrameworks>
   </PropertyGroup>
   
diff --git a/src/HealthChecks.Dapr/HealthChecks.Dapr.csproj b/src/HealthChecks.Dapr/HealthChecks.Dapr.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFramework>$(DefaultNetCoreApp)</TargetFramework>
     <PackageTags>$(PackageTags);Dapr</PackageTags>
     <Description>HealthChecks.Dapr is the health check package for Dapr.</Description>
     <VersionPrefix>$(HealthCheckDapr)</VersionPrefix>
diff --git a/src/HealthChecks.EventStore.gRPC/HealthChecks.EventStore.gRPC.csproj b/src/HealthChecks.EventStore.gRPC/HealthChecks.EventStore.gRPC.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFramework>$(DefaultNetCoreApp)</TargetFramework>
     <PackageTags>$(PackageTags);EventStore;gRPC</PackageTags>
     <Description>HealthChecks.EventStore.gRPC is the health check package for EventStore, using the gRPC client.</Description>
     <VersionPrefix>$(HealthCheckEventStoregRPC)</VersionPrefix>
diff --git a/src/HealthChecks.Kubernetes/HealthChecks.Kubernetes.csproj b/src/HealthChecks.Kubernetes/HealthChecks.Kubernetes.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFramework>$(DefaultNetCoreApp)</TargetFramework>
     <PackageTags>$(PackageTags);Kubernetes;k8s;Cluster</PackageTags>
     <Description>HealthChecks.HealthChecks is the health check package for Kubernetes clusters.</Description>
     <VersionPrefix>$(HealthCheckKubernetes)</VersionPrefix>
diff --git a/src/HealthChecks.Network/HealthChecks.Network.csproj b/src/HealthChecks.Network/HealthChecks.Network.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>$(DefaultLibraryTargetFrameworks)</TargetFrameworks>
     <PackageTags>$(PackageTags);Network;Sftp;Ftp;Tcp;DNS</PackageTags>
     <Description>HealthChecks.Network is the health check package for network services.</Description>
     <VersionPrefix>$(HealthCheckNetwork)</VersionPrefix>
diff --git a/src/HealthChecks.NpgSql/HealthChecks.NpgSql.csproj b/src/HealthChecks.NpgSql/HealthChecks.NpgSql.csproj
diff --git a/src/HealthChecks.Prometheus.Metrics/HealthChecks.Prometheus.Metrics.csproj b/src/HealthChecks.Prometheus.Metrics/HealthChecks.Prometheus.Metrics.csproj
diff --git a/src/HealthChecks.Publisher.Prometheus/HealthChecks.Publisher.Prometheus.csproj b/src/HealthChecks.Publisher.Prometheus/HealthChecks.Publisher.Prometheus.csproj
diff --git a/src/HealthChecks.Publisher.Seq/HealthChecks.Publisher.Seq.csproj b/src/HealthChecks.Publisher.Seq/HealthChecks.Publisher.Seq.csproj
diff --git a/src/HealthChecks.UI.Client/HealthChecks.UI.Client.csproj b/src/HealthChecks.UI.Client/HealthChecks.UI.Client.csproj
diff --git a/src/HealthChecks.UI.Core/HealthChecks.UI.Core.csproj b/src/HealthChecks.UI.Core/HealthChecks.UI.Core.csproj
diff --git a/src/HealthChecks.UI.K8s.Operator/HealthChecks.UI.K8s.Operator.csproj b/src/HealthChecks.UI.K8s.Operator/HealthChecks.UI.K8s.Operator.csproj
diff --git a/src/HealthChecks.Uris/HealthChecks.Uris.csproj b/src/HealthChecks.Uris/HealthChecks.Uris.csproj
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
diff --git a/test/HealthChecks.Elasticsearch.Tests/HealthChecks.Elasticsearch.Tests.csproj b/test/HealthChecks.Elasticsearch.Tests/HealthChecks.Elasticsearch.Tests.csproj
diff --git a/test/HealthChecks.Elasticsearch.Tests/Resources/docker-compose.yml b/test/HealthChecks.Elasticsearch.Tests/Resources/docker-compose.yml
diff --git a/test/HealthChecks.UI.Client.Tests/HealthChecks.UI.Client.Tests.csproj b/test/HealthChecks.UI.Client.Tests/HealthChecks.UI.Client.Tests.csproj
diff --git a/test/HealthChecks.UI.Data.Tests/HealthChecks.UI.Data.Tests.csproj b/test/HealthChecks.UI.Data.Tests/HealthChecks.UI.Data.Tests.csproj
diff --git a/test/HealthChecks.UI.Tests/HealthChecks.UI.Tests.csproj b/test/HealthChecks.UI.Tests/HealthChecks.UI.Tests.csproj
diff --git a/test/HealthChecks.Uris.Tests/HealthChecks.Uris.Tests.csproj b/test/HealthChecks.Uris.Tests/HealthChecks.Uris.Tests.csproj
