Skip to content

Commit 87e9be7

Browse files
committed
Altered .Net Framework target to NET452, to support NBench 1.0.4.
Updated package depencies; xunit to 2.2.0 and NBench to 1.0.4 - contribution by Andrey Leskov.
1 parent ac62022 commit 87e9be7

File tree

77 files changed

+57
-48667
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+57
-48667
lines changed

Pro.NBench.xUnit.Tests/Pro.NBench.xUnit.Tests.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>Pro.NBench.xUnit.Tests</RootNamespace>
1212
<AssemblyName>Pro.NBench.xUnit.Tests</AssemblyName>
13-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<NuGetPackageImportStamp>
1616
</NuGetPackageImportStamp>
@@ -69,7 +69,9 @@
6969
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
7070
</ItemGroup>
7171
<ItemGroup>
72-
<None Include="packages.config" />
72+
<None Include="packages.config">
73+
<SubType>Designer</SubType>
74+
</None>
7375
</ItemGroup>
7476
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7577
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="NBench" version="1.0.4" targetFramework="net462" />
4-
<package id="xunit" version="2.2.0" targetFramework="net462" />
5-
<package id="xunit.abstractions" version="2.0.1" targetFramework="net462" />
6-
<package id="xunit.assert" version="2.2.0" targetFramework="net462" />
7-
<package id="xunit.core" version="2.2.0" targetFramework="net462" />
8-
<package id="xunit.extensibility.core" version="2.2.0" targetFramework="net462" />
9-
<package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net462" />
10-
<package id="xunit.runner.visualstudio" version="2.2.0" targetFramework="net462" developmentDependency="true" />
3+
<package id="NBench" version="1.0.4" targetFramework="net452" />
4+
<package id="xunit" version="2.2.0" targetFramework="net452" />
5+
<package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
6+
<package id="xunit.assert" version="2.2.0" targetFramework="net452" />
7+
<package id="xunit.core" version="2.2.0" targetFramework="net452" />
8+
<package id="xunit.extensibility.core" version="2.2.0" targetFramework="net452" />
9+
<package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net452" />
10+
<package id="xunit.runner.visualstudio" version="2.2.0" targetFramework="net452" developmentDependency="true" />
1111
</packages>
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
3+
<metadata>
4+
<id>Pro.NBench.xUnit</id>
5+
<version>1.0.3</version>
6+
<title>Integration of NBench, xUnit and ReSharper / Visual Studio Test Explorer</title>
7+
<authors>Pro-Coded,David Paul McQuiggin</authors>
8+
<owners>Pro-Coded</owners>
9+
<licenseUrl>https://raw.githubusercontent.com/Pro-Coded/Pro.NBench.xUnit/master/LICENSE</licenseUrl>
10+
<projectUrl>https://github.com/Pro-Coded/Pro.NBench.xUnit</projectUrl>
11+
<iconUrl>http://imgur.com/h9IyPIm</iconUrl>
12+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
13+
<description>Allows NBench tests to be discovered, executed, reported, and debugged using xUnit in ReSharper, and Visual Studio Test Explorer.
14+
15+
Please refer to the project Url for usage information:
16+
17+
https://github.com/Pro-Coded/Pro.NBench.xUnit</description>
18+
<summary>Allows NBench tests to be discovered, executed, reported, and debugged using xUnit in ReSharper, and Visual Studio Test Explorer.</summary>
19+
<releaseNotes>Altered .Net Framework target to NET452, to support NBench 1.0.4.
20+
21+
Updated package depencies; xunit to 2.2.0 and NBench to 1.0.4 - contribution by Andrey Leskov.</releaseNotes>
22+
<copyright>Pro-Coded 2017</copyright>
23+
<language>en-US</language>
24+
<tags>NBench xUnit Resharper</tags>
25+
<dependencies>
26+
<group targetFramework=".NETFramework4.5.2">
27+
<dependency id="NBench" version="1.0.4" />
28+
<dependency id="xunit" version="2.2.0" />
29+
<dependency id="xunit.runner.visualstudio" version="2.2.0" />
30+
</group>
31+
</dependencies>
32+
</metadata>
33+
<files>
34+
<file src="bin\Release\Pro.NBench.xUnit.dll" target="lib\net452\Pro.NBench.xUnit.dll" />
35+
</files>
36+
</package>

Pro.NBench.xUnit/Pro.NBench.xUnit.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Pro.NBench.xUnit</RootNamespace>
1111
<AssemblyName>Pro.NBench.xUnit</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
1515
<NuGetPackageImportStamp>
@@ -70,7 +70,7 @@
7070
</ItemGroup>
7171
<ItemGroup>
7272
<None Include="packages.config" />
73-
<None Include="Pro.NBench.xUnit.nuspec" />
73+
<None Include="Pro.NBench.xUnit.1.0.3.nuspec" />
7474
</ItemGroup>
7575
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7676
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

Pro.NBench.xUnit/Pro.NBench.xUnit.nuspec

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

Pro.NBench.xUnit/packages.config

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="NBench" version="1.0.4" targetFramework="net462" />
4-
<package id="xunit" version="2.2.0" targetFramework="net462" />
5-
<package id="xunit.abstractions" version="2.0.1" targetFramework="net462" />
6-
<package id="xunit.assert" version="2.2.0" targetFramework="net462" />
7-
<package id="xunit.core" version="2.2.0" targetFramework="net462" />
8-
<package id="xunit.extensibility.core" version="2.2.0" targetFramework="net462" />
9-
<package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net462" />
3+
<package id="NBench" version="1.0.4" targetFramework="net452" />
4+
<package id="xunit" version="2.2.0" targetFramework="net452" />
5+
<package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
6+
<package id="xunit.assert" version="2.2.0" targetFramework="net452" />
7+
<package id="xunit.core" version="2.2.0" targetFramework="net452" />
8+
<package id="xunit.extensibility.core" version="2.2.0" targetFramework="net452" />
9+
<package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net452" />
1010
</packages>
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)