Skip to content

Commit 4194520

Browse files
caeteracaetera
committed
Update NUnit and NUnit adapter
1 parent f1e9ed2 commit 4194520

35 files changed

+87514
-13
lines changed

‎ThermoRawFileParser.csproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="packages\NUnit3TestAdapter.4.1.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('packages\NUnit3TestAdapter.4.1.0\build\net35\NUnit3TestAdapter.props')" />
34
<Import Project="packages\NUnit.3.13.1\build\NUnit.props" Condition="Exists('packages\NUnit.3.13.1\build\NUnit.props')" />
45
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
56
<PropertyGroup>
@@ -14,6 +15,8 @@
1415
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1516
<FileAlignment>512</FileAlignment>
1617
<LangVersion>7.2</LangVersion>
18+
<NuGetPackageImportStamp>
19+
</NuGetPackageImportStamp>
1720
</PropertyGroup>
1821
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1922
<PlatformTarget>x64</PlatformTarget>
@@ -242,6 +245,7 @@
242245
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
243246
</PropertyGroup>
244247
<Error Condition="!Exists('packages\NUnit.3.13.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\NUnit.3.13.1\build\NUnit.props'))" />
248+
<Error Condition="!Exists('packages\NUnit3TestAdapter.4.1.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\NUnit3TestAdapter.4.1.0\build\net35\NUnit3TestAdapter.props'))" />
245249
</Target>
246250
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
247251
Other similar extension points exist, see Microsoft.Common.targets.
@@ -250,4 +254,4 @@
250254
<Target Name="AfterBuild">
251255
</Target>
252256
-->
253-
</Project>
257+
</Project>

‎ThermoRawFileParserTest/ThermoRawFileParserTest.csproj‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\NUnit.3.13.1\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.13.1\build\NUnit.props')" />
3+
<Import Project="..\packages\NUnit.3.13.2\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.13.2\build\NUnit.props')" />
4+
<Import Project="..\packages\NUnit3TestAdapter.4.1.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.4.1.0\build\net35\NUnit3TestAdapter.props')" />
45
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
56
<PropertyGroup>
67
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -14,9 +15,11 @@
1415
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1516
<FileAlignment>512</FileAlignment>
1617
<LangVersion>7.2</LangVersion>
18+
<NuGetPackageImportStamp>
19+
</NuGetPackageImportStamp>
1720
</PropertyGroup>
1821
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19-
<PlatformTarget>AnyCPU</PlatformTarget>
22+
<PlatformTarget>x64</PlatformTarget>
2023
<DebugSymbols>true</DebugSymbols>
2124
<DebugType>full</DebugType>
2225
<Optimize>false</Optimize>
@@ -108,9 +111,8 @@
108111
<HintPath>..\packages\NJsonSchema.10.4.0\lib\net45\NJsonSchema.dll</HintPath>
109112
<Private>True</Private>
110113
</Reference>
111-
<Reference Include="nunit.framework, Version=3.13.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb">
112-
<HintPath>..\packages\NUnit.3.13.1\lib\net45\nunit.framework.dll</HintPath>
113-
<Private>True</Private>
114+
<Reference Include="nunit.framework, Version=3.13.2.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
115+
<HintPath>..\packages\NUnit.3.13.2\lib\net45\nunit.framework.dll</HintPath>
114116
</Reference>
115117
<Reference Include="OpenMcdf, Version=2.2.1.9, Culture=neutral, PublicKeyToken=fdbb1629d7c00800, processorArchitecture=MSIL">
116118
<HintPath>..\packages\OpenMcdf.2.2.1.9\lib\net40\OpenMcdf.dll</HintPath>
@@ -229,8 +231,9 @@
229231
<PropertyGroup>
230232
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
231233
</PropertyGroup>
232-
<Error Condition="!Exists('..\packages\NUnit.3.13.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.13.1\build\NUnit.props'))" />
233234
<Error Condition="!Exists('..\packages\mzLib.1.0.450\build\net471\mzLib.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\mzLib.1.0.450\build\net471\mzLib.targets'))" />
235+
<Error Condition="!Exists('..\packages\NUnit3TestAdapter.4.1.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.4.1.0\build\net35\NUnit3TestAdapter.props'))" />
236+
<Error Condition="!Exists('..\packages\NUnit.3.13.2\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.13.2\build\NUnit.props'))" />
234237
</Target>
235238
<Import Project="..\packages\mzLib.1.0.450\build\net471\mzLib.targets" Condition="Exists('..\packages\mzLib.1.0.450\build\net471\mzLib.targets')" />
236239
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎ThermoRawFileParserTest/packages.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
<package id="Namotion.Reflection" version="1.0.18" targetFramework="net472" />
1212
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
1313
<package id="NJsonSchema" version="10.4.0" targetFramework="net472" />
14-
<package id="NUnit" version="3.13.1" targetFramework="net472" />
14+
<package id="NUnit" version="3.13.2" targetFramework="net472" />
15+
<package id="NUnit3TestAdapter" version="4.1.0" targetFramework="net472" />
1516
<package id="OpenMcdf" version="2.2.1.9" targetFramework="net472" />
1617
<package id="OpenMcdf.Extensions" version="2.2.1.4" targetFramework="net472" />
1718
<package id="PSI_Interface" version="2.3.2" targetFramework="net472" />

‎packages.config‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,23 @@
44
<package id="AWSSDK.CloudWatchLogs" version="3.3.101.14" targetFramework="net472" />
55
<package id="AWSSDK.Core" version="3.3.103.30" targetFramework="net472" />
66
<package id="AWSSDK.S3" version="3.3.104.18" targetFramework="net472" />
7-
<package id="Parquet.Net" version="2.0.0" targetFramework="net472" />
87
<package id="IronSnappy" version="1.3.0" targetFramework="net472" />
9-
<package id="System.Buffers" version="4.5.1" targetFramework="net472" />
10-
<package id="System.Memory" version="4.5.4" targetFramework="net472" />
11-
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
12-
<package id="System.Reflection.Emit.Lightweight" version="4.7.0" targetFramework="net472" />
138
<package id="log4net" version="2.0.12" targetFramework="net472" />
149
<package id="MathNet.Numerics" version="4.15.0" targetFramework="net472" />
1510
<package id="Mono.Options" version="6.6.0.161" targetFramework="net472" />
1611
<package id="Namotion.Reflection" version="1.0.18" targetFramework="net472" />
1712
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
1813
<package id="NJsonSchema" version="10.4.0" targetFramework="net472" />
1914
<package id="NUnit" version="3.13.1" targetFramework="net472" />
15+
<package id="NUnit3TestAdapter" version="4.1.0" targetFramework="net472" />
2016
<package id="OpenMcdf" version="2.2.1.9" targetFramework="net472" />
2117
<package id="OpenMcdf.Extensions" version="2.2.1.4" targetFramework="net472" />
18+
<package id="Parquet.Net" version="2.0.0" targetFramework="net472" />
19+
<package id="System.Buffers" version="4.5.1" targetFramework="net472" />
2220
<package id="System.IO.FileSystem.AccessControl" version="5.0.0" targetFramework="net472" />
21+
<package id="System.Memory" version="4.5.4" targetFramework="net472" />
22+
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
23+
<package id="System.Reflection.Emit.Lightweight" version="4.7.0" targetFramework="net472" />
2324
<package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net472" />
2425
<package id="System.Security.AccessControl" version="5.0.0" targetFramework="net472" />
2526
<package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net472" />

‎packages/NUnit.3.13.2/.signature.p7s‎

9.25 KB
Binary file not shown.

0 commit comments

Comments
 (0)