Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reduce target framework of Reqnroll to netstandard2.0 #130

Merged
merged 30 commits into from
May 21, 2024
Merged

Reduce target framework of Reqnroll to netstandard2.0 #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
7484dc2
remove obsolete and unnecessary if pragmas
gasparnagy May 14, 2024
bd7b8da
remove .NET 6.0 from target frameworks
gasparnagy May 14, 2024
5eafe11
Add PlatformInformation, fix ns Reqnroll.Compatibility to Reqnroll.Pl…
gasparnagy May 14, 2024
3842e98
Reduce target framework of Reqnroll project to netstandard2.0
gasparnagy May 14, 2024
959c154
TEMP: Add platform information
gasparnagy May 14, 2024
36e6893
Improve error diagnostics for plugin loader errors
gasparnagy May 14, 2024
06e0fe9
Revert "TEMP: Add platform information"
gasparnagy May 14, 2024
bdad1a1
add word to dictionary
gasparnagy May 14, 2024
f2867ff
Treat Mono as .NET Framework
gasparnagy May 14, 2024
2edb958
small improvement on MainDotNetFrameworkDescription
gasparnagy May 14, 2024
87841d7
Reduce target framework of plugin projects to netstandard2.0
gasparnagy May 14, 2024
ae7c86a
further fixes and simplifications
gasparnagy May 14, 2024
209d9e7
Replace netcoreapp3.1 with netstandard2.0 for tools and generator
gasparnagy May 15, 2024
ff3e8b0
Remove net6.0 from tools and generator
gasparnagy May 15, 2024
81d203c
Temporary fix for build problem
gasparnagy May 15, 2024
7207606
Proper fix for build problem
gasparnagy May 15, 2024
be85072
project cleanup
gasparnagy May 15, 2024
9ac1ca9
Reduce target framework of generator projects to netstandard2.0
gasparnagy May 15, 2024
04b5f5c
Make Reqnroll.ExternalData.ReqnrollPlugin single target (netstandard2.0)
gasparnagy May 15, 2024
8c45e42
update plugins docs
gasparnagy May 15, 2024
be0dfa1
cleanup targets
gasparnagy May 15, 2024
360e55f
Make Reqnroll.MSTest.Generator.ReqnrollPlugin single target (netstand…
gasparnagy May 15, 2024
25724fc
cleanup targets
gasparnagy May 15, 2024
e055dca
Make Reqnroll.NUnit.Generator.ReqnrollPlugin single target (netstanda…
gasparnagy May 15, 2024
2c0a944
Make Reqnroll.xUnit.Generator.ReqnrollPlugin single target (netstanda…
gasparnagy May 15, 2024
8cc0b44
cleanup targets
gasparnagy May 15, 2024
d444b0a
extend CHANGELOG
gasparnagy May 15, 2024
82804a0
update ncrunch settings
gasparnagy May 15, 2024
8439154
Merge branch 'main' into simplify-target-fw
gasparnagy May 15, 2024
70f52e2
small fix for Reqnroll.SpecFlowCompatibility
gasparnagy May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,3 +385,4 @@ docs/_build/*
/docs/Lib/
/docs/Scripts/
/docs/pyvenv.cfg
nCrunchTemp*.csproj
7 changes: 1 addition & 6 deletions .ncrunch/Reqnroll.Autofac.ReqnrollPlugin.v3.ncrunchproject
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
<ProjectConfiguration>
<Settings>
<CustomBuildProperties>
<Value>TargetFrameworks = net6.0</Value>
</CustomBuildProperties>
<IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
</Settings>
<Settings />
</ProjectConfiguration>
3 changes: 0 additions & 3 deletions .ncrunch/Reqnroll.CustomPlugin.v3.ncrunchproject
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
<ProjectConfiguration>
<Settings>
<CustomBuildProperties>
<Value>TargetFrameworks = net6.0</Value>
</CustomBuildProperties>
<IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
</Settings>
</ProjectConfiguration>
7 changes: 1 addition & 6 deletions .ncrunch/Reqnroll.ExternalData.ReqnrollPlugin.v3.ncrunchproject
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
<ProjectConfiguration>
<Settings>
<CustomBuildProperties>
<Value>TargetFrameworks = net6.0</Value>
</CustomBuildProperties>
<IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
</Settings>
<Settings />
</ProjectConfiguration>
7 changes: 1 addition & 6 deletions .ncrunch/Reqnroll.Generator.v3.ncrunchproject
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
<ProjectConfiguration>
<Settings>
<CustomBuildProperties>
<Value>TargetFrameworks = net6.0</Value>
</CustomBuildProperties>
<IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
</Settings>
<Settings />
</ProjectConfiguration>
1 change: 0 additions & 1 deletion .ncrunch/Reqnroll.GeneratorTests.v3.ncrunchproject
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<ProjectConfiguration>
<Settings>
<ConsiderInconclusiveTestsAsPassing>True</ConsiderInconclusiveTestsAsPassing>
<IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
</Settings>
</ProjectConfiguration>
3 changes: 1 addition & 2 deletions .ncrunch/Reqnroll.MSTest.Generator.ReqnrollPlugin.v3.ncrunchproject
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<ProjectConfiguration>
<Settings>
<CustomBuildProperties>
<Value>TargetFrameworks = net6.0</Value>
<Value>TargetFrameworks = netstandard2.0</Value>
</CustomBuildProperties>
<IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
</Settings>
</ProjectConfiguration>
3 changes: 0 additions & 3 deletions .ncrunch/Reqnroll.MSTest.ReqnrollPlugin.v3.ncrunchproject
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
<ProjectConfiguration>
<Settings>
<CustomBuildProperties>
<Value>TargetFrameworks = net6.0</Value>
</CustomBuildProperties>
<IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
</Settings>
</ProjectConfiguration>
5 changes: 1 addition & 4 deletions .ncrunch/Reqnroll.NUnit.Generator.ReqnrollPlugin.v3.ncrunchproject
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
<ProjectConfiguration>
<Settings>
<CustomBuildProperties>
<Value>TargetFrameworks = net6.0</Value>
</CustomBuildProperties>
<IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
<NUnit3Enabled>False</NUnit3Enabled>
</Settings>
</ProjectConfiguration>
5 changes: 1 addition & 4 deletions .ncrunch/Reqnroll.NUnit.ReqnrollPlugin.v3.ncrunchproject
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
<ProjectConfiguration>
<Settings>
<CustomBuildProperties>
<Value>TargetFrameworks = net6.0</Value>
</CustomBuildProperties>
<IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
<NUnit3Enabled>False</NUnit3Enabled>
</Settings>
</ProjectConfiguration>
12 changes: 11 additions & 1 deletion .ncrunch/Reqnroll.PluginTests.v3.ncrunchproject
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
3 changes: 1 addition & 2 deletions .ncrunch/Reqnroll.SpecFlowCompatibility.Generator.ReqnrollPlugin.v3.ncrunchproject
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<ProjectConfiguration>
<Settings>
<CustomBuildProperties>
<Value>TargetFrameworks = net6.0</Value>
<Value>TargetFrameworks = netstandard2.0</Value>
</CustomBuildProperties>
<IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
</Settings>
</ProjectConfiguration>
3 changes: 1 addition & 2 deletions .ncrunch/Reqnroll.SpecFlowCompatibility.ReqnrollPlugin.v3.ncrunchproject
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<ProjectConfiguration>
<Settings>
<CustomBuildProperties>
<Value>TargetFrameworks = net6.0</Value>
<Value>TargetFrameworks = netstandard2.0</Value>
</CustomBuildProperties>
<IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
</Settings>
</ProjectConfiguration>
3 changes: 0 additions & 3 deletions .ncrunch/Reqnroll.Templates.DotNet.v3.ncrunchproject
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
<ProjectConfiguration>
<Settings>
<CustomBuildProperties>
<Value>TargetFrameworks = net6.0</Value>
</CustomBuildProperties>
<IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
</Settings>
</ProjectConfiguration>
3 changes: 1 addition & 2 deletions .ncrunch/Reqnroll.Tools.MsBuild.Generation.v3.ncrunchproject
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<ProjectConfiguration>
<Settings>
<CustomBuildProperties>
<Value>TargetFrameworks = net6.0</Value>
<Value>TargetFrameworks = netstandard2.0</Value>
</CustomBuildProperties>
<IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
</Settings>
</ProjectConfiguration>
3 changes: 1 addition & 2 deletions .ncrunch/Reqnroll.Verify.ReqnrollPlugin.v3.ncrunchproject
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<ProjectConfiguration>
<Settings>
<CustomBuildProperties>
<Value>TargetFrameworks = net6.0</Value>
<Value>TargetFrameworks = netstandard2.0</Value>
</CustomBuildProperties>
<IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
</Settings>
</ProjectConfiguration>
7 changes: 1 addition & 6 deletions .ncrunch/Reqnroll.Windsor.ReqnrollPlugin.v3.ncrunchproject
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
<ProjectConfiguration>
<Settings>
<CustomBuildProperties>
<Value>TargetFrameworks = net6.0</Value>
</CustomBuildProperties>
<IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
</Settings>
<Settings />
</ProjectConfiguration>
6 changes: 1 addition & 5 deletions .ncrunch/Reqnroll.v3.ncrunchproject
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
<ProjectConfiguration>
<Settings>
<CustomBuildProperties>
<Value>TargetFrameworks = netstandard2.0</Value>
</CustomBuildProperties>
</Settings>
<Settings />
</ProjectConfiguration>
5 changes: 1 addition & 4 deletions .ncrunch/Reqnroll.xUnit.Generator.ReqnrollPlugin.v3.ncrunchproject
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
<ProjectConfiguration>
<Settings>
<CustomBuildProperties>
<Value>TargetFrameworks = net6.0</Value>
</CustomBuildProperties>
<IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
<XUnit2Enabled>False</XUnit2Enabled>
</Settings>
</ProjectConfiguration>
5 changes: 1 addition & 4 deletions .ncrunch/Reqnroll.xUnit.ReqnrollPlugin.v3.ncrunchproject
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
<ProjectConfiguration>
<Settings>
<CustomBuildProperties>
<Value>TargetFrameworks = net6.0</Value>
</CustomBuildProperties>
<IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
<XUnit2Enabled>False</XUnit2Enabled>
</Settings>
</ProjectConfiguration>
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

# v1.0.1 - 2024-02-16
Expand Down
29 changes: 3 additions & 26 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 1 addition & 9 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion Installer/Reqnroll.CustomPlugin/Reqnroll.CustomPlugin.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>

Expand Down
26 changes: 4 additions & 22 deletions Installer/Reqnroll.CustomPlugin/Reqnroll.CustomPlugin.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion Plugins/Reqnroll.Autofac.ReqnrollPlugin/Reqnroll.Autofac.ReqnrollPlugin.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
16 changes: 2 additions & 14 deletions Plugins/Reqnroll.Autofac.ReqnrollPlugin/Reqnroll.Autofac.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\" />
Expand Down
3 changes: 1 addition & 2 deletions Plugins/Reqnroll.Autofac.ReqnrollPlugin/build/Reqnroll.Autofac.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
10 changes: 5 additions & 5 deletions ...eqnrollPlugin.IntegrationTest/Reqnroll.ExternalData.ReqnrollPlugin.IntegrationTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Loading