Fix for issue #4887

nunit · Nov 25, 2024 · cddb8a9 · cddb8a9
1 parent 6e14a0f
commit cddb8a9
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 54 deletions.
diff --git a/nuget/framework/nunit.nuspec b/nuget/framework/nunit.nuspec
@@ -35,7 +35,7 @@
             <group targetFramework="net462">
                 <dependency id="System.Threading.Tasks.Extensions" version="4.5.4" exclude="Build,Analyzers" />
                 <dependency id="System.ValueTuple" version="4.5.0" exclude="Build,Analyzers" />
-                <dependency id="System.Memory" version="4.5.5" exclude="Build,Analyzers" />
+                <dependency id="System.Memory" version="4.6.0" exclude="Build,Analyzers" />
             </group>
             <group targetFramework="net6.0" />
         </dependencies>

diff --git a/src/NUnitFramework/Directory.Packages.props b/src/NUnitFramework/Directory.Packages.props
@@ -4,9 +4,9 @@
     <EnablePackageVersionOverride>false</EnablePackageVersionOverride>
   </PropertyGroup>
   <!-- Packages for used features -->
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
     <PackageVersion Include="System.Collections.Immutable" Version="6.0.0" />
-    <PackageVersion Include="System.Memory" Version="4.5.5" />
+    <PackageVersion Include="System.Memory" Version="4.6.0" />
     <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
   <!-- General Packages -->
@@ -41,6 +41,6 @@
   </ItemGroup>
   <!-- Explictily set the version of indirect referenced nuget packages -->
   <ItemGroup>
-    <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
+    <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0" />
   </ItemGroup>
 </Project>
diff --git a/src/NUnitFramework/tests/nunit.framework.tests.csproj b/src/NUnitFramework/tests/nunit.framework.tests.csproj
@@ -1,56 +1,60 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFrameworks>$(NUnitRuntimeFrameworks)</TargetFrameworks>
-    <RootNamespace>NUnit.Framework.Tests</RootNamespace>
+    <PropertyGroup>
+        <TargetFrameworks>$(NUnitRuntimeFrameworks)</TargetFrameworks>
+        <RootNamespace>NUnit.Framework.Tests</RootNamespace>
 
-    <!-- Either NUnit or NUnitLite is not loading assemblies in a way that properly respects the
+        <!-- Either NUnit or NUnitLite is not loading assemblies in a way that properly respects the
     nunit.framework.tests.deps.json file. Maybe fixed by https://github.com/nunit/nunit/issues/3353? -->
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <IsTestProject>true</IsTestProject>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <NoWarn>1591,NU1029</NoWarn>
-    <Title>NUnit Framework Tests</Title>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="NUnit3TestAdapter" />
-    <PackageReference Include="NUnit.Analyzers" />
-    <PackageReference Include="System.Collections.Immutable" />
-    <PackageReference Include="System.ValueTuple" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\framework\nunit.framework.csproj" />
-    <ProjectReference Include="..\slow-tests\slow-nunit-tests.csproj" />
-    <ProjectReference Include="..\testdata\nunit.testdata.csproj" />
-    <ProjectReference Include="..\mock-assembly\mock-assembly.csproj" />
-    <ProjectReference Include="..\testdata.fsharp\nunit.testdata.fsharp.fsproj" />
-    <ProjectReference Include="..\nunitlite-runner\nunitlite-runner.csproj" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
-    <Reference Include="System.Web" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Include="..\Fakes.cs" Link="TestUtilities\Fakes.cs" />
-    <Compile Include="..\SchemaTestUtils.cs" Link="TestUtilities\SchemaTestUtils.cs" />
-    <Compile Include="..\TestBuilder.cs" Link="TestUtilities\TestBuilder.cs" />
-    <Compile Include="..\TestFile.cs" Link="TestUtilities\TestFile.cs" />
-    <Compile Include="..\TestSuiteExtensions.cs" Link="TestUtilities\TestSuiteExtensions.cs" />
-
-    <EmbeddedResource Include="TestImage1.jpg" />
-    <EmbeddedResource Include="TestImage2.jpg" />
-    <EmbeddedResource Include="TestText1.txt" />
-    <EmbeddedResource Include="TestText2.txt" />
-    <EmbeddedResource Include="TestListFile.txt" />
-    <EmbeddedResource Include="TestListFile2.txt" />
-  </ItemGroup>
+        <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+        <IsTestProject>true</IsTestProject>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <NoWarn>1591,NU1029</NoWarn>
+        <Title>NUnit Framework Tests</Title>
+    </PropertyGroup>
+
+    <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
+        <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" />
+        <PackageReference Include="NUnit3TestAdapter" />
+        <PackageReference Include="NUnit.Analyzers" />
+
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
+        <PackageReference Include="System.Collections.Immutable" />
+        <PackageReference Include="System.ValueTuple" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\framework\nunit.framework.csproj" />
+        <ProjectReference Include="..\slow-tests\slow-nunit-tests.csproj" />
+        <ProjectReference Include="..\testdata\nunit.testdata.csproj" />
+        <ProjectReference Include="..\mock-assembly\mock-assembly.csproj" />
+        <ProjectReference Include="..\testdata.fsharp\nunit.testdata.fsharp.fsproj" />
+        <ProjectReference Include="..\nunitlite-runner\nunitlite-runner.csproj" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
+        <Reference Include="System.Web" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <Compile Include="..\Fakes.cs" Link="TestUtilities\Fakes.cs" />
+        <Compile Include="..\SchemaTestUtils.cs" Link="TestUtilities\SchemaTestUtils.cs" />
+        <Compile Include="..\TestBuilder.cs" Link="TestUtilities\TestBuilder.cs" />
+        <Compile Include="..\TestFile.cs" Link="TestUtilities\TestFile.cs" />
+        <Compile Include="..\TestSuiteExtensions.cs" Link="TestUtilities\TestSuiteExtensions.cs" />
+
+        <EmbeddedResource Include="TestImage1.jpg" />
+        <EmbeddedResource Include="TestImage2.jpg" />
+        <EmbeddedResource Include="TestText1.txt" />
+        <EmbeddedResource Include="TestText2.txt" />
+        <EmbeddedResource Include="TestListFile.txt" />
+        <EmbeddedResource Include="TestListFile2.txt" />
+    </ItemGroup>
 
 </Project>