Moved from packages.config to PackageReference & updated nuget packages

Updated OpenXML nuget package

Updated NUnit nuget package

Added NUnit test adapter

Hide unreachable code warning

Updated NSubstitute nuget package

Added username to list of contributors

Missing changes for updated NUnit 2 to 3

Added NUnit update to changelog

Author: twsl

CHANGELOG.md

@@ -22,6 +22,8 @@ All notable changes to this project will be documented in this file.
 - OxyPlot.ExampleLibrary changed to target netstandard 1.0 and net45 (#946, #1147)
 - OxyPlot.Wpf, OxyPlot.WindowsForms, OxyPlot.Pdf changet to .NET 4.5.2 (#946)
 - Place label below negative ColumnSeries (#1119)
+- Use PackageReference instead of packages.config
+- Migrated NUnit v2 to v3 and added test adapter
 
 ### Deprecated
 - OxyPlot.WP8 package. Use OxyPlot.Windows instead (#996)

CONTRIBUTORS

@@ -108,6 +108,7 @@ tephyrnex
 Thomas Ibel <tibel@users.noreply.github.com>
 Tomasz Cielecki <tomasz@ostebaronen.dk>
 ToplandJ <jostein.topland@nov.com>
+twsl <45483159+twsI@users.noreply.github.com>
 Udo Liess
 VisualMelon
 vhoehn <veit.hoehn@hte-company.de>

Source/Examples/WPF/WpfExamples/WpfExamples.csproj

@@ -37,14 +37,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="PropertyTools, Version=2015.2.0.0, Culture=neutral, PublicKeyToken=ea0c9f2b460934d0, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\PropertyTools.Wpf.2015.2.0\lib\net45\PropertyTools.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="PropertyTools.Wpf, Version=2015.2.0.0, Culture=neutral, PublicKeyToken=ea0c9f2b460934d0, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\PropertyTools.Wpf.2015.2.0\lib\net45\PropertyTools.Wpf.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
@@ -600,7 +592,6 @@
     <Content Include="Examples\WorldStatisticsDemo\Data\population.csv">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <None Include="packages.config" />
     <None Include="ReadMe.txt" />
     <Resource Include="Images\HeatMapDemo.png" />
     <Resource Include="Images\ContextMenuDemo.png" />
@@ -671,6 +662,10 @@
       <Name>OxyPlot</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <PackageReference Include="PropertyTools.Wpf">
+      <Version>2015.2.0</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Source/Examples/WPF/WpfExamples/packages.config

@@ -32,10 +32,6 @@
     <DocumentationFile>bin\Release\OxyPlot.OpenXml.XML</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DocumentFormat.OpenXml, Version=2.5.5631.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\DocumentFormat.OpenXml.2.5\lib\DocumentFormat.OpenXml.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
@@ -59,7 +55,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <PackageReference Include="DocumentFormat.OpenXml">
+      <Version>2.8.1</Version>
+    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Source/OxyPlot.OpenXml/OxyPlot.OpenXml.csproj

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using NUnit.Framework;
+
+namespace OxyPlot.Pdf.Tests
+{
+    [SetUpFixture]
+    public class MySetupClass
+    {
+        /// <summary>
+        /// Workaround for breaking changes while moving to latest NUnit, <see cref="https://github.com/nunit/docs/wiki/Breaking-Changes"/>
+        /// </summary>
+        [OneTimeSetUp]
+        public void RunBeforeAnyTests()
+        {
+            Environment.CurrentDirectory = TestContext.CurrentContext.TestDirectory;
+            // or identically under the hoods
+            Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
+        }
+    }
+}

Source/OxyPlot.OpenXml/packages.config

@@ -71,6 +71,7 @@
     <Compile Include="..\AssemblyInfo.cs">
       <Link>Properties\AssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="MySetupClass.cs" />
     <Compile Include="PdfReportWriterTests.cs" />
     <Compile Include="PdfSharpTests.cs" />
     <Compile Include="Properties\AssemblyDescription.cs" />
@@ -95,12 +96,18 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+    <PackageReference Include="NUnit">
+      <Version>3.11.0</Version>
+    </PackageReference>
+    <PackageReference Include="NUnit3TestAdapter">
+      <Version>3.11.2</Version>
+    </PackageReference>
+    <PackageReference Include="PDFsharp-MigraDoc-GDI">
+      <Version>1.32.4334</Version>
+    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Source/OxyPlot.Pdf.Tests/MySetupClass.cs

@@ -64,4 +64,4 @@ public void Export_Unicode()
             }
         }
     }
-}
+}