Skip to content

Commit f647abc

Browse files
committed
Fix support VS 2017 15.5.x for real. Machine.Specifications.dll needs to be present for .NET Framework in order for the test adapter discovery engine to be able to load the mspec adapter. It should be noted that this is not the MSpec version that will be used during test discovery and run, because the adapter will copy itself into the test target directory and load itself in a new AppDomain with the test target's Mspec.dll.
1 parent 754036a commit f647abc

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

Source/Machine.VSTestAdapter/Machine.VSTestAdapter.csproj

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<_TargetDotNet>netcoreapp1.1</_TargetDotNet>
4+
<_TargetDotNetCore>netcoreapp1.1</_TargetDotNetCore>
55
<_TargetDotNetFramework>net46</_TargetDotNetFramework>
66

77
<TargetFrameworks>netcoreapp1.1;net46</TargetFrameworks>
@@ -26,7 +26,7 @@
2626
<DefineConstants>NETSTANDARD</DefineConstants>
2727
</PropertyGroup>
2828

29-
<ItemGroup Condition="'$(TargetFramework)'==$(_TargetDotNet)">
29+
<ItemGroup Condition="'$(TargetFramework)'==$(_TargetDotNetCore)">
3030
<PackageReference Include="Mono.Cecil" Version="[0.10-*, 0.11)" />
3131
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="[15.0.0,16)">
3232
<PrivateAssets>All</PrivateAssets> <!-- Only a reference during build/dev time -->
@@ -66,18 +66,22 @@
6666
<!-- .NET Core -->
6767
<Content Include="Machine.Specifications.Runner.VisualStudio.props">
6868
<Pack>true</Pack>
69-
<PackagePath>build\$(_TargetDotNet)\</PackagePath>
69+
<PackagePath>build\$(_TargetDotNetCore)\</PackagePath>
7070
</Content>
71-
<Content Include="bin\$(Configuration)\$(_TargetDotNet)\*.dll">
71+
<Content Include="bin\$(Configuration)\$(_TargetDotNetCore)\*.dll">
7272
<Pack>true</Pack>
73-
<PackagePath>build\$(_TargetDotNet)\</PackagePath>
73+
<PackagePath>build\$(_TargetDotNetCore)\</PackagePath>
7474
</Content>
7575

7676
<!-- .NET Framework - support for the new .csproj and dotnet test tooling -->
7777
<Content Include="Machine.Specifications.Runner.VisualStudio.props">
7878
<Pack>true</Pack>
7979
<PackagePath>build\$(_TargetDotNetFramework)\</PackagePath>
8080
</Content>
81+
<Content Include="bin\$(Configuration)\$(_TargetDotNetFramework)\Machine.Specifications.dll">
82+
<Pack>true</Pack>
83+
<PackagePath>build\$(_TargetDotNetFramework)\</PackagePath>
84+
</Content>
8185
<Content Include="bin\$(Configuration)\$(_TargetDotNetFramework)\Mono.*.dll">
8286
<Pack>true</Pack>
8387
<PackagePath>build\$(_TargetDotNetFramework)\</PackagePath>

0 commit comments

Comments
 (0)