[smuxi/stable: 11/15] Build: use NUnit 2.6.1 via Nuget in Visual Studio project files




commit d532a4785b0b71844cb4c795c4e45146b1464893
Author: Mirco Bauer <meebey meebey net>
Date:   Sun Jun 14 23:19:03 2020 +0800

    Build: use NUnit 2.6.1 via Nuget in Visual Studio project files
    
    Mono 5.18 deprecated Nunit 2.4 as part of the Mono BCL. Nuget doesn't provide
    version 2.4 but 2.6.x

 src/Common-Tests/Common-Tests.csproj                 | 14 +++++---------
 src/Common-Tests/packages.config                     |  4 ++++
 src/Engine-Tests/Engine-Tests.csproj                 | 16 ++++++----------
 src/Engine-Tests/packages.config                     |  4 ++++
 src/Frontend-GNOME-Tests/Frontend-GNOME-Tests.csproj | 14 +++++---------
 src/Frontend-GNOME-Tests/packages.config             |  4 ++++
 src/Frontend-STFL-Tests/Frontend-STFL-Tests.csproj   |  9 +++++----
 src/Frontend-Tests/Frontend-Tests.csproj             | 14 +++++---------
 src/Frontend-Tests/packages.config                   |  4 ++++
 9 files changed, 42 insertions(+), 41 deletions(-)
---
diff --git a/src/Common-Tests/Common-Tests.csproj b/src/Common-Tests/Common-Tests.csproj
index bda7b1cf..ffabe82d 100644
--- a/src/Common-Tests/Common-Tests.csproj
+++ b/src/Common-Tests/Common-Tests.csproj
@@ -42,15 +42,8 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="nunit.core, Version=2.4.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-      <Package>nunit</Package>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.4.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-      <Package>nunit</Package>
+    <Reference Include="nunit.framework">
+      <HintPath>..\..\packages\NUnit.2.6.1\lib\nunit.framework.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -59,5 +52,8 @@
       <Name>Common</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/Common-Tests/packages.config b/src/Common-Tests/packages.config
new file mode 100644
index 00000000..f0fb6d27
--- /dev/null
+++ b/src/Common-Tests/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit" version="2.6.1" targetFramework="net45" />
+</packages>
\ No newline at end of file
diff --git a/src/Engine-Tests/Engine-Tests.csproj b/src/Engine-Tests/Engine-Tests.csproj
index 22263841..b5c7cad3 100644
--- a/src/Engine-Tests/Engine-Tests.csproj
+++ b/src/Engine-Tests/Engine-Tests.csproj
@@ -49,19 +49,12 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="nunit.core, Version=2.4.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-      <Package>nunit</Package>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.4.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-      <Package>nunit</Package>
-    </Reference>
     <Reference Include="log4net">
       <HintPath>..\..\lib\log4net.dll</HintPath>
     </Reference>
+    <Reference Include="nunit.framework">
+      <HintPath>..\..\packages\NUnit.2.6.1\lib\nunit.framework.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Engine\Engine.csproj">
@@ -81,5 +74,8 @@
       <Name>Newtonsoft.Json</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/src/Engine-Tests/packages.config b/src/Engine-Tests/packages.config
new file mode 100644
index 00000000..f0fb6d27
--- /dev/null
+++ b/src/Engine-Tests/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit" version="2.6.1" targetFramework="net45" />
+</packages>
\ No newline at end of file
diff --git a/src/Frontend-GNOME-Tests/Frontend-GNOME-Tests.csproj 
b/src/Frontend-GNOME-Tests/Frontend-GNOME-Tests.csproj
index ba905df9..0dbbe2a8 100644
--- a/src/Frontend-GNOME-Tests/Frontend-GNOME-Tests.csproj
+++ b/src/Frontend-GNOME-Tests/Frontend-GNOME-Tests.csproj
@@ -34,15 +34,8 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="nunit.core, Version=2.4.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-      <Package>nunit</Package>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.4.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-      <Package>nunit</Package>
+    <Reference Include="nunit.framework">
+      <HintPath>..\..\packages\NUnit.2.6.1\lib\nunit.framework.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -55,5 +48,8 @@
       <Name>Engine</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/Frontend-GNOME-Tests/packages.config b/src/Frontend-GNOME-Tests/packages.config
new file mode 100644
index 00000000..f0fb6d27
--- /dev/null
+++ b/src/Frontend-GNOME-Tests/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit" version="2.6.1" targetFramework="net45" />
+</packages>
\ No newline at end of file
diff --git a/src/Frontend-STFL-Tests/Frontend-STFL-Tests.csproj 
b/src/Frontend-STFL-Tests/Frontend-STFL-Tests.csproj
index 7d49ef41..5b710fa8 100644
--- a/src/Frontend-STFL-Tests/Frontend-STFL-Tests.csproj
+++ b/src/Frontend-STFL-Tests/Frontend-STFL-Tests.csproj
@@ -41,11 +41,12 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=2.4.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-      <Package>nunit</Package>
+    <Reference Include="nunit.framework">
+      <HintPath>..\..\packages\NUnit.2.6.1\lib\nunit.framework.dll</HintPath>
     </Reference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/Frontend-Tests/Frontend-Tests.csproj b/src/Frontend-Tests/Frontend-Tests.csproj
index 3c54836c..3f784580 100644
--- a/src/Frontend-Tests/Frontend-Tests.csproj
+++ b/src/Frontend-Tests/Frontend-Tests.csproj
@@ -47,15 +47,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="nunit.core, Version=2.6.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
-      <Private>False</Private>
-      <Package>nunit</Package>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.6.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
-      <Private>False</Private>
-      <Package>nunit</Package>
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="nunit.framework">
+      <HintPath>..\..\packages\NUnit.2.6.1\lib\nunit.framework.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -66,4 +59,7 @@
   <ItemGroup>
     <Folder Include="Mocks\" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Frontend-Tests/packages.config b/src/Frontend-Tests/packages.config
new file mode 100644
index 00000000..f0fb6d27
--- /dev/null
+++ b/src/Frontend-Tests/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit" version="2.6.1" targetFramework="net45" />
+</packages>
\ No newline at end of file


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]