Update to .NET SDK 8 nullable annotations

xunit · Apr 26, 2024 · c637bf7 · c637bf7
1 parent 9a2bd7c
commit c637bf7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/Versions.props b/src/Versions.props
@@ -5,7 +5,7 @@
 
     <!-- Used for building -->
     <ILRepackVersion>2.0.27</ILRepackVersion>
-    <MicrosoftNetCoreAppRefVersion>6.0.25</MicrosoftNetCoreAppRefVersion>
+    <MicrosoftNetCoreAppRefVersion>8.0.4</MicrosoftNetCoreAppRefVersion>
     <MicrosoftNetFrameworkReferenceAssembliesVersion>1.0.3</MicrosoftNetFrameworkReferenceAssembliesVersion>
     <MicrosoftSourceLinkGitHubVersion>8.0.0</MicrosoftSourceLinkGitHubVersion>
     <NerdbankGitVersioningVersion>3.6.133</NerdbankGitVersioningVersion>

diff --git a/src/xunit.v3.assert.compat/Directory.Build.targets b/src/xunit.v3.assert.compat/Directory.Build.targets
@@ -6,6 +6,11 @@
     <When Condition=" '$(LangVersion)' == '9.0' ">
 
       <PropertyGroup>
+        <!--
+        This is stuck to version 6.0.25 of the reference libraries because of a bug in RAA that only seems
+        to surface with the nullable-mixed project.
+        -->
+        <AnnotatedReferenceAssemblyVersion>6.0.25</AnnotatedReferenceAssemblyVersion>
         <!-- On non-Windows, NuGet reports Microsoft.NETCore.App.Ref as being double-imported -->
         <NoWarn>$(NoWarn);NU1505</NoWarn>
       </PropertyGroup>
@@ -15,13 +20,9 @@
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
           <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageDownload Include="Microsoft.NETCore.App.Ref" Version="[$(MicrosoftNetCoreAppRefVersion)]" />
+        <PackageDownload Include="Microsoft.NETCore.App.Ref" Version="[6.0.25]" />
       </ItemGroup>
 
-      <PropertyGroup>
-        <AnnotatedReferenceAssemblyVersion>$(MicrosoftNetCoreAppRefVersion)</AnnotatedReferenceAssemblyVersion>
-      </PropertyGroup>
-
     </When>
   </Choose>