X Tutup
Skip to content

Commit 5f064e5

Browse files
twsltwsl
committed
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
1 parent 013235f commit 5f064e5

24 files changed

+165
-114
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ All notable changes to this project will be documented in this file.
2222
- OxyPlot.ExampleLibrary changed to target netstandard 1.0 and net45 (#946, #1147)
2323
- OxyPlot.Wpf, OxyPlot.WindowsForms, OxyPlot.Pdf changet to .NET 4.5.2 (#946)
2424
- Place label below negative ColumnSeries (#1119)
25+
- Use PackageReference instead of packages.config
26+
- Migrated NUnit v2 to v3 and added test adapter
2527

2628
### Deprecated
2729
- OxyPlot.WP8 package. Use OxyPlot.Windows instead (#996)

‎CONTRIBUTORS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ tephyrnex
108108
Thomas Ibel <tibel@users.noreply.github.com>
109109
Tomasz Cielecki <tomasz@ostebaronen.dk>
110110
ToplandJ <jostein.topland@nov.com>
111+
twsl <45483159+twsI@users.noreply.github.com>
111112
Udo Liess
112113
VisualMelon
113114
vhoehn <veit.hoehn@hte-company.de>

‎Source/Examples/WPF/WpfExamples/WpfExamples.csproj‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,6 @@
3737
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
3838
</PropertyGroup>
3939
<ItemGroup>
40-
<Reference Include="PropertyTools, Version=2015.2.0.0, Culture=neutral, PublicKeyToken=ea0c9f2b460934d0, processorArchitecture=MSIL">
41-
<HintPath>..\..\..\packages\PropertyTools.Wpf.2015.2.0\lib\net45\PropertyTools.dll</HintPath>
42-
<Private>True</Private>
43-
</Reference>
44-
<Reference Include="PropertyTools.Wpf, Version=2015.2.0.0, Culture=neutral, PublicKeyToken=ea0c9f2b460934d0, processorArchitecture=MSIL">
45-
<HintPath>..\..\..\packages\PropertyTools.Wpf.2015.2.0\lib\net45\PropertyTools.Wpf.dll</HintPath>
46-
<Private>True</Private>
47-
</Reference>
4840
<Reference Include="System" />
4941
<Reference Include="System.Data" />
5042
<Reference Include="System.Drawing" />
@@ -600,7 +592,6 @@
600592
<Content Include="Examples\WorldStatisticsDemo\Data\population.csv">
601593
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
602594
</Content>
603-
<None Include="packages.config" />
604595
<None Include="ReadMe.txt" />
605596
<Resource Include="Images\HeatMapDemo.png" />
606597
<Resource Include="Images\ContextMenuDemo.png" />
@@ -671,6 +662,10 @@
671662
<Name>OxyPlot</Name>
672663
</ProjectReference>
673664
</ItemGroup>
674-
<ItemGroup />
665+
<ItemGroup>
666+
<PackageReference Include="PropertyTools.Wpf">
667+
<Version>2015.2.0</Version>
668+
</PackageReference>
669+
</ItemGroup>
675670
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
676671
</Project>

‎Source/Examples/WPF/WpfExamples/packages.config‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎Source/OxyPlot.OpenXml/OxyPlot.OpenXml.csproj‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@
3232
<DocumentationFile>bin\Release\OxyPlot.OpenXml.XML</DocumentationFile>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="DocumentFormat.OpenXml, Version=2.5.5631.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
36-
<SpecificVersion>False</SpecificVersion>
37-
<HintPath>..\packages\DocumentFormat.OpenXml.2.5\lib\DocumentFormat.OpenXml.dll</HintPath>
38-
</Reference>
3935
<Reference Include="System" />
4036
<Reference Include="System.Core" />
4137
<Reference Include="System.Drawing" />
@@ -59,7 +55,9 @@
5955
</ProjectReference>
6056
</ItemGroup>
6157
<ItemGroup>
62-
<None Include="packages.config" />
58+
<PackageReference Include="DocumentFormat.OpenXml">
59+
<Version>2.8.1</Version>
60+
</PackageReference>
6361
</ItemGroup>
6462
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6563
</Project>

‎Source/OxyPlot.OpenXml/packages.config‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎Source/OxyPlot.Pdf.Tests/MySetupClass.cs‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.IO;
4+
using System.Linq;
5+
using System.Text;
6+
using System.Threading.Tasks;
7+
using NUnit.Framework;
8+
9+
namespace OxyPlot.Pdf.Tests
10+
{
11+
[SetUpFixture]
12+
public class MySetupClass
13+
{
14+
/// <summary>
15+
/// Workaround for breaking changes while moving to latest NUnit, <see cref="https://github.com/nunit/docs/wiki/Breaking-Changes"/>
16+
/// </summary>
17+
[OneTimeSetUp]
18+
public void RunBeforeAnyTests()
19+
{
20+
Environment.CurrentDirectory = TestContext.CurrentContext.TestDirectory;
21+
// or identically under the hoods
22+
Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
23+
}
24+
}
25+
}

‎Source/OxyPlot.Pdf.Tests/OxyPlot.Pdf.Tests.csproj‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
<Compile Include="..\AssemblyInfo.cs">
7272
<Link>Properties\AssemblyInfo.cs</Link>
7373
</Compile>
74+
<Compile Include="MySetupClass.cs" />
7475
<Compile Include="PdfReportWriterTests.cs" />
7576
<Compile Include="PdfSharpTests.cs" />
7677
<Compile Include="Properties\AssemblyDescription.cs" />
@@ -95,12 +96,18 @@
9596
</ProjectReference>
9697
</ItemGroup>
9798
<ItemGroup>
98-
<None Include="packages.config">
99-
<SubType>Designer</SubType>
100-
</None>
99+
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
101100
</ItemGroup>
102101
<ItemGroup>
103-
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
102+
<PackageReference Include="NUnit">
103+
<Version>3.11.0</Version>
104+
</PackageReference>
105+
<PackageReference Include="NUnit3TestAdapter">
106+
<Version>3.11.2</Version>
107+
</PackageReference>
108+
<PackageReference Include="PDFsharp-MigraDoc-GDI">
109+
<Version>1.32.4334</Version>
110+
</PackageReference>
104111
</ItemGroup>
105112
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
106113
</Project>

‎Source/OxyPlot.Pdf.Tests/PdfExporterTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@ public void Export_Unicode()
6464
}
6565
}
6666
}
67-
}
67+
}

‎Source/OxyPlot.Pdf.Tests/packages.config‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)
X Tutup