From b6c3109746f6b3dc2ddee479619671027711228d Mon Sep 17 00:00:00 2001
From: martincostello <martin@martincostello.com>
Date: Wed, 28 Feb 2024 14:49:59 +0000
Subject: [PATCH] Update to .NET 9 preview 1

Update to preview 1 of .NET 9.
---
 Directory.Build.props                                    | 1 +
 Directory.Packages.props                                 | 4 ++--
 build.ps1                                                | 1 -
 global.json                                              | 2 +-
 src/JustEat.StatsD/JustEat.StatsD.csproj                 | 6 +-----
 tests/Benchmark/Benchmark.csproj                         | 2 +-
 tests/JustEat.StatsD.Tests/Extensions/TimingConstants.cs | 2 +-
 tests/JustEat.StatsD.Tests/JustEat.StatsD.Tests.csproj   | 2 +-
 8 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 624a5346..81c19d27 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -20,6 +20,7 @@
     <LangVersion>10</LangVersion>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <NeutralLanguage>en-US</NeutralLanguage>
+    <NoWarn>$(NoWarn);CA1515</NoWarn>
     <Nullable>enable</Nullable>
     <PackageIcon>package-icon.png</PackageIcon>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 5aca9b25..81300cf3 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -25,8 +25,8 @@
     <PackageVersion Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
   </ItemGroup>
   <ItemGroup Condition=" '$(AssemblyName)' != 'JustEat.StatsD' ">
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageVersion Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0-preview.1.24080.9" />
+    <PackageVersion Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0-preview.1.24080.9" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="coverlet.msbuild" PrivateAssets="All" />
diff --git a/build.ps1 b/build.ps1
index 5233f542..a9b9cbb6 100755
--- a/build.ps1
+++ b/build.ps1
@@ -9,7 +9,6 @@ param(
 
 $ErrorActionPreference = "Stop"
 $ProgressPreference = "SilentlyContinue"
-$env:MSBUILDTERMINALLOGGER = "auto"
 
 $solutionPath = $PSScriptRoot
 $sdkFile = Join-Path $solutionPath "global.json"
diff --git a/global.json b/global.json
index 36dbe490..b207f0ea 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.204",
+    "version": "9.0.100-preview.1.24101.2",
     "allowPrerelease": false,
     "rollForward": "latestMajor"
   }
diff --git a/src/JustEat.StatsD/JustEat.StatsD.csproj b/src/JustEat.StatsD/JustEat.StatsD.csproj
index 1ae8a6ae..2df56b44 100644
--- a/src/JustEat.StatsD/JustEat.StatsD.csproj
+++ b/src/JustEat.StatsD/JustEat.StatsD.csproj
@@ -24,11 +24,7 @@
     <AdditionalFiles Include="PublicAPI.Shipped.txt" />
     <AdditionalFiles Include="PublicAPI.Unshipped.txt" />
   </ItemGroup>
-  <PropertyGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0')) ">
-    <EnableAotAnalyzer>true</EnableAotAnalyzer>
-    <EnableSingleFileAnalyzer>true</EnableSingleFileAnalyzer>
-    <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+  <PropertyGroup Condition=" $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0')) ">
     <IsAotCompatible>true</IsAotCompatible>
-    <IsTrimmable>true</IsTrimmable>
   </PropertyGroup>
 </Project>
diff --git a/tests/Benchmark/Benchmark.csproj b/tests/Benchmark/Benchmark.csproj
index 8d1d61fe..d182500d 100644
--- a/tests/Benchmark/Benchmark.csproj
+++ b/tests/Benchmark/Benchmark.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <NoWarn>$(NoWarn);CA1001;CA1014;CA1812;CA1822</NoWarn>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
diff --git a/tests/JustEat.StatsD.Tests/Extensions/TimingConstants.cs b/tests/JustEat.StatsD.Tests/Extensions/TimingConstants.cs
index 300cd84d..4bddda5c 100644
--- a/tests/JustEat.StatsD.Tests/Extensions/TimingConstants.cs
+++ b/tests/JustEat.StatsD.Tests/Extensions/TimingConstants.cs
@@ -5,5 +5,5 @@ public static class TimingConstants
     public const int DelayMilliseconds = 500;
 
     public static readonly TimeSpan DeltaFast = TimeSpan.FromMilliseconds(DelayMilliseconds / 4);
-    public static readonly TimeSpan DeltaSlow = TimeSpan.FromMilliseconds(DelayMilliseconds * 3);
+    public static readonly TimeSpan DeltaSlow = TimeSpan.FromMilliseconds(DelayMilliseconds * 4);
 }
diff --git a/tests/JustEat.StatsD.Tests/JustEat.StatsD.Tests.csproj b/tests/JustEat.StatsD.Tests/JustEat.StatsD.Tests.csproj
index fb2be7c7..0ee24af6 100644
--- a/tests/JustEat.StatsD.Tests/JustEat.StatsD.Tests.csproj
+++ b/tests/JustEat.StatsD.Tests/JustEat.StatsD.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <NoWarn>$(NoWarn);CA1014;CA1002;CA1861;CA1707;CA1711;CA2007</NoWarn>
     <RootNamespace>JustEat.StatsD</RootNamespace>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\JustEat.StatsD\JustEat.StatsD.csproj" />