Reduce target framework of Reqnroll to netstandard2.0 (#130)

* remove obsolete and unnecessary if pragmas * remove .NET 6.0 from target frameworks * Add PlatformInformation, fix ns Reqnroll.Compatibility to Reqnroll.PlatformCompatibility * Reduce target framework of Reqnroll project to netstandard2.0 * TEMP: Add platform information * Improve error diagnostics for plugin loader errors * Revert "TEMP: Add platform information" This reverts commit 6e08680. * add word to dictionary * Treat Mono as .NET Framework * small improvement on MainDotNetFrameworkDescription * Reduce target framework of plugin projects to netstandard2.0 * further fixes and simplifications * Replace netcoreapp3.1 with netstandard2.0 for tools and generator * Remove net6.0 from tools and generator * Temporary fix for build problem * Proper fix for build problem * project cleanup * Reduce target framework of generator projects to netstandard2.0 * Make Reqnroll.ExternalData.ReqnrollPlugin single target (netstandard2.0) * update plugins docs * cleanup targets * Make Reqnroll.MSTest.Generator.ReqnrollPlugin single target (netstandard2.0) * cleanup targets * Make Reqnroll.NUnit.Generator.ReqnrollPlugin single target (netstandard2.0) * Make Reqnroll.xUnit.Generator.ReqnrollPlugin single target (netstandard2.0) * cleanup targets * extend CHANGELOG * update ncrunch settings * small fix for Reqnroll.SpecFlowCompatibility
reqnroll · May 21, 2024 · 36d355f · 36d355f
1 parent a8241b8
commit 36d355f
Show file tree

Hide file tree

Showing 98 changed files with 271 additions and 507 deletions.
diff --git a/.gitignore b/.gitignore
@@ -385,3 +385,4 @@ docs/_build/*
 /docs/Lib/
 /docs/Scripts/
 /docs/pyvenv.cfg
+nCrunchTemp*.csproj
diff --git a/.ncrunch/Reqnroll.Autofac.ReqnrollPlugin.v3.ncrunchproject b/.ncrunch/Reqnroll.Autofac.ReqnrollPlugin.v3.ncrunchproject
@@ -1,8 +1,3 @@
 <ProjectConfiguration>
-  <Settings>
-    <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
-    </CustomBuildProperties>
-    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
-  </Settings>
+  <Settings />
 </ProjectConfiguration>
diff --git a/.ncrunch/Reqnroll.CustomPlugin.v3.ncrunchproject b/.ncrunch/Reqnroll.CustomPlugin.v3.ncrunchproject
@@ -1,8 +1,5 @@
 <ProjectConfiguration>
   <Settings>
-    <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
-    </CustomBuildProperties>
     <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
   </Settings>
 </ProjectConfiguration>
diff --git a/.ncrunch/Reqnroll.ExternalData.ReqnrollPlugin.v3.ncrunchproject b/.ncrunch/Reqnroll.ExternalData.ReqnrollPlugin.v3.ncrunchproject
@@ -1,8 +1,3 @@
 <ProjectConfiguration>
-  <Settings>
-    <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
-    </CustomBuildProperties>
-    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
-  </Settings>
+  <Settings />
 </ProjectConfiguration>
diff --git a/.ncrunch/Reqnroll.Generator.v3.ncrunchproject b/.ncrunch/Reqnroll.Generator.v3.ncrunchproject
@@ -1,8 +1,3 @@
 <ProjectConfiguration>
-  <Settings>
-    <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
-    </CustomBuildProperties>
-    <IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
-  </Settings>
+  <Settings />
 </ProjectConfiguration>
diff --git a/.ncrunch/Reqnroll.GeneratorTests.v3.ncrunchproject b/.ncrunch/Reqnroll.GeneratorTests.v3.ncrunchproject
@@ -1,6 +1,5 @@
 <ProjectConfiguration>
   <Settings>
     <ConsiderInconclusiveTestsAsPassing>True</ConsiderInconclusiveTestsAsPassing>
-    <IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
   </Settings>
 </ProjectConfiguration>
diff --git a/.ncrunch/Reqnroll.MSTest.Generator.ReqnrollPlugin.v3.ncrunchproject b/.ncrunch/Reqnroll.MSTest.Generator.ReqnrollPlugin.v3.ncrunchproject
@@ -1,8 +1,7 @@
 <ProjectConfiguration>
   <Settings>
     <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
+      <Value>TargetFrameworks = netstandard2.0</Value>
     </CustomBuildProperties>
-    <IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
   </Settings>
 </ProjectConfiguration>
diff --git a/.ncrunch/Reqnroll.MSTest.ReqnrollPlugin.v3.ncrunchproject b/.ncrunch/Reqnroll.MSTest.ReqnrollPlugin.v3.ncrunchproject
@@ -1,8 +1,5 @@
 <ProjectConfiguration>
   <Settings>
-    <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
-    </CustomBuildProperties>
     <IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
   </Settings>
 </ProjectConfiguration>
diff --git a/.ncrunch/Reqnroll.NUnit.Generator.ReqnrollPlugin.v3.ncrunchproject b/.ncrunch/Reqnroll.NUnit.Generator.ReqnrollPlugin.v3.ncrunchproject
@@ -1,8 +1,5 @@
 <ProjectConfiguration>
   <Settings>
-    <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
-    </CustomBuildProperties>
-    <IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
+    <NUnit3Enabled>False</NUnit3Enabled>
   </Settings>
 </ProjectConfiguration>
diff --git a/.ncrunch/Reqnroll.NUnit.ReqnrollPlugin.v3.ncrunchproject b/.ncrunch/Reqnroll.NUnit.ReqnrollPlugin.v3.ncrunchproject
@@ -1,8 +1,5 @@
 <ProjectConfiguration>
   <Settings>
-    <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
-    </CustomBuildProperties>
-    <IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
+    <NUnit3Enabled>False</NUnit3Enabled>
   </Settings>
 </ProjectConfiguration>
diff --git a/.ncrunch/Reqnroll.PluginTests.v3.ncrunchproject b/.ncrunch/Reqnroll.PluginTests.v3.ncrunchproject
@@ -1,5 +1,15 @@
 <ProjectConfiguration>
   <Settings>
-    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+    <AdditionalFilesToIncludeForProject>
+      <Value>ExternalData\SampleFiles\**.*</Value>
+    </AdditionalFilesToIncludeForProject>
+    <IgnoredTests>
+      <NamedTestSelector>
+        <TestName>Reqnroll.PluginTests.Generator.GeneratorPluginLoaderTests.LoadPlugin_LoadXUnitSuccessfully</TestName>
+      </NamedTestSelector>
+      <NamedTestSelector>
+        <TestName>Reqnroll.PluginTests.Infrastructure.WindsorPluginTests.Can_load_Windsor_plugin</TestName>
+      </NamedTestSelector>
+    </IgnoredTests>
   </Settings>
 </ProjectConfiguration>
diff --git a/.ncrunch/Reqnroll.SpecFlowCompatibility.Generator.ReqnrollPlugin.v3.ncrunchproject b/.ncrunch/Reqnroll.SpecFlowCompatibility.Generator.ReqnrollPlugin.v3.ncrunchproject
@@ -1,8 +1,7 @@
 <ProjectConfiguration>
   <Settings>
     <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
+      <Value>TargetFrameworks = netstandard2.0</Value>
     </CustomBuildProperties>
-    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
   </Settings>
 </ProjectConfiguration>
diff --git a/.ncrunch/Reqnroll.SpecFlowCompatibility.ReqnrollPlugin.v3.ncrunchproject b/.ncrunch/Reqnroll.SpecFlowCompatibility.ReqnrollPlugin.v3.ncrunchproject
@@ -1,8 +1,7 @@
 <ProjectConfiguration>
   <Settings>
     <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
+      <Value>TargetFrameworks = netstandard2.0</Value>
     </CustomBuildProperties>
-    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
   </Settings>
 </ProjectConfiguration>
diff --git a/.ncrunch/Reqnroll.Templates.DotNet.v3.ncrunchproject b/.ncrunch/Reqnroll.Templates.DotNet.v3.ncrunchproject
@@ -1,8 +1,5 @@
 <ProjectConfiguration>
   <Settings>
-    <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
-    </CustomBuildProperties>
     <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
   </Settings>
 </ProjectConfiguration>
diff --git a/.ncrunch/Reqnroll.Tools.MsBuild.Generation.v3.ncrunchproject b/.ncrunch/Reqnroll.Tools.MsBuild.Generation.v3.ncrunchproject
@@ -1,8 +1,7 @@
 <ProjectConfiguration>
   <Settings>
     <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
+      <Value>TargetFrameworks = netstandard2.0</Value>
     </CustomBuildProperties>
-    <IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
   </Settings>
 </ProjectConfiguration>
diff --git a/.ncrunch/Reqnroll.Verify.ReqnrollPlugin.v3.ncrunchproject b/.ncrunch/Reqnroll.Verify.ReqnrollPlugin.v3.ncrunchproject
@@ -1,8 +1,7 @@
 <ProjectConfiguration>
   <Settings>
     <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
+      <Value>TargetFrameworks = netstandard2.0</Value>
     </CustomBuildProperties>
-    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
   </Settings>
 </ProjectConfiguration>
diff --git a/.ncrunch/Reqnroll.Windsor.ReqnrollPlugin.v3.ncrunchproject b/.ncrunch/Reqnroll.Windsor.ReqnrollPlugin.v3.ncrunchproject
@@ -1,8 +1,3 @@
 <ProjectConfiguration>
-  <Settings>
-    <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
-    </CustomBuildProperties>
-    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
-  </Settings>
+  <Settings />
 </ProjectConfiguration>
diff --git a/.ncrunch/Reqnroll.v3.ncrunchproject b/.ncrunch/Reqnroll.v3.ncrunchproject
@@ -1,7 +1,3 @@
 <ProjectConfiguration>
-  <Settings>
-    <CustomBuildProperties>
-      <Value>TargetFrameworks = netstandard2.0</Value>
-    </CustomBuildProperties>
-  </Settings>
+  <Settings />
 </ProjectConfiguration>
diff --git a/.ncrunch/Reqnroll.xUnit.Generator.ReqnrollPlugin.v3.ncrunchproject b/.ncrunch/Reqnroll.xUnit.Generator.ReqnrollPlugin.v3.ncrunchproject
@@ -1,8 +1,5 @@
 <ProjectConfiguration>
   <Settings>
-    <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
-    </CustomBuildProperties>
-    <IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
+    <XUnit2Enabled>False</XUnit2Enabled>
   </Settings>
 </ProjectConfiguration>
diff --git a/.ncrunch/Reqnroll.xUnit.ReqnrollPlugin.v3.ncrunchproject b/.ncrunch/Reqnroll.xUnit.ReqnrollPlugin.v3.ncrunchproject
@@ -1,8 +1,5 @@
 <ProjectConfiguration>
   <Settings>
-    <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
-    </CustomBuildProperties>
-    <IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
+    <XUnit2Enabled>False</XUnit2Enabled>
   </Settings>
 </ProjectConfiguration>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 * Fix: #111 @ignore attribute is not inherited to the scenarios from Rule
 * Support for JSON files added to SpecFlow.ExternalData
 * Fix: #120 Capture ExecutionContext after every binding invoke
+* Allow creating single target (netstandard2.0) plugins
 * MsTest: Use ClassCleanupBehavior.EndOfClass instead of custom implementation (preparation for MsTest v4.0)
 * Fix: #71 StackOverflowException when using [StepArgumentTransformation] with same input and output type (for example string)
 

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -36,32 +36,9 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Reqnroll_FullFramework_TFM>net462</Reqnroll_FullFramework_TFM>
-
-    <Reqnroll_Net6_TFM>net6.0</Reqnroll_Net6_TFM>
-
-
-    <Reqnroll_FullFramework_Runtime_TFM>$(Reqnroll_FullFramework_TFM)</Reqnroll_FullFramework_Runtime_TFM>
-    <Reqnroll_Core_Runtime_TFM>netstandard2.0</Reqnroll_Core_Runtime_TFM>
-
-    <Reqnroll_FullFramework_Generator_TFM>$(Reqnroll_FullFramework_TFM)</Reqnroll_FullFramework_Generator_TFM>
-    <Reqnroll_Core_Generator_TFM>netcoreapp3.1</Reqnroll_Core_Generator_TFM>
-
-    <Reqnroll_FullFramework_Test_TFM>$(Reqnroll_FullFramework_TFM)</Reqnroll_FullFramework_Test_TFM>
-    <Reqnroll_Core_Test_TFM>netcoreapp3.1;net6.0</Reqnroll_Core_Test_TFM>
-
-    <Reqnroll_FullFramework_Specs_TFM>$(Reqnroll_FullFramework_TFM)</Reqnroll_FullFramework_Specs_TFM>
-    <Reqnroll_Net6_Specs_TFM>$(Reqnroll_Net6_TFM)</Reqnroll_Net6_Specs_TFM>
-
-    <Reqnroll_FullFramework_Tools_TFM>$(Reqnroll_FullFramework_TFM)</Reqnroll_FullFramework_Tools_TFM>
-    <Reqnroll_Core_Tools_TFM>netcoreapp3.1</Reqnroll_Core_Tools_TFM> 
-    <Reqnroll_Net6_Tools_TFM>$(Reqnroll_Net6_TFM)</Reqnroll_Net6_Tools_TFM>
-
-    <Reqnroll_Runtime_TFM>$(Reqnroll_FullFramework_Runtime_TFM);$(Reqnroll_Core_Runtime_TFM);$(Reqnroll_Net6_TFM)</Reqnroll_Runtime_TFM>
-    <Reqnroll_Generator_TFM>$(Reqnroll_FullFramework_Generator_TFM);$(Reqnroll_Core_Generator_TFM);$(Reqnroll_Net6_TFM)</Reqnroll_Generator_TFM>
-    <Reqnroll_Test_TFM>$(Reqnroll_FullFramework_Test_TFM);$(Reqnroll_Core_Test_TFM)</Reqnroll_Test_TFM>
-    <Reqnroll_Specs_TFM>$(Reqnroll_Net6_Specs_TFM)</Reqnroll_Specs_TFM>
-    <Reqnroll_Tools_TFM>$(Reqnroll_FullFramework_Tools_TFM);$(Reqnroll_Core_Tools_TFM);$(Reqnroll_Net6_Tools_TFM)</Reqnroll_Tools_TFM>
+    <!-- for Reqnroll.Tools.MsBuild.Generation -->
+    <Reqnroll_FullFramework_Tools_TFM>net462</Reqnroll_FullFramework_Tools_TFM>
+    <Reqnroll_Core_Tools_TFM>netstandard2.0</Reqnroll_Core_Tools_TFM> 
 
     <Reqnroll_EnableStrongNameSigning>true</Reqnroll_EnableStrongNameSigning>
   </PropertyGroup>

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -8,16 +8,8 @@
       <NuspecProperties>$(NuspecProperties);author=$(Reqnroll_Authors)</NuspecProperties>
       <NuspecProperties>$(NuspecProperties);owner=$(Reqnroll_Owners)</NuspecProperties>
 
-      <NuspecProperties>$(NuspecProperties);Reqnroll_Net6_TFM=$(Reqnroll_Net6_TFM)</NuspecProperties>
-
-      <NuspecProperties>$(NuspecProperties);Reqnroll_FullFramework_Runtime_TFM=$(Reqnroll_FullFramework_Runtime_TFM)</NuspecProperties>
-      <NuspecProperties>$(NuspecProperties);Reqnroll_Core_Runtime_TFM=$(Reqnroll_Core_Runtime_TFM)</NuspecProperties>
-
-      <NuspecProperties>$(NuspecProperties);Reqnroll_FullFramework_Generator_TFM=$(Reqnroll_FullFramework_Generator_TFM)</NuspecProperties>
-      <NuspecProperties>$(NuspecProperties);Reqnroll_Core_Generator_TFM=$(Reqnroll_Core_Generator_TFM)</NuspecProperties>
-
+      <NuspecProperties>$(NuspecProperties);Reqnroll_FullFramework_Tools_TFM=$(Reqnroll_FullFramework_Tools_TFM)</NuspecProperties>
       <NuspecProperties>$(NuspecProperties);Reqnroll_Core_Tools_TFM=$(Reqnroll_Core_Tools_TFM)</NuspecProperties>
-      <NuspecProperties>$(NuspecProperties);Reqnroll_Net6_Tools_TFM=$(Reqnroll_Net6_Tools_TFM)</NuspecProperties>
     </PropertyGroup>
   </Target>
 

diff --git a/Installer/Reqnroll.CustomPlugin/Reqnroll.CustomPlugin.csproj b/Installer/Reqnroll.CustomPlugin/Reqnroll.CustomPlugin.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(Reqnroll_Generator_TFM)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <NuspecFile>$(MSBuildThisFileDirectory)Reqnroll.CustomPlugin.nuspec</NuspecFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 

diff --git a/Installer/Reqnroll.CustomPlugin/Reqnroll.CustomPlugin.nuspec b/Installer/Reqnroll.CustomPlugin/Reqnroll.CustomPlugin.nuspec
@@ -17,33 +17,15 @@
     <copyright>$copyright$</copyright>
     <dependencies>
       <dependency id="Reqnroll" version="[$version$]" />
-      <dependency id="System.Threading.Tasks.Dataflow" version="4.9.0" />
-      <dependency id="System.Collections" version="4.3.0" />
-      <dependency id="System.Diagnostics.Debug" version="4.3.0" />
-      <dependency id="System.Runtime.Extensions" version="4.3.0" />
-      <dependency id="System.Security.Principal" version="4.3.0" />
-      <dependency id="System.Net.Primitives" version="4.3.0" />
-      <dependency id="System.IO.FileSystem" version="4.3.0" />
       <dependency id="System.CodeDom" version="4.4.0" />
     </dependencies>
   </metadata>
 
   <files>
-
-    <file src="bin\$config$\net462\Gherkin.dll" target="lib\$Reqnroll_FullFramework_Runtime_TFM$" />
-    <file src="bin\$config$\net462\Reqnroll.Generator.*" target="lib\$Reqnroll_FullFramework_Runtime_TFM$" />
-    <file src="bin\$config$\net462\Reqnroll.Utils.*" target="lib\$Reqnroll_FullFramework_Runtime_TFM$" />
-    <file src="bin\$config$\net462\Reqnroll.Parser.*" target="lib\$Reqnroll_FullFramework_Runtime_TFM$" />
-
-    <file src="bin\$config$\netcoreapp3.1\Gherkin.dll" target="lib\$Reqnroll_Core_Runtime_TFM$" />
-    <file src="bin\$config$\netcoreapp3.1\Reqnroll.Generator.*" target="lib\$Reqnroll_Core_Runtime_TFM$" />
-    <file src="bin\$config$\netcoreapp3.1\Reqnroll.Utils.*" target="lib\$Reqnroll_Core_Runtime_TFM$" />
-    <file src="bin\$config$\netcoreapp3.1\Reqnroll.Parser.*" target="lib\$Reqnroll_Core_Runtime_TFM$" />
-
-    <file src="bin\$config$\net6.0\Gherkin.dll" target="lib\$Reqnroll_Net6_TFM$" />
-    <file src="bin\$config$\net6.0\Reqnroll.Generator.*" target="lib\$Reqnroll_Net6_TFM$" />
-    <file src="bin\$config$\net6.0\Reqnroll.Utils.*" target="lib\$Reqnroll_Net6_TFM$" />
-    <file src="bin\$config$\net6.0\Reqnroll.Parser.*" target="lib\$Reqnroll_Net6_TFM$" />
+    <file src="bin\$config$\netstandard2.0\Gherkin.dll" target="lib\netstandard2.0" />
+    <file src="bin\$config$\netstandard2.0\Reqnroll.Generator.*" target="lib\netstandard2.0" />
+    <file src="bin\$config$\netstandard2.0\Reqnroll.Utils.*" target="lib\netstandard2.0" />
+    <file src="bin\$config$\netstandard2.0\Reqnroll.Parser.*" target="lib\netstandard2.0" />
 
     <file src="$SolutionDir$Licenses\Gherkin-LICENSE-MIT.txt" target="Licenses" />
     <file src="$SolutionDir$Licenses\BoDi-LICENSE-Apache2.txt" target="Licenses" />

diff --git a/Plugins/Reqnroll.Autofac.ReqnrollPlugin/Reqnroll.Autofac.ReqnrollPlugin.csproj b/Plugins/Reqnroll.Autofac.ReqnrollPlugin/Reqnroll.Autofac.ReqnrollPlugin.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(Reqnroll_Runtime_TFM)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <AssemblyOriginatorKeyFile>$(Reqnroll_KeyFile)</AssemblyOriginatorKeyFile>
     <SignAssembly>$(Reqnroll_EnableStrongNameSigning)</SignAssembly>
     <PublicSign>$(Reqnroll_PublicSign)</PublicSign>

diff --git a/Plugins/Reqnroll.Autofac.ReqnrollPlugin/Reqnroll.Autofac.nuspec b/Plugins/Reqnroll.Autofac.ReqnrollPlugin/Reqnroll.Autofac.nuspec
@@ -16,29 +16,17 @@
     <license type="file">LICENSE</license>
     <tags>reqnroll autofac di dependency injection</tags>
     <dependencies>
-      <group targetFramework=".NETFramework4.6.2">
-        <dependency id="Reqnroll" version="[$version$]" />
-        <dependency id="Autofac" version="4.0.0" />
-      </group>
       <group targetFramework=".NETStandard2.0">
         <dependency id="Reqnroll" version="[$version$]" />
         <dependency id="Autofac" version="4.0.0" />
       </group>
-      <group targetFramework="net6.0">
-        <dependency id="Reqnroll" version="[$version$]" />
-        <dependency id="Autofac" version="4.0.0" />
-      </group>
     </dependencies>
   </metadata>
 
   <files>
     <file src="build\**\*" target="build" />
-    <file src="bin\$config$\net462\Reqnroll.Autofac.ReqnrollPlugin.*" target="lib\$Reqnroll_FullFramework_Runtime_TFM$" />
-    <file src="bin\$config$\netstandard2.0\Reqnroll.Autofac.ReqnrollPlugin.dll" target="lib\$Reqnroll_Core_Runtime_TFM$" />
-    <file src="bin\$config$\netstandard2.0\Reqnroll.Autofac.ReqnrollPlugin.pdb" target="lib\$Reqnroll_Core_Runtime_TFM$" />
-
-    <file src="bin\$config$\net6.0\Reqnroll.Autofac.ReqnrollPlugin.dll" target="lib\$Reqnroll_Net6_TFM$" />
-    <file src="bin\$config$\net6.0\Reqnroll.Autofac.ReqnrollPlugin.pdb" target="lib\$Reqnroll_Net6_TFM$" />
+    <file src="bin\$config$\netstandard2.0\Reqnroll.Autofac.ReqnrollPlugin.dll" target="lib\netstandard2.0" />
+    <file src="bin\$config$\netstandard2.0\Reqnroll.Autofac.ReqnrollPlugin.pdb" target="lib\netstandard2.0" />
 
     <file src="$SolutionDir$LICENSE" target="LICENSE" />
     <file src="$SolutionDir$reqnroll-icon.png" target="images\" />

diff --git a/Plugins/Reqnroll.Autofac.ReqnrollPlugin/build/Reqnroll.Autofac.targets b/Plugins/Reqnroll.Autofac.ReqnrollPlugin/build/Reqnroll.Autofac.targets
@@ -1,8 +1,7 @@
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
 
-    <_Reqnroll_AutofacPluginFramework Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' ">netstandard2.0</_Reqnroll_AutofacPluginFramework>
-    <_Reqnroll_AutofacPluginFramework Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">net462</_Reqnroll_AutofacPluginFramework>
+    <_Reqnroll_AutofacPluginFramework>netstandard2.0</_Reqnroll_AutofacPluginFramework>
     <_Reqnroll_AutofacPluginPath>$(MSBuildThisFileDirectory)\..\lib\$(_Reqnroll_AutofacPluginFramework)\Reqnroll.Autofac.ReqnrollPlugin.dll</_Reqnroll_AutofacPluginPath>
   </PropertyGroup>
 </Project>
diff --git a/...eqnrollPlugin.IntegrationTest/Reqnroll.ExternalData.ReqnrollPlugin.IntegrationTest.csproj b/...eqnrollPlugin.IntegrationTest/Reqnroll.ExternalData.ReqnrollPlugin.IntegrationTest.csproj
@@ -24,21 +24,21 @@
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-    <_Reqnroll_Needed_MSBuildGenerator Condition=" '$(MSBuildRuntimeType)' == 'Core'">$(Reqnroll_Core_Generator_TFM)</_Reqnroll_Needed_MSBuildGenerator>
-    <_Reqnroll_Needed_MSBuildGenerator Condition=" '$(MSBuildRuntimeType)' != 'Core'">$(Reqnroll_FullFramework_Generator_TFM)</_Reqnroll_Needed_MSBuildGenerator>
+    <_Reqnroll_Needed_MSBuildGenerator Condition=" '$(MSBuildRuntimeType)' == 'Core'">$(Reqnroll_Core_Tools_TFM)</_Reqnroll_Needed_MSBuildGenerator>
+    <_Reqnroll_Needed_MSBuildGenerator Condition=" '$(MSBuildRuntimeType)' != 'Core'">$(Reqnroll_FullFramework_Tools_TFM)</_Reqnroll_Needed_MSBuildGenerator>
   </PropertyGroup>
 
   <Target Name="PreBuild">
     <MSBuild Projects="..\..\..\Reqnroll.Tools.MsBuild.Generation\Reqnroll.Tools.MsBuild.Generation.csproj" ContinueOnError="false" Properties="TargetFramework=$(_Reqnroll_Needed_MSBuildGenerator)" />
-    <MSBuild Projects="..\Reqnroll.ExternalData.ReqnrollPlugin\Reqnroll.ExternalData.ReqnrollPlugin.csproj" ContinueOnError="false" Properties="TargetFramework=$(_Reqnroll_Needed_MSBuildGenerator)" />
+    <MSBuild Projects="..\Reqnroll.ExternalData.ReqnrollPlugin\Reqnroll.ExternalData.ReqnrollPlugin.csproj" ContinueOnError="false" Properties="TargetFramework=netstandard2.0" />
   </Target>
 
   <ItemGroup>
-    <ReqnrollGeneratorPlugins Include="$(MSBuildThisFileDirectory)..\Reqnroll.ExternalData.ReqnrollPlugin\bin\$(Configuration)\$(_Reqnroll_Needed_MSBuildGenerator)\Reqnroll.ExternalData.ReqnrollPlugin.dll" />
+    <ReqnrollGeneratorPlugins Include="$(MSBuildThisFileDirectory)..\Reqnroll.ExternalData.ReqnrollPlugin\bin\$(Configuration)\netstandard2.0\Reqnroll.ExternalData.ReqnrollPlugin.dll" />
   </ItemGroup>
 
   <PropertyGroup>
-    <_Reqnroll_TaskAssembly>..\..\Reqnroll.Tools.MsBuild.Generation\bin\$(Configuration)\$(_Reqnroll_Needed_MSBuildGenerator)\Reqnroll.Tools.MsBuild.Generation.dll</_Reqnroll_TaskAssembly>
+    <_Reqnroll_TaskAssembly>..\..\Reqnroll.Tools.MsBuild.Generation\bin\$(Configuration)\$(_Reqnroll_Needed_MSBuildGenerator)\tasks\Reqnroll.Tools.MsBuild.Generation.dll</_Reqnroll_TaskAssembly>
   </PropertyGroup>
 
   <Import Project="..\..\..\Reqnroll.Tools.MsBuild.Generation\build\Reqnroll.Tools.MsBuild.Generation.targets" />