From 3519dfc7a786835f7acf4d4935069ff23b2a01a1 Mon Sep 17 00:00:00 2001
From: Will Sugarman <will.sugarman@microsoft.com>
Date: Thu, 4 Jan 2024 09:03:34 -0500
Subject: [PATCH] Update Pkgs for .NET 8 (#3278)

---
 Directory.Build.props                            | 13 +++++++++++++
 Directory.Packages.props                         | 16 ++++++++--------
 renovate.json                                    |  7 ++++++-
 .../Microsoft.Health.Dicom.WebUtilities.csproj   |  4 +++-
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index bde7401fb1..0fe72b6c9a 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -32,14 +32,27 @@
       <PropertyGroup>
         <DependencyInjectionVersion>6.0.1</DependencyInjectionVersion>
         <MediatRVersion>12.1.1</MediatRVersion>
+        <OTelVersion>1.6.0</OTelVersion>
         <SdkPackageVersion>6.0.0</SdkPackageVersion>
+        <WebUtilitiesVersion>2.2.0</WebUtilitiesVersion>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$(TargetFramework)' == 'netstandard2.0'">
+      <PropertyGroup>
+        <DependencyInjectionVersion>8.0.0</DependencyInjectionVersion>
+        <MediatRVersion>12.2.0</MediatRVersion>
+        <OTelVersion>1.7.0</OTelVersion>
+        <SdkPackageVersion>8.0.0</SdkPackageVersion>
+        <WebUtilitiesVersion>2.2.0</WebUtilitiesVersion>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
         <DependencyInjectionVersion>8.0.0</DependencyInjectionVersion>
         <MediatRVersion>12.2.0</MediatRVersion>
+        <OTelVersion>1.7.0</OTelVersion>
         <SdkPackageVersion>8.0.0</SdkPackageVersion>
+        <WebUtilitiesVersion>8.0.0</WebUtilitiesVersion>
       </PropertyGroup>
     </Otherwise>
   </Choose>
diff --git a/Directory.Packages.props b/Directory.Packages.props
index a1f6d52509..66e98919e4 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -10,9 +10,9 @@
     <PackageVersion Include="Azure.Storage.Queues" Version="12.17.1" />
     <PackageVersion Include="Azure.Storage.Common" Version="12.18.1" />
     <PackageVersion Include="Ensure.That" Version="10.1.0" />
-    <PackageVersion Include="fo-dicom" Version="5.1.1" />
+    <PackageVersion Include="fo-dicom" Version="5.1.2" />
     <PackageVersion Include="fo-dicom.Codecs" Version="5.11.0" />
-    <PackageVersion Include="fo-dicom.Imaging.ImageSharp" Version="5.1.0" />
+    <PackageVersion Include="fo-dicom.Imaging.ImageSharp" Version="5.1.2" />
     <PackageVersion Include="HashDepot" Version="3.1.0" />
     <PackageVersion Include="Hl7.Fhir.R4" Version="4.3.0" />
     <PackageVersion Include="Hl7.Fhir.Support" Version="4.3.0" />
@@ -29,7 +29,7 @@
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.1.0" />
     <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="$(SdkPackageVersion)" />
-    <PackageVersion Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.WebUtilities" Version="$(WebUtilitiesVersion)" />
     <PackageVersion Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
     <PackageVersion Include="Microsoft.Azure.ServiceBus" Version="5.2.0" />
     <PackageVersion Include="Microsoft.Azure.WebJobs" Version="3.0.39" />
@@ -91,10 +91,10 @@
     <PackageVersion Include="Microsoft.SqlServer.DACFx" Version="162.1.167" />
     <PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="17.8.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="OpenTelemetry" Version="1.6.0" />
-    <PackageVersion Include="OpenTelemetry.Api" Version="1.6.0" />
-    <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.6.0" />
-    <PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.6.0" />
+    <PackageVersion Include="OpenTelemetry" Version="$(OTelVersion)" />
+    <PackageVersion Include="OpenTelemetry.Api" Version="$(OTelVersion)" />
+    <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="$(OTelVersion)" />
+    <PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="$(OTelVersion)" />
     <PackageVersion Include="NSubstitute" Version="5.1.0" />
     <PackageVersion Include="Polly" Version="8.2.0" />
     <PackageVersion Include="Polly.Extensions.Http" Version="3.0.0" />
@@ -113,4 +113,4 @@
     <PackageVersion Include="xunit.assert" Version="2.6.4" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/renovate.json b/renovate.json
index 72b265d1d5..fcd164909e 100644
--- a/renovate.json
+++ b/renovate.json
@@ -27,6 +27,12 @@
         "mcr.microsoft.com/dotnet/sdk"
       ]
     },
+    {
+      "groupName": "fo-dicom",
+      "matchPackagePrefixes": [
+        "fo-dicom"
+      ]
+    },
     {
       "excludePackagePrefixes": [
         "Microsoft.Health.Fhir."
@@ -44,7 +50,6 @@
       ]
     },
     {
-      "allowedVersions": "<7.0.0",
       "groupName": "IdentityModel.Tokens",
       "matchPackagePatterns": [
         "IdentityModel.Tokens"
diff --git a/src/Microsoft.Health.Dicom.WebUtilities/Microsoft.Health.Dicom.WebUtilities.csproj b/src/Microsoft.Health.Dicom.WebUtilities/Microsoft.Health.Dicom.WebUtilities.csproj
index 59cf7874a3..d6b7f1ab7e 100644
--- a/src/Microsoft.Health.Dicom.WebUtilities/Microsoft.Health.Dicom.WebUtilities.csproj
+++ b/src/Microsoft.Health.Dicom.WebUtilities/Microsoft.Health.Dicom.WebUtilities.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>$(LibraryFrameworks)</TargetFrameworks>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
@@ -11,4 +12,5 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities"/>
   </ItemGroup>
+
 </Project>