Skip to content

Commit

Permalink
Merge pull request #6147 from dnnsoftware/dependabot/nuget/NUnit-4.2.2
Browse files Browse the repository at this point in the history 
Bump NUnit from 3.13.3 to 4.2.2
  • Loading branch information
@valadas
valadas authored Oct 15, 2024
2 parents 707c853 + a662d24 commit ea58e77
Show file tree
Hide file tree
Showing 210 changed files with 7,264 additions and 6,022 deletions.
6 changes: 5 additions & 1 deletion DNN Platform/Tests/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NSubstitute" publicKeyToken="92dd2e9066daa5ca" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Fare" publicKeyToken="ea68d375bf33a7c8" culture="neutral" />
Expand All @@ -247,6 +247,10 @@
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="nunit.framework" publicKeyToken="2638cd05610744eb" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.14.0.0" newVersion="3.14.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<dotnetnuke>
Expand Down
29 changes: 23 additions & 6 deletions DNN Platform/Tests/DNN.Integration.Test.Framework/DNN.Integration.Test.Framework.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\..\packages\NUnit.4.2.2\build\NUnit.props" Condition="Exists('..\..\..\packages\NUnit.4.2.2\build\NUnit.props')" />
<Import Project="..\..\..\packages\NUnit3TestAdapter.4.6.0\build\net462\NUnit3TestAdapter.props" Condition="Exists('..\..\..\packages\NUnit3TestAdapter.4.6.0\build\net462\NUnit3TestAdapter.props')" />
<Import Project="..\..\..\packages\Microsoft.SourceLink.GitHub.8.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\..\packages\Microsoft.SourceLink.GitHub.8.0.0\build\Microsoft.SourceLink.GitHub.props')" />
<Import Project="..\..\..\packages\Microsoft.SourceLink.Common.8.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\..\packages\Microsoft.SourceLink.Common.8.0.0\build\Microsoft.SourceLink.Common.props')" />
<Import Project="..\..\..\packages\Microsoft.Build.Tasks.Git.8.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\..\packages\Microsoft.Build.Tasks.Git.8.0.0\build\Microsoft.Build.Tasks.Git.props')" />
<Import Project="..\..\..\packages\NUnit3TestAdapter.4.5.0\build\net462\NUnit3TestAdapter.props" Condition="Exists('..\..\..\packages\NUnit3TestAdapter.4.5.0\build\net462\NUnit3TestAdapter.props')" />
<Import Project="..\..\..\packages\NUnit.3.13.3\build\NUnit.props" Condition="Exists('..\..\..\packages\NUnit.3.13.3\build\NUnit.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -56,21 +56,37 @@
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=3.13.3.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll</HintPath>
<Reference Include="nunit.framework, Version=4.2.2.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\NUnit.4.2.2\lib\net462\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="nunit.framework.legacy, Version=4.2.2.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\NUnit.4.2.2\lib\net462\nunit.framework.legacy.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http.Formatting, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.9\lib\net45\System.Net.Http.Formatting.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="System.Web" />
<Reference Include="System.Web.Http, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.9\lib\net45\System.Web.Http.dll</HintPath>
Expand Down Expand Up @@ -137,6 +153,7 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\..\..\packages\NUnit.Analyzers.4.3.0\analyzers\dotnet\cs\nunit.analyzers.dll" />
<Analyzer Include="..\..\..\packages\StyleCop.Analyzers.1.1.118\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
<Analyzer Include="..\..\..\packages\StyleCop.Analyzers.1.1.118\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
</ItemGroup>
Expand All @@ -145,14 +162,14 @@
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\..\packages\NUnit.3.13.3\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\NUnit.3.13.3\build\NUnit.props'))" />
<Error Condition="!Exists('..\..\..\packages\NUnit3TestAdapter.4.5.0\build\net462\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\NUnit3TestAdapter.4.5.0\build\net462\NUnit3TestAdapter.props'))" />
<Error Condition="!Exists('..\..\..\packages\Microsoft.Build.Tasks.Git.8.0.0\build\Microsoft.Build.Tasks.Git.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Build.Tasks.Git.8.0.0\build\Microsoft.Build.Tasks.Git.props'))" />
<Error Condition="!Exists('..\..\..\packages\Microsoft.Build.Tasks.Git.8.0.0\build\Microsoft.Build.Tasks.Git.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Build.Tasks.Git.8.0.0\build\Microsoft.Build.Tasks.Git.targets'))" />
<Error Condition="!Exists('..\..\..\packages\Microsoft.SourceLink.Common.8.0.0\build\Microsoft.SourceLink.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.SourceLink.Common.8.0.0\build\Microsoft.SourceLink.Common.props'))" />
<Error Condition="!Exists('..\..\..\packages\Microsoft.SourceLink.Common.8.0.0\build\Microsoft.SourceLink.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.SourceLink.Common.8.0.0\build\Microsoft.SourceLink.Common.targets'))" />
<Error Condition="!Exists('..\..\..\packages\Microsoft.SourceLink.GitHub.8.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.SourceLink.GitHub.8.0.0\build\Microsoft.SourceLink.GitHub.props'))" />
<Error Condition="!Exists('..\..\..\packages\Microsoft.SourceLink.GitHub.8.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.SourceLink.GitHub.8.0.0\build\Microsoft.SourceLink.GitHub.targets'))" />
<Error Condition="!Exists('..\..\..\packages\NUnit3TestAdapter.4.6.0\build\net462\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\NUnit3TestAdapter.4.6.0\build\net462\NUnit3TestAdapter.props'))" />
<Error Condition="!Exists('..\..\..\packages\NUnit.4.2.2\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\NUnit.4.2.2\build\NUnit.props'))" />
</Target>
<Import Project="..\..\..\packages\Microsoft.Build.Tasks.Git.8.0.0\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('..\..\..\packages\Microsoft.Build.Tasks.Git.8.0.0\build\Microsoft.Build.Tasks.Git.targets')" />
<Import Project="..\..\..\packages\Microsoft.SourceLink.Common.8.0.0\build\Microsoft.SourceLink.Common.targets" Condition="Exists('..\..\..\packages\Microsoft.SourceLink.Common.8.0.0\build\Microsoft.SourceLink.Common.targets')" />
Expand Down
6 changes: 3 additions & 3 deletions DNN Platform/Tests/DNN.Integration.Test.Framework/Helpers/WebApiTestHelper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public static IWebApiConnector LoginRegisteredUser(string firstName = Integratio
if (!connector.IsLoggedIn)
{
var loggedIn = connector.Login(AppConfigHelper.HostPassword);
Assert.IsTrue(loggedIn);
Assert.That(loggedIn, Is.True);
}

return connector;
Expand Down Expand Up @@ -159,7 +159,7 @@ public static IWebApiConnector LoginAdministrator(string firstName = Integration
if (!connector.IsLoggedIn)
{
var loggedIn = connector.Login(AppConfigHelper.HostPassword);
Assert.IsTrue(loggedIn);
Assert.That(loggedIn, Is.True);
}

return connector;
Expand Down Expand Up @@ -188,7 +188,7 @@ public static IWebApiConnector LoginUser(string username, string url = null)
if (!connector.IsLoggedIn)
{
var loggedIn = connector.Login(AppConfigHelper.HostPassword);
Assert.IsTrue(loggedIn);
Assert.That(loggedIn, Is.True);
}

return connector;
Expand Down
9 changes: 7 additions & 2 deletions DNN Platform/Tests/DNN.Integration.Test.Framework/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,14 @@
<package id="Microsoft.SourceLink.GitHub" version="8.0.0" targetFramework="net472" developmentDependency="true" />
<package id="Moq" version="4.20.70" targetFramework="net472" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
<package id="NUnit" version="3.13.3" targetFramework="net472" />
<package id="NUnit3TestAdapter" version="4.5.0" targetFramework="net472" />
<package id="NUnit" version="4.2.2" targetFramework="net472" />
<package id="NUnit.Analyzers" version="4.3.0" targetFramework="net472" developmentDependency="true" />
<package id="NUnit3TestAdapter" version="4.6.0" targetFramework="net472" />
<package id="StyleCop.Analyzers" version="1.1.118" targetFramework="net472" developmentDependency="true" />
<package id="System.Buffers" version="4.5.1" targetFramework="net472" />
<package id="System.Memory" version="4.5.5" targetFramework="net472" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
</packages>
4 changes: 4 additions & 0 deletions DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="nunit.framework" publicKeyToken="2638cd05610744eb" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.14.0.0" newVersion="3.14.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
32 changes: 16 additions & 16 deletions DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/AspNetClientCapabilityTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public void AspNetClientCapability_IsMobile_Returns_True_For_BlackBerry9105V1()
var bIsMobile = clientCapability.IsMobile;

// Assert
Assert.IsTrue(bIsMobile);
Assert.That(bIsMobile, Is.True);
}

[Test]
Expand All @@ -76,7 +76,7 @@ public void AspNetClientCapability_IsMobile_Returns_True_For_IPhone()
var bIsMobile = clientCapability.IsMobile;

// Assert
Assert.IsTrue(bIsMobile);
Assert.That(bIsMobile, Is.True);
}

[Test]
Expand All @@ -89,7 +89,7 @@ public void AspNetClientCapability_IsMobile_Returns_True_For_WP7()
var bIsMobile = clientCapability.IsMobile;

// Assert
Assert.IsTrue(bIsMobile);
Assert.That(bIsMobile, Is.True);
}

[Test]
Expand All @@ -102,7 +102,7 @@ public void AspNetClientCapability_IsMobile_Returns_True_For_IPad()
var bIsMobile = clientCapability.IsMobile;

// Assert
Assert.IsTrue(bIsMobile);
Assert.That(bIsMobile, Is.True);
}

[Test]
Expand All @@ -120,7 +120,7 @@ public void AspNetClientCapability_IsMobile_Returns_True_For_SamsungGalaxyGTP100
var isMobile = clientCapability.IsMobile;

// Assert
Assert.IsTrue(isMobile);
Assert.That(isMobile, Is.True);
}

[Test]
Expand All @@ -133,7 +133,7 @@ public void AspNetClientCapability_IsMobile_Returns_False_For_EmptyUserAgent()
var bIsMmobile = clientCapability.IsMobile;

// Assert
Assert.IsFalse(bIsMmobile);
Assert.That(bIsMmobile, Is.False);
}

[Test]
Expand All @@ -147,7 +147,7 @@ public void AspNetClientCapability_IsMobile_Returns_False_For_NullUserAgent()
var bIsMobile = AspNetClientCapability.IsMobile;

// Assert
Assert.IsFalse(bIsMobile);
Assert.That(bIsMobile, Is.False);
}

[Test]
Expand All @@ -160,7 +160,7 @@ public void AspNetClientCapability_IsMobile_Returns_True_For_HTCDesireVer1Sub22(
var bIsMobile = AspNetClientCapability.IsMobile;

// Assert
Assert.IsTrue(bIsMobile);
Assert.That(bIsMobile, Is.True);
}

[Test]
Expand All @@ -173,7 +173,7 @@ public void AspNetClientCapability_IsMobile_Returns_False_For_InternetExplorer8(
var bIsMobile = AspNetClientCapability.IsMobile;

// Assert
Assert.IsFalse(bIsMobile);
Assert.That(bIsMobile, Is.False);
}

[Test]
Expand All @@ -186,7 +186,7 @@ public void AspNetClientCapability_IsMobile_Returns_False_For_InternetExplorer9(
var bIsMobile = AspNetClientCapability.IsMobile;

// Assert
Assert.IsFalse(bIsMobile);
Assert.That(bIsMobile, Is.False);
}

[Test]
Expand All @@ -199,7 +199,7 @@ public void AspNetClientCapability_IsMobile_Returns_False_For_InternetExplorer10
var bIsMobile = AspNetClientCapability.IsMobile;

// Assert
Assert.IsFalse(bIsMobile);
Assert.That(bIsMobile, Is.False);
}

[Test]
Expand All @@ -212,7 +212,7 @@ public void AspNetClientCapability_IsMobile_Returns_False_For_FireFox()
var bIsMobile = AspNetClientCapability.IsMobile;

// Assert
Assert.IsFalse(bIsMobile);
Assert.That(bIsMobile, Is.False);
}

[Test]
Expand All @@ -225,7 +225,7 @@ public void AspNetClientCapability_IsTablet_Returns_False_For_IPhone()
var bIsTablet = clientCapability.IsTablet;

// Assert
Assert.IsFalse(bIsTablet);
Assert.That(bIsTablet, Is.False);
}

[Test]
Expand All @@ -238,7 +238,7 @@ public void AspNetClientCapability_IsTablet_Returns_True_For_PCTablet()
var bIsTablet = clientCapability.IsTablet;

// Assert
Assert.IsTrue(bIsTablet);
Assert.That(bIsTablet, Is.True);
}

[Test]
Expand All @@ -251,7 +251,7 @@ public void AspNetClientCapability_SupportsFlash_Returns_True_For_HTCDesireVer1S
var bSupportsFlash = clientCapability.SupportsFlash;

// Assert
Assert.IsFalse(bSupportsFlash);
Assert.That(bSupportsFlash, Is.False);
}

[Test]
Expand All @@ -264,7 +264,7 @@ public void AspNetClientCapability_SupportsFlash_Returns_False_For_WindowsPhone7
var bIsTablet = clientCapability.IsTablet;

// Assert
Assert.IsFalse(bIsTablet);
Assert.That(bIsTablet, Is.False);
}
}
}
Loading

0 comments on commit ea58e77

Please sign in to comment.