Skip to content

Commit cddb8a9

Browse files
OsirisTerjeOsirisTerje
committed
Fix for issue #4887 
1 parent 6e14a0f commit cddb8a9

File tree

3 files changed

+58
-54
lines changed

3 files changed

+58
-54
lines changed

‎nuget/framework/nunit.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<group targetFramework="net462">
3636
<dependency id="System.Threading.Tasks.Extensions" version="4.5.4" exclude="Build,Analyzers" />
3737
<dependency id="System.ValueTuple" version="4.5.0" exclude="Build,Analyzers" />
38-
<dependency id="System.Memory" version="4.5.5" exclude="Build,Analyzers" />
38+
<dependency id="System.Memory" version="4.6.0" exclude="Build,Analyzers" />
3939
</group>
4040
<group targetFramework="net6.0" />
4141
</dependencies>

‎src/NUnitFramework/Directory.Packages.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<EnablePackageVersionOverride>false</EnablePackageVersionOverride>
55
</PropertyGroup>
66
<!-- Packages for used features -->
7-
<ItemGroup>
7+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
88
<PackageVersion Include="System.Collections.Immutable" Version="6.0.0" />
9-
<PackageVersion Include="System.Memory" Version="4.5.5" />
9+
<PackageVersion Include="System.Memory" Version="4.6.0" />
1010
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
1111
</ItemGroup>
1212
<!-- General Packages -->
@@ -41,6 +41,6 @@
4141
</ItemGroup>
4242
<!-- Explictily set the version of indirect referenced nuget packages -->
4343
<ItemGroup>
44-
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
44+
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0" />
4545
</ItemGroup>
4646
</Project>

‎src/NUnitFramework/tests/nunit.framework.tests.csproj

+54-50
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,60 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFrameworks>$(NUnitRuntimeFrameworks)</TargetFrameworks>
5-
<RootNamespace>NUnit.Framework.Tests</RootNamespace>
3+
<PropertyGroup>
4+
<TargetFrameworks>$(NUnitRuntimeFrameworks)</TargetFrameworks>
5+
<RootNamespace>NUnit.Framework.Tests</RootNamespace>
66

7-
<!-- Either NUnit or NUnitLite is not loading assemblies in a way that properly respects the
7+
<!-- Either NUnit or NUnitLite is not loading assemblies in a way that properly respects the
88
nunit.framework.tests.deps.json file. Maybe fixed by https://github.com/nunit/nunit/issues/3353? -->
9-
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
10-
<IsTestProject>true</IsTestProject>
11-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
12-
<NoWarn>1591,NU1029</NoWarn>
13-
<Title>NUnit Framework Tests</Title>
14-
</PropertyGroup>
15-
16-
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
17-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
18-
</ItemGroup>
19-
20-
<ItemGroup>
21-
<PackageReference Include="Microsoft.NET.Test.Sdk" />
22-
<PackageReference Include="NUnit3TestAdapter" />
23-
<PackageReference Include="NUnit.Analyzers" />
24-
<PackageReference Include="System.Collections.Immutable" />
25-
<PackageReference Include="System.ValueTuple" />
26-
</ItemGroup>
27-
28-
<ItemGroup>
29-
<ProjectReference Include="..\framework\nunit.framework.csproj" />
30-
<ProjectReference Include="..\slow-tests\slow-nunit-tests.csproj" />
31-
<ProjectReference Include="..\testdata\nunit.testdata.csproj" />
32-
<ProjectReference Include="..\mock-assembly\mock-assembly.csproj" />
33-
<ProjectReference Include="..\testdata.fsharp\nunit.testdata.fsharp.fsproj" />
34-
<ProjectReference Include="..\nunitlite-runner\nunitlite-runner.csproj" />
35-
</ItemGroup>
36-
37-
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
38-
<Reference Include="System.Web" />
39-
</ItemGroup>
40-
41-
<ItemGroup>
42-
<Compile Include="..\Fakes.cs" Link="TestUtilities\Fakes.cs" />
43-
<Compile Include="..\SchemaTestUtils.cs" Link="TestUtilities\SchemaTestUtils.cs" />
44-
<Compile Include="..\TestBuilder.cs" Link="TestUtilities\TestBuilder.cs" />
45-
<Compile Include="..\TestFile.cs" Link="TestUtilities\TestFile.cs" />
46-
<Compile Include="..\TestSuiteExtensions.cs" Link="TestUtilities\TestSuiteExtensions.cs" />
47-
48-
<EmbeddedResource Include="TestImage1.jpg" />
49-
<EmbeddedResource Include="TestImage2.jpg" />
50-
<EmbeddedResource Include="TestText1.txt" />
51-
<EmbeddedResource Include="TestText2.txt" />
52-
<EmbeddedResource Include="TestListFile.txt" />
53-
<EmbeddedResource Include="TestListFile2.txt" />
54-
</ItemGroup>
9+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
10+
<IsTestProject>true</IsTestProject>
11+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
12+
<NoWarn>1591,NU1029</NoWarn>
13+
<Title>NUnit Framework Tests</Title>
14+
</PropertyGroup>
15+
16+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
17+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
18+
</ItemGroup>
19+
20+
<ItemGroup>
21+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
22+
<PackageReference Include="NUnit3TestAdapter" />
23+
<PackageReference Include="NUnit.Analyzers" />
24+
25+
</ItemGroup>
26+
27+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
28+
<PackageReference Include="System.Collections.Immutable" />
29+
<PackageReference Include="System.ValueTuple" />
30+
</ItemGroup>
31+
32+
<ItemGroup>
33+
<ProjectReference Include="..\framework\nunit.framework.csproj" />
34+
<ProjectReference Include="..\slow-tests\slow-nunit-tests.csproj" />
35+
<ProjectReference Include="..\testdata\nunit.testdata.csproj" />
36+
<ProjectReference Include="..\mock-assembly\mock-assembly.csproj" />
37+
<ProjectReference Include="..\testdata.fsharp\nunit.testdata.fsharp.fsproj" />
38+
<ProjectReference Include="..\nunitlite-runner\nunitlite-runner.csproj" />
39+
</ItemGroup>
40+
41+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
42+
<Reference Include="System.Web" />
43+
</ItemGroup>
44+
45+
<ItemGroup>
46+
<Compile Include="..\Fakes.cs" Link="TestUtilities\Fakes.cs" />
47+
<Compile Include="..\SchemaTestUtils.cs" Link="TestUtilities\SchemaTestUtils.cs" />
48+
<Compile Include="..\TestBuilder.cs" Link="TestUtilities\TestBuilder.cs" />
49+
<Compile Include="..\TestFile.cs" Link="TestUtilities\TestFile.cs" />
50+
<Compile Include="..\TestSuiteExtensions.cs" Link="TestUtilities\TestSuiteExtensions.cs" />
51+
52+
<EmbeddedResource Include="TestImage1.jpg" />
53+
<EmbeddedResource Include="TestImage2.jpg" />
54+
<EmbeddedResource Include="TestText1.txt" />
55+
<EmbeddedResource Include="TestText2.txt" />
56+
<EmbeddedResource Include="TestListFile.txt" />
57+
<EmbeddedResource Include="TestListFile2.txt" />
58+
</ItemGroup>
5559

5660
</Project>

0 commit comments

Comments
 (0)