From bf846657ae8a9d56c30e9d1061851b975fded3f1 Mon Sep 17 00:00:00 2001
From: Michael Blake <mikeblake@hotmail.com>
Date: Tue, 25 May 2021 11:54:49 +0100
Subject: [PATCH 01/10] Update Frameworks and remove net572

---
 ...fications.Runner.VisualStudio.Specs.csproj | 12 +++--
 ....Specifications.Runner.VisualStudio.csproj | 44 +++----------------
 ...e.Specifications.Runner.VisualStudio.props | 44 -------------------
 3 files changed, 11 insertions(+), 89 deletions(-)
 delete mode 100644 src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.props

diff --git a/src/Machine.Specifications.Runner.VisualStudio.Specs/Machine.Specifications.Runner.VisualStudio.Specs.csproj b/src/Machine.Specifications.Runner.VisualStudio.Specs/Machine.Specifications.Runner.VisualStudio.Specs.csproj
index ecb11ec..c302ec8 100644
--- a/src/Machine.Specifications.Runner.VisualStudio.Specs/Machine.Specifications.Runner.VisualStudio.Specs.csproj
+++ b/src/Machine.Specifications.Runner.VisualStudio.Specs/Machine.Specifications.Runner.VisualStudio.Specs.csproj
@@ -1,18 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net472</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;net472;net5.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Machine.Fakes.Moq" Version="2.10.0" />
-    <PackageReference Include="Machine.Specifications" Version="1.0.0" />
+    <PackageReference Include="Machine.Fakes.Moq" Version="2.11.0" />
     <PackageReference Include="Machine.Specifications.Should" Version="1.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.2.1" />
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="15.9.0" Condition="'$(TargetFramework)'=='netcoreapp2.1'" />
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="11.0.0" Condition="'$(TargetFramework)'=='net472'" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" />
+    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="[16.9.4, 17.0)" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj b/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj
index 0119fd4..35e5494 100644
--- a/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj
+++ b/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>0.1.0</Version>
-    <TargetFrameworks>netcoreapp2.1;net452</TargetFrameworks>
+    <Version>1.0.0</Version>
+    <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
     <PackageId>Machine.Specifications.Runner.VisualStudio</PackageId>
     <AssemblyName>Machine.TestAdapter</AssemblyName>
     <Description>Machine.Specifications (MSpec) adapter for .NET Framework and .NET Core including dotnet cli (dotnet test), Visual Studio IDE, TFS, Visual Studio Online, Visual Studio Team Services.</Description>
@@ -12,48 +12,16 @@
     <PackageIcon>Machine.png</PackageIcon>
     <PackageProjectUrl>https://github.com/machine/machine.specifications.runner.visualstudio</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp2.1'">
-    <DefineConstants>NETSTANDARD</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Mono.Cecil" Version="[0.10-*, 0.11)" />
-    <PackageReference Include="Machine.Specifications" Version="[0.11.0,2.0.0)" PrivateAssets="All" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.1'">
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="[15.0.0,17.0.0)" PrivateAssets="All" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='net452'">
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="11.0.0" PrivateAssets="All" />
+    <PackageReference Include="Machine.Specifications" Version="[1.0, 2.0)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="[16.9.4, 17.0)" PrivateAssets="All" />
+    <PackageReference Include="Mono.Cecil" Version="[0.11, 1.0)" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="Resources\Machine.png" Pack="true" PackagePath="\"/>
+    <None Include="Resources\Machine.png" Pack="true" PackagePath="\" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);NetCorePackageItems;NetFrameworkPackageItems</TargetsForTfmSpecificContentInPackage>
-  </PropertyGroup>
-
-  <Target Name="NetCorePackageItems" Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
-    <ItemGroup>
-      <TfmSpecificPackageFile Include="*.props" PackagePath="build\$(TargetFramework)" />
-      <TfmSpecificPackageFile Include="$(OutputPath)\*.dll" PackagePath="build\$(TargetFramework)" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="NetFrameworkPackageItems" Condition="'$(TargetFramework)'=='net452'">
-    <ItemGroup>
-      <TfmSpecificPackageFile Include="*.props" PackagePath="build\$(TargetFramework)" />
-      <TfmSpecificPackageFile Include="$(OutputPath)\Machine.Specifications.dll" PackagePath="build\$(TargetFramework)\" />
-      <TfmSpecificPackageFile Include="$(OutputPath)\Machine.TestAdapter.dll" PackagePath="build\$(TargetFramework)" />
-      <TfmSpecificPackageFile Include="$(OutputPath)\Mono.*.dll" PackagePath="build\$(TargetFramework)" />
-    </ItemGroup>
-  </Target>
-
 </Project>
diff --git a/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.props b/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.props
deleted file mode 100644
index b6f4aec..0000000
--- a/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.props
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!-- 
-    The new dotnet tooling for the new .csproj format looks for test adapters in the build output directory 
-    and this msbuild script is ensuring we are copying everything needed.
-
-    It is ran automatically for us by simply being in the "build" folder in the nuget package.
-
-    MSBuildThisFileDirectory will be the full path to the relevant framework the build is running for.
-  -->
-  <ItemGroup>
-    
-    <!-- .NET Framework only -->
-
-    <Content Include="$(MSBuildThisFileDirectory)Mono.Cecil.dll" Condition="Exists('$(MSBuildThisFileDirectory)Mono.Cecil.dll')">
-      <Link>Mono.Cecil.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>False</Visible>
-    </Content>
-    <Content Include="$(MSBuildThisFileDirectory)Mono.Cecil.Mdb.dll" Condition="Exists('$(MSBuildThisFileDirectory)Mono.Cecil.Mdb.dll')">
-      <Link>Mono.Cecil.Mdb.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>False</Visible>
-    </Content>
-    <Content Include="$(MSBuildThisFileDirectory)Mono.Cecil.Pdb.dll" Condition="Exists('$(MSBuildThisFileDirectory)Mono.Cecil.Pdb.dll')">
-      <Link>Mono.Cecil.Pdb.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>False</Visible>
-    </Content>
-    <Content Include="$(MSBuildThisFileDirectory)Mono.Cecil.Rocks.dll" Condition="Exists('$(MSBuildThisFileDirectory)Mono.Cecil.Rocks.dll')">
-      <Link>Mono.Cecil.Rocks.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>False</Visible>
-    </Content>
-    
-    <!-- All -->
-    <Content Include="$(MSBuildThisFileDirectory)Machine.TestAdapter.dll">
-      <Link>Machine.TestAdapter.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>False</Visible>
-    </Content>
-  </ItemGroup>
-</Project>
\ No newline at end of file

From fecd9176245c807483570a0278bcbb4122c6cac2 Mon Sep 17 00:00:00 2001
From: Michael Blake <mikeblake@hotmail.com>
Date: Tue, 25 May 2021 12:41:12 +0100
Subject: [PATCH 02/10] Keep Mono.Cecil logic

---
 ....Specifications.Runner.VisualStudio.csproj | 40 ++++++++++++++---
 ...e.Specifications.Runner.VisualStudio.props | 44 +++++++++++++++++++
 2 files changed, 77 insertions(+), 7 deletions(-)
 create mode 100644 src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.props

diff --git a/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj b/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj
index 35e5494..4797735 100644
--- a/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj
+++ b/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>1.0.0</Version>
-    <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
+    <Version>0.1.0</Version>
+    <TargetFrameworks>netcoreapp2.1;net472;net5.0</TargetFrameworks>
     <PackageId>Machine.Specifications.Runner.VisualStudio</PackageId>
     <AssemblyName>Machine.TestAdapter</AssemblyName>
     <Description>Machine.Specifications (MSpec) adapter for .NET Framework and .NET Core including dotnet cli (dotnet test), Visual Studio IDE, TFS, Visual Studio Online, Visual Studio Team Services.</Description>
@@ -12,16 +12,42 @@
     <PackageIcon>Machine.png</PackageIcon>
     <PackageProjectUrl>https://github.com/machine/machine.specifications.runner.visualstudio</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
+
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
+    <DefineConstants>NETSTANDARD</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Machine.Specifications" Version="[1.0, 2.0)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="[16.9.4, 17.0)" PrivateAssets="All" />
-    <PackageReference Include="Mono.Cecil" Version="[0.11, 1.0)" />
+    <PackageReference Include="Mono.Cecil" Version="[0.11,0.12)" />
+    <PackageReference Include="Machine.Specifications" Version="[1.0,2.0)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="[16.9.1,17.0.0)" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="Resources\Machine.png" Pack="true" PackagePath="\" />
+    <None Include="Resources\Machine.png" Pack="true" PackagePath="\"/>
   </ItemGroup>
 
-</Project>
+  <PropertyGroup>
+    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);NetCorePackageItems;NetFrameworkPackageItems</TargetsForTfmSpecificContentInPackage>
+  </PropertyGroup>
+
+  <Target Name="NetCorePackageItems" Condition="'$(TargetFramework)' != 'net472'">
+    <ItemGroup>
+      <TfmSpecificPackageFile Include="*.props" PackagePath="build\$(TargetFramework)" />
+      <TfmSpecificPackageFile Include="$(OutputPath)\*.dll" PackagePath="build\$(TargetFramework)" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="NetFrameworkPackageItems" Condition="'$(TargetFramework)' == 'net472'">
+    <ItemGroup>
+      <TfmSpecificPackageFile Include="*.props" PackagePath="build\$(TargetFramework)" />
+      <TfmSpecificPackageFile Include="$(OutputPath)\Machine.Specifications.dll" PackagePath="build\$(TargetFramework)\" />
+      <TfmSpecificPackageFile Include="$(OutputPath)\Machine.TestAdapter.dll" PackagePath="build\$(TargetFramework)" />
+      <TfmSpecificPackageFile Include="$(OutputPath)\Mono.*.dll" PackagePath="build\$(TargetFramework)" />
+    </ItemGroup>
+  </Target>
+
+</Project>
\ No newline at end of file
diff --git a/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.props b/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.props
new file mode 100644
index 0000000..b6f4aec
--- /dev/null
+++ b/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.props
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- 
+    The new dotnet tooling for the new .csproj format looks for test adapters in the build output directory 
+    and this msbuild script is ensuring we are copying everything needed.
+
+    It is ran automatically for us by simply being in the "build" folder in the nuget package.
+
+    MSBuildThisFileDirectory will be the full path to the relevant framework the build is running for.
+  -->
+  <ItemGroup>
+    
+    <!-- .NET Framework only -->
+
+    <Content Include="$(MSBuildThisFileDirectory)Mono.Cecil.dll" Condition="Exists('$(MSBuildThisFileDirectory)Mono.Cecil.dll')">
+      <Link>Mono.Cecil.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </Content>
+    <Content Include="$(MSBuildThisFileDirectory)Mono.Cecil.Mdb.dll" Condition="Exists('$(MSBuildThisFileDirectory)Mono.Cecil.Mdb.dll')">
+      <Link>Mono.Cecil.Mdb.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </Content>
+    <Content Include="$(MSBuildThisFileDirectory)Mono.Cecil.Pdb.dll" Condition="Exists('$(MSBuildThisFileDirectory)Mono.Cecil.Pdb.dll')">
+      <Link>Mono.Cecil.Pdb.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </Content>
+    <Content Include="$(MSBuildThisFileDirectory)Mono.Cecil.Rocks.dll" Condition="Exists('$(MSBuildThisFileDirectory)Mono.Cecil.Rocks.dll')">
+      <Link>Mono.Cecil.Rocks.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </Content>
+    
+    <!-- All -->
+    <Content Include="$(MSBuildThisFileDirectory)Machine.TestAdapter.dll">
+      <Link>Machine.TestAdapter.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </Content>
+  </ItemGroup>
+</Project>
\ No newline at end of file

From 002e0d72e56b72098608274994b78ac8e52fdca9 Mon Sep 17 00:00:00 2001
From: Michael Blake <mikeblake@hotmail.com>
Date: Tue, 25 May 2021 14:14:42 +0100
Subject: [PATCH 03/10] Fake NETSTANDARD

---
 .../Machine.Specifications.Runner.VisualStudio.csproj           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj b/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj
index 4797735..7575cae 100644
--- a/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj
+++ b/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj
@@ -16,7 +16,7 @@
     <IncludeBuildOutput>false</IncludeBuildOutput>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
+  <PropertyGroup Condition="'$(TargetFramework)' != 'net472'">
     <DefineConstants>NETSTANDARD</DefineConstants>
   </PropertyGroup>
 

From 463f87abb9fa8b0792413e0ee9ff12bd8018ac5f Mon Sep 17 00:00:00 2001
From: Michael Blake <mikeblake@hotmail.com>
Date: Tue, 25 May 2021 14:33:40 +0100
Subject: [PATCH 04/10] Add net452 back in

---
 ...ifications.Runner.VisualStudio.Specs.csproj |  2 +-
 ...e.Specifications.Runner.VisualStudio.csproj | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/Machine.Specifications.Runner.VisualStudio.Specs/Machine.Specifications.Runner.VisualStudio.Specs.csproj b/src/Machine.Specifications.Runner.VisualStudio.Specs/Machine.Specifications.Runner.VisualStudio.Specs.csproj
index c302ec8..7b61575 100644
--- a/src/Machine.Specifications.Runner.VisualStudio.Specs/Machine.Specifications.Runner.VisualStudio.Specs.csproj
+++ b/src/Machine.Specifications.Runner.VisualStudio.Specs/Machine.Specifications.Runner.VisualStudio.Specs.csproj
@@ -10,7 +10,7 @@
     <PackageReference Include="Machine.Specifications.Should" Version="1.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" />
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="[16.9.4, 17.0)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="16.9.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj b/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj
index 7575cae..fbb731d 100644
--- a/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj
+++ b/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Version>0.1.0</Version>
-    <TargetFrameworks>netcoreapp2.1;net472;net5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;net452;net472</TargetFrameworks>
     <PackageId>Machine.Specifications.Runner.VisualStudio</PackageId>
     <AssemblyName>Machine.TestAdapter</AssemblyName>
     <Description>Machine.Specifications (MSpec) adapter for .NET Framework and .NET Core including dotnet cli (dotnet test), Visual Studio IDE, TFS, Visual Studio Online, Visual Studio Team Services.</Description>
@@ -16,14 +16,20 @@
     <IncludeBuildOutput>false</IncludeBuildOutput>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' != 'net472'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
     <DefineConstants>NETSTANDARD</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Mono.Cecil" Version="[0.11,0.12)" />
+    <PackageReference Include="Mono.Cecil" Version="[0.11.3,0.12)" />
     <PackageReference Include="Machine.Specifications" Version="[1.0,2.0)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="[16.9.1,17.0.0)" PrivateAssets="All" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)'!='net452'">
+    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="[16.9.4,17.0.0)" PrivateAssets="All" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net452'">
+    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="11.0.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
@@ -34,14 +40,14 @@
     <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);NetCorePackageItems;NetFrameworkPackageItems</TargetsForTfmSpecificContentInPackage>
   </PropertyGroup>
 
-  <Target Name="NetCorePackageItems" Condition="'$(TargetFramework)' != 'net472'">
+  <Target Name="NetCorePackageItems" Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
     <ItemGroup>
       <TfmSpecificPackageFile Include="*.props" PackagePath="build\$(TargetFramework)" />
       <TfmSpecificPackageFile Include="$(OutputPath)\*.dll" PackagePath="build\$(TargetFramework)" />
     </ItemGroup>
   </Target>
 
-  <Target Name="NetFrameworkPackageItems" Condition="'$(TargetFramework)' == 'net472'">
+  <Target Name="NetFrameworkPackageItems" Condition="'$(TargetFramework)' != 'netcoreapp2.1'">
     <ItemGroup>
       <TfmSpecificPackageFile Include="*.props" PackagePath="build\$(TargetFramework)" />
       <TfmSpecificPackageFile Include="$(OutputPath)\Machine.Specifications.dll" PackagePath="build\$(TargetFramework)\" />

From 48a95eff618b0de8a9a8f4d06277d8db58e61278 Mon Sep 17 00:00:00 2001
From: Michael Blake <mikeblake@hotmail.com>
Date: Tue, 25 May 2021 15:20:06 +0100
Subject: [PATCH 05/10] Relax version numbers Force 16 for non net 452 users

---
 .../Machine.Specifications.Runner.VisualStudio.csproj       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj b/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj
index fbb731d..25fedcc 100644
--- a/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj
+++ b/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj
@@ -21,12 +21,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Mono.Cecil" Version="[0.11.3,0.12)" />
-    <PackageReference Include="Machine.Specifications" Version="[1.0,2.0)" PrivateAssets="All" />
+    <PackageReference Include="Mono.Cecil" Version="0.*" />
+    <PackageReference Include="Machine.Specifications" Version="1.*" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'!='net452'">
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="[16.9.4,17.0.0)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="16.*" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net452'">
     <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="11.0.0" PrivateAssets="All" />

From 231db40a9d349113339df566f2af695c5a7686e6 Mon Sep 17 00:00:00 2001
From: Michael Blake <mikeblake@hotmail.com>
Date: Wed, 26 May 2021 11:42:44 +0100
Subject: [PATCH 06/10] Use "Microsoft.NET.Test.Sdk" Version="16.10.0"

---
 .../Machine.Specifications.Runner.VisualStudio.Specs.csproj   | 4 ++--
 .../Machine.Specifications.Runner.VisualStudio.csproj         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Machine.Specifications.Runner.VisualStudio.Specs/Machine.Specifications.Runner.VisualStudio.Specs.csproj b/src/Machine.Specifications.Runner.VisualStudio.Specs/Machine.Specifications.Runner.VisualStudio.Specs.csproj
index 7b61575..d296e73 100644
--- a/src/Machine.Specifications.Runner.VisualStudio.Specs/Machine.Specifications.Runner.VisualStudio.Specs.csproj
+++ b/src/Machine.Specifications.Runner.VisualStudio.Specs/Machine.Specifications.Runner.VisualStudio.Specs.csproj
@@ -8,9 +8,9 @@
   <ItemGroup>
     <PackageReference Include="Machine.Fakes.Moq" Version="2.11.0" />
     <PackageReference Include="Machine.Specifications.Should" Version="1.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" />
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="16.9.4" />
+    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="16.10.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj b/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj
index 25fedcc..c98ea1d 100644
--- a/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj
+++ b/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj
@@ -21,7 +21,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Mono.Cecil" Version="0.*" />
+    <PackageReference Include="Mono.Cecil" Version="[0.10-*, 0.11)" />
     <PackageReference Include="Machine.Specifications" Version="1.*" PrivateAssets="All" />
   </ItemGroup>
 

From b62e13efb8c511e03a0e0c7111b8f4cd3c32fa68 Mon Sep 17 00:00:00 2001
From: Michael Blake <mikeblake@hotmail.com>
Date: Wed, 26 May 2021 16:41:36 +0100
Subject: [PATCH 07/10] "Microsoft.TestPlatform.ObjectModel" Version="[16.0,
 17.0)" only

---
 .../Machine.Specifications.Runner.VisualStudio.csproj  | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj b/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj
index c98ea1d..43db6a3 100644
--- a/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj
+++ b/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Version>0.1.0</Version>
-    <TargetFrameworks>netcoreapp2.1;net452;net472</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;net452</TargetFrameworks>
     <PackageId>Machine.Specifications.Runner.VisualStudio</PackageId>
     <AssemblyName>Machine.TestAdapter</AssemblyName>
     <Description>Machine.Specifications (MSpec) adapter for .NET Framework and .NET Core including dotnet cli (dotnet test), Visual Studio IDE, TFS, Visual Studio Online, Visual Studio Team Services.</Description>
@@ -23,13 +23,7 @@
   <ItemGroup>
     <PackageReference Include="Mono.Cecil" Version="[0.10-*, 0.11)" />
     <PackageReference Include="Machine.Specifications" Version="1.*" PrivateAssets="All" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)'!='net452'">
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="16.*" PrivateAssets="All" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='net452'">
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="11.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="[16.0, 17.0)" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>

From 3450a0adaeea790b5c8ecc24816c8a5d99d824d3 Mon Sep 17 00:00:00 2001
From: Michael Blake <mikeblake@hotmail.com>
Date: Wed, 26 May 2021 17:28:45 +0100
Subject: [PATCH 08/10] Recommended Versions

---
 .../Machine.Specifications.Runner.VisualStudio.csproj         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj b/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj
index 43db6a3..448b105 100644
--- a/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj
+++ b/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj
@@ -22,8 +22,8 @@
 
   <ItemGroup>
     <PackageReference Include="Mono.Cecil" Version="[0.10-*, 0.11)" />
-    <PackageReference Include="Machine.Specifications" Version="1.*" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="[16.0, 17.0)" PrivateAssets="All" />
+    <PackageReference Include="Machine.Specifications" Version="[0.11.0,2.0.0)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="16.6.1" />
   </ItemGroup>
 
   <ItemGroup>

From 24714986508578babd253e7704a70c8618c21e99 Mon Sep 17 00:00:00 2001
From: Michael Blake <mikeblake@hotmail.com>
Date: Thu, 27 May 2021 13:06:31 +0100
Subject: [PATCH 09/10] PreventTestPlatformObjectModelCopyLocal move to lib
 folders to avoid package warnings

---
 ....Specifications.Runner.VisualStudio.csproj | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj b/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj
index 448b105..b1fb572 100644
--- a/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj
+++ b/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj
@@ -23,7 +23,7 @@
   <ItemGroup>
     <PackageReference Include="Mono.Cecil" Version="[0.10-*, 0.11)" />
     <PackageReference Include="Machine.Specifications" Version="[0.11.0,2.0.0)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="16.6.1" />
+    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="16.10.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
@@ -34,20 +34,25 @@
     <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);NetCorePackageItems;NetFrameworkPackageItems</TargetsForTfmSpecificContentInPackage>
   </PropertyGroup>
 
+  <Target Name="PreventTestPlatformObjectModelCopyLocal" AfterTargets="ResolveReferences">
+    <ItemGroup>
+      <ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="'%(Filename)' == 'Microsoft.VisualStudio.TestPlatform.ObjectModel'" />
+    </ItemGroup>
+  </Target>
+
   <Target Name="NetCorePackageItems" Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
     <ItemGroup>
-      <TfmSpecificPackageFile Include="*.props" PackagePath="build\$(TargetFramework)" />
-      <TfmSpecificPackageFile Include="$(OutputPath)\*.dll" PackagePath="build\$(TargetFramework)" />
+      <TfmSpecificPackageFile Include="*.props" PackagePath="lib\$(TargetFramework)" />
+      <TfmSpecificPackageFile Include="$(OutputPath)\Machine.*.dll" PackagePath="lib\$(TargetFramework)" />
     </ItemGroup>
   </Target>
 
   <Target Name="NetFrameworkPackageItems" Condition="'$(TargetFramework)' != 'netcoreapp2.1'">
     <ItemGroup>
-      <TfmSpecificPackageFile Include="*.props" PackagePath="build\$(TargetFramework)" />
-      <TfmSpecificPackageFile Include="$(OutputPath)\Machine.Specifications.dll" PackagePath="build\$(TargetFramework)\" />
-      <TfmSpecificPackageFile Include="$(OutputPath)\Machine.TestAdapter.dll" PackagePath="build\$(TargetFramework)" />
-      <TfmSpecificPackageFile Include="$(OutputPath)\Mono.*.dll" PackagePath="build\$(TargetFramework)" />
+      <TfmSpecificPackageFile Include="*.props" PackagePath="lib\$(TargetFramework)" />
+      <TfmSpecificPackageFile Include="$(OutputPath)\Machine.*.dll" PackagePath="lib\$(TargetFramework)" />
+      <TfmSpecificPackageFile Include="$(OutputPath)\Mono.*.dll" PackagePath="lib\$(TargetFramework)" />
     </ItemGroup>
   </Target>
 
-</Project>
\ No newline at end of file
+</Project>

From cab9543e33c9a79cdc271d7e29c2b852e1b8a775 Mon Sep 17 00:00:00 2001
From: Michael Blake <mikeblake@hotmail.com>
Date: Thu, 27 May 2021 14:37:51 +0100
Subject: [PATCH 10/10] change back from lib to build dispite NU5127

---
 .../Machine.Specifications.Runner.VisualStudio.csproj  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj b/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj
index b1fb572..cf12ada 100644
--- a/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj
+++ b/src/Machine.Specifications.Runner.VisualStudio/Machine.Specifications.Runner.VisualStudio.csproj
@@ -42,16 +42,16 @@
 
   <Target Name="NetCorePackageItems" Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
     <ItemGroup>
-      <TfmSpecificPackageFile Include="*.props" PackagePath="lib\$(TargetFramework)" />
-      <TfmSpecificPackageFile Include="$(OutputPath)\Machine.*.dll" PackagePath="lib\$(TargetFramework)" />
+      <TfmSpecificPackageFile Include="*.props" PackagePath="build\$(TargetFramework)" />
+      <TfmSpecificPackageFile Include="$(OutputPath)\Machine.*.dll" PackagePath="build\$(TargetFramework)" />
     </ItemGroup>
   </Target>
 
   <Target Name="NetFrameworkPackageItems" Condition="'$(TargetFramework)' != 'netcoreapp2.1'">
     <ItemGroup>
-      <TfmSpecificPackageFile Include="*.props" PackagePath="lib\$(TargetFramework)" />
-      <TfmSpecificPackageFile Include="$(OutputPath)\Machine.*.dll" PackagePath="lib\$(TargetFramework)" />
-      <TfmSpecificPackageFile Include="$(OutputPath)\Mono.*.dll" PackagePath="lib\$(TargetFramework)" />
+      <TfmSpecificPackageFile Include="*.props" PackagePath="build\$(TargetFramework)" />
+      <TfmSpecificPackageFile Include="$(OutputPath)\Machine.*.dll" PackagePath="build\$(TargetFramework)" />
+      <TfmSpecificPackageFile Include="$(OutputPath)\Mono.*.dll" PackagePath="build\$(TargetFramework)" />
     </ItemGroup>
   </Target>