From 8dfecc988215bb8590b723f6891cb8610aefca0a Mon Sep 17 00:00:00 2001
From: Keith Cully <2370032+K-Cully@users.noreply.github.com>
Date: Tue, 9 Jan 2024 16:41:37 +0000
Subject: [PATCH] Remove .NET7 Support (#647)

* Remove Net7 target and package refs

* Remove temporary SDK install steps
---
 .github/pipelines/dotnet-initialize.yml |  4 ----
 .github/pipelines/github-semmle.yml     |  4 ----
 Directory.Build.props                   |  2 +-
 Directory.Packages.props                | 23 +----------------------
 4 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/.github/pipelines/dotnet-initialize.yml b/.github/pipelines/dotnet-initialize.yml
index f776f2cb..bfc7d55c 100644
--- a/.github/pipelines/dotnet-initialize.yml
+++ b/.github/pipelines/dotnet-initialize.yml
@@ -10,10 +10,6 @@ parameters:
 steps:
   - task: NuGetAuthenticate@1
     displayName: NuGet Authenticate
-  - task: UseDotNet@2
-    displayName: Temporarily install .NET 7 SDK while dual targeting
-    inputs:
-      version: "7.0.404"
   - task: UseDotNet@2
     displayName: Use .NET SDK from global.json
     inputs:
diff --git a/.github/pipelines/github-semmle.yml b/.github/pipelines/github-semmle.yml
index 6d59a224..210335b3 100644
--- a/.github/pipelines/github-semmle.yml
+++ b/.github/pipelines/github-semmle.yml
@@ -35,10 +35,6 @@ extends:
             steps:
               - checkout: self
                 clean: true
-              - task: UseDotNet@2
-                displayName: Temporarily install .NET 7 SDK while dual targeting
-                inputs:
-                  version: "7.0.404"
               - task: UseDotNet@2
                 displayName: Use .NET SDK from global.json
                 inputs:
diff --git a/Directory.Build.props b/Directory.Build.props
index 69cc1398..0a6bec8b 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -5,7 +5,7 @@
 
   <PropertyGroup Label="Target Platforms" >
     <LatestSupportedDotNetVersion>net8.0</LatestSupportedDotNetVersion>
-    <OldestSupportedDotNetVersion>net7.0</OldestSupportedDotNetVersion>
+    <OldestSupportedDotNetVersion>net8.0</OldestSupportedDotNetVersion>
     <NetCoreVersions>$(LatestSupportedDotNetVersion)</NetCoreVersions>
     <NetCoreVersions Condition="'$(LatestSupportedDotNetVersion)' != '$(OldestSupportedDotNetVersion)'">$(LatestSupportedDotNetVersion);$(OldestSupportedDotNetVersion)</NetCoreVersions>
     <NetStandardVersions>netstandard2.0</NetStandardVersions>
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 8c981a06..8c644068 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -4,7 +4,7 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
-  <ItemGroup Label="DotNet Package Versions. AutoUpdate" Condition="'$(TargetFramework)' == '$(LatestSupportedDotNetVersion)' OR '$(IsNetStandard)'">
+  <ItemGroup Label="DotNet Package Versions. AutoUpdate">
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
@@ -25,27 +25,6 @@
     <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
     <PackageVersion Include="System.Text.Json" Version="8.0.0" />
   </ItemGroup>
-  <ItemGroup Label="DotNet Package Versions." Condition="'$(TargetFramework)' == '$(OldestSupportedDotNetVersion)'">
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="7.0.14" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Http" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="7.0.14" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="7.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.1.1" />
-    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
-    <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" />
-    <PackageVersion Include="System.Text.Json" Version="7.0.4" />
-  </ItemGroup>
   <ItemGroup Label="Package Versions. AutoUpdate">
     <PackageVersion Include="MSTest.TestAdapter" Version="3.1.1" />
     <PackageVersion Include="MSTest.TestFramework" Version="3.1.1" />