Skip to content

Commit

Permalink
further fixes and simplifications
Browse files Browse the repository at this point in the history
  • Loading branch information
gasparnagy committed May 14, 2024
1 parent 66fac32 commit b02c5b8
Show file tree
Hide file tree
Showing 15 changed files with 40 additions and 82 deletions.
30 changes: 8 additions & 22 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -36,31 +36,17 @@
</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>
<!-- for Generators -->
<Reqnroll_FullFramework_Generator_TFM>net462</Reqnroll_FullFramework_Generator_TFM>
<Reqnroll_Core_Generator_TFM>netcoreapp3.1</Reqnroll_Core_Generator_TFM>
<Reqnroll_Net6_Generator_TFM>net6.0</Reqnroll_Net6_Generator_TFM>
<Reqnroll_Generator_TFM>net462;netcoreapp3.1;net6.0</Reqnroll_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>
<!-- for Reqnroll.Tools.MsBuild.Generation -->
<Reqnroll_FullFramework_Tools_TFM>net462</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_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>
<Reqnroll_Net6_Tools_TFM>net6.0</Reqnroll_Net6_Tools_TFM>
<Reqnroll_Tools_TFM>net462;netcoreapp3.1;net6.0</Reqnroll_Tools_TFM>

<Reqnroll_EnableStrongNameSigning>true</Reqnroll_EnableStrongNameSigning>
</PropertyGroup>
Expand Down
3 changes: 1 addition & 2 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@
<NuspecProperties>$(NuspecProperties);author=$(Reqnroll_Authors)</NuspecProperties>
<NuspecProperties>$(NuspecProperties);owner=$(Reqnroll_Owners)</NuspecProperties>

<NuspecProperties>$(NuspecProperties);Reqnroll_Net6_TFM=$(Reqnroll_Net6_TFM)</NuspecProperties>
<NuspecProperties>$(NuspecProperties);Reqnroll_Net6_Generator_TFM=$(Reqnroll_Net6_Generator_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>
Expand Down
24 changes: 12 additions & 12 deletions Installer/Reqnroll.CustomPlugin/Reqnroll.CustomPlugin.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,20 @@

<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$\net462\Gherkin.dll" target="lib\$Reqnroll_FullFramework_Generator_TFM$" />
<file src="bin\$config$\net462\Reqnroll.Generator.*" target="lib\$Reqnroll_FullFramework_Generator_TFM$" />
<file src="bin\$config$\net462\Reqnroll.Utils.*" target="lib\$Reqnroll_FullFramework_Generator_TFM$" />
<file src="bin\$config$\net462\Reqnroll.Parser.*" target="lib\$Reqnroll_FullFramework_Generator_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$\netcoreapp3.1\Gherkin.dll" target="lib\netstandard2.0" />
<file src="bin\$config$\netcoreapp3.1\Reqnroll.Generator.*" target="lib\netstandard2.0" />
<file src="bin\$config$\netcoreapp3.1\Reqnroll.Utils.*" target="lib\netstandard2.0" />
<file src="bin\$config$\netcoreapp3.1\Reqnroll.Parser.*" target="lib\netstandard2.0" />

<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$\net6.0\Gherkin.dll" target="lib\$Reqnroll_Net6_Generator_TFM$" />
<file src="bin\$config$\net6.0\Reqnroll.Generator.*" target="lib\$Reqnroll_Net6_Generator_TFM$" />
<file src="bin\$config$\net6.0\Reqnroll.Utils.*" target="lib\$Reqnroll_Net6_Generator_TFM$" />
<file src="bin\$config$\net6.0\Reqnroll.Parser.*" target="lib\$Reqnroll_Net6_Generator_TFM$" />

<file src="$SolutionDir$Licenses\Gherkin-LICENSE-MIT.txt" target="Licenses" />
<file src="$SolutionDir$Licenses\BoDi-LICENSE-Apache2.txt" target="Licenses" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<file src="bin\$config$\net462\Reqnroll.MSTest.Generator.ReqnrollPlugin.*" target="build\$Reqnroll_FullFramework_Generator_TFM$" />
<file src="bin\$config$\netcoreapp3.1\Reqnroll.MSTest.Generator.ReqnrollPlugin.dll" target="build\$Reqnroll_Core_Generator_TFM$" />
<file src="bin\$config$\netcoreapp3.1\Reqnroll.MSTest.Generator.ReqnrollPlugin.pdb" target="build\$Reqnroll_Core_Generator_TFM$" />
<file src="bin\$config$\net6.0\Reqnroll.MSTest.Generator.ReqnrollPlugin.*" target="build\$Reqnroll_Net6_TFM$" />
<file src="bin\$config$\net6.0\Reqnroll.MSTest.Generator.ReqnrollPlugin.*" target="build\$Reqnroll_Net6_Generator_TFM$" />

<file src="$SolutionDir$LICENSE" target="LICENSE" />
<file src="$SolutionDir$reqnroll-icon.png" target="images\" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<file src="bin\$config$\net462\Reqnroll.NUnit.Generator.ReqnrollPlugin.*" target="build\$Reqnroll_FullFramework_Generator_TFM$" />
<file src="bin\$config$\netcoreapp3.1\Reqnroll.NUnit.Generator.ReqnrollPlugin.dll" target="build\$Reqnroll_Core_Generator_TFM$" />
<file src="bin\$config$\netcoreapp3.1\Reqnroll.NUnit.Generator.ReqnrollPlugin.pdb" target="build\$Reqnroll_Core_Generator_TFM$" />
<file src="bin\$config$\net6.0\Reqnroll.NUnit.Generator.ReqnrollPlugin.*" target="build\$Reqnroll_Net6_TFM$" />
<file src="bin\$config$\net6.0\Reqnroll.NUnit.Generator.ReqnrollPlugin.*" target="build\$Reqnroll_Net6_Generator_TFM$" />

<file src="$SolutionDir$LICENSE" target="LICENSE" />
<file src="$SolutionDir$reqnroll-icon.png" target="images\" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</ProjectReference>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == '$(Reqnroll_FullFramework_Runtime_TFM)'">
<ItemGroup Condition="'$(TargetFramework)' == '$(Reqnroll_FullFramework_Generator_TFM)'">
<Reference Include="System.Configuration" />
<Compile Include="..\Reqnroll.SpecFlowCompatibility.ReqnrollPlugin\AppConfig\*.cs">
<Link>AppConfig\%(RecursiveDir)%(Filename)%(Extension)</Link>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
<tags>reqnroll specflow</tags>
<copyright>$copyright$</copyright>
<dependencies>
<group targetFramework=".NETFramework4.6.2">
<dependency id="Reqnroll" version="[$version$]" />
</group>
<group targetFramework=".NETStandard2.0">
<dependency id="Reqnroll" version="[$version$]" />
</group>
Expand All @@ -24,13 +27,14 @@

<files>
<file src="build\**\*" exclude="build\*.template.*" target="build" />
<file src="..\Reqnroll.SpecFlowCompatibility.ReqnrollPlugin\bin\$config$\netstandard2.0\Reqnroll.SpecFlowCompatibility.ReqnrollPlugin.dll" target="lib\$Reqnroll_Core_Runtime_TFM$" />
<file src="..\Reqnroll.SpecFlowCompatibility.ReqnrollPlugin\bin\$config$\netstandard2.0\Reqnroll.SpecFlowCompatibility.ReqnrollPlugin.pdb" target="lib\$Reqnroll_Core_Runtime_TFM$" />
<file src="..\Reqnroll.SpecFlowCompatibility.ReqnrollPlugin\bin\$config$\net462\Reqnroll.SpecFlowCompatibility.ReqnrollPlugin.*" target="lib\net462" />
<file src="..\Reqnroll.SpecFlowCompatibility.ReqnrollPlugin\bin\$config$\netstandard2.0\Reqnroll.SpecFlowCompatibility.ReqnrollPlugin.dll" target="lib\netstandard2.0" />
<file src="..\Reqnroll.SpecFlowCompatibility.ReqnrollPlugin\bin\$config$\netstandard2.0\Reqnroll.SpecFlowCompatibility.ReqnrollPlugin.pdb" target="lib\netstandard2.0" />

<file src="bin\$config$\net462\Reqnroll.SpecFlowCompatibility.Generator.ReqnrollPlugin.*" target="build\$Reqnroll_FullFramework_Generator_TFM$" />
<file src="bin\$config$\netcoreapp3.1\Reqnroll.SpecFlowCompatibility.Generator.ReqnrollPlugin.dll" target="build\$Reqnroll_Core_Generator_TFM$" />
<file src="bin\$config$\netcoreapp3.1\Reqnroll.SpecFlowCompatibility.Generator.ReqnrollPlugin.pdb" target="build\$Reqnroll_Core_Generator_TFM$" />
<file src="bin\$config$\net6.0\Reqnroll.SpecFlowCompatibility.Generator.ReqnrollPlugin.*" target="build\$Reqnroll_Net6_TFM$" />
<file src="bin\$config$\net6.0\Reqnroll.SpecFlowCompatibility.Generator.ReqnrollPlugin.*" target="build\$Reqnroll_Net6_Generator_TFM$" />

<file src="$SolutionDir$LICENSE" target="LICENSE" />
<file src="$SolutionDir$reqnroll-icon.png" target="images\" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
<_Reqnroll_SpecFlowCompatibilityGeneratorPlugin Condition=" '$(MSBuildRuntimeType)' != 'Core'">net462</_Reqnroll_SpecFlowCompatibilityGeneratorPlugin>
<_Reqnroll_SpecFlowCompatibilityGeneratorPluginPath>$(MSBuildThisFileDirectory)\$(_Reqnroll_SpecFlowCompatibilityGeneratorPlugin)\Reqnroll.SpecFlowCompatibility.Generator.ReqnrollPlugin.dll</_Reqnroll_SpecFlowCompatibilityGeneratorPluginPath>

<_Reqnroll_SpecFlowCompatibilityRuntimePlugin>netstandard2.0</_Reqnroll_SpecFlowCompatibilityRuntimePlugin>
<_Reqnroll_SpecFlowCompatibilityRuntimePlugin Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">net462</_Reqnroll_SpecFlowCompatibilityRuntimePlugin>
<_Reqnroll_SpecFlowCompatibilityRuntimePlugin Condition=" '$(TargetFrameworkIdentifier)' != '.NETFramework' ">netstandard2.0</_Reqnroll_SpecFlowCompatibilityRuntimePlugin>
<_Reqnroll_SpecFlowCompatibilityRuntimePluginPath>$(MSBuildThisFileDirectory)\..\lib\$(_Reqnroll_SpecFlowCompatibilityRuntimePlugin)\Reqnroll.SpecFlowCompatibility.ReqnrollPlugin.dll</_Reqnroll_SpecFlowCompatibilityRuntimePluginPath>

</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
<AssemblyOriginatorKeyFile>$(Reqnroll_KeyFile)</AssemblyOriginatorKeyFile>
<SignAssembly>$(Reqnroll_EnableStrongNameSigning)</SignAssembly>
<PublicSign>$(Reqnroll_PublicSign)</PublicSign>
Expand All @@ -21,11 +21,11 @@
<ProjectReference Include="..\..\Reqnroll\Reqnroll.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == '$(Reqnroll_FullFramework_Runtime_TFM)'">
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<Reference Include="System.Configuration" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' != '$(Reqnroll_FullFramework_Runtime_TFM)'">
<ItemGroup Condition="'$(TargetFramework)' != 'net462'">
<Compile Remove="AppConfig\*.cs" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<file src="bin\$config$\net462\Reqnroll.xUnit.Generator.ReqnrollPlugin.*" target="build\$Reqnroll_FullFramework_Generator_TFM$" />
<file src="bin\$config$\netcoreapp3.1\Reqnroll.xUnit.Generator.ReqnrollPlugin.dll" target="build\$Reqnroll_Core_Generator_TFM$" />
<file src="bin\$config$\netcoreapp3.1\Reqnroll.xUnit.Generator.ReqnrollPlugin.pdb" target="build\$Reqnroll_Core_Generator_TFM$" />
<file src="bin\$config$\net6.0\Reqnroll.xUnit.Generator.ReqnrollPlugin.*" target="build\$Reqnroll_Net6_TFM$" />
<file src="bin\$config$\net6.0\Reqnroll.xUnit.Generator.ReqnrollPlugin.*" target="build\$Reqnroll_Net6_Generator_TFM$" />

<file src="$SolutionDir$LICENSE" target="LICENSE" />
<file src="$SolutionDir$reqnroll-icon.png" target="images\" />
Expand Down
2 changes: 1 addition & 1 deletion Reqnroll.Generator/Reqnroll.Generator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<Reference Include="System.IO.FileSystem" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == '$(Reqnroll_Core_Generator_TFM)' Or '$(TargetFramework)' == '$(Reqnroll_Net6_TFM)'">
<ItemGroup Condition="'$(TargetFramework)' == '$(Reqnroll_Core_Generator_TFM)' Or '$(TargetFramework)' == '$(Reqnroll_Net6_Generator_TFM)'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.1" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Collections" Version="4.3.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,6 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == '$(Reqnroll_FullFramework_Runtime_TFM)'">
<Reference Include="System.Configuration" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == '$(Reqnroll_Core_Runtime_TFM)' Or '$(TargetFramework)' == '$(Reqnroll_Net6_TFM)'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.1" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
<file src="bin\$config$\netcoreapp3.1\*.dll" exclude="bin\$config$\netcoreapp3.1\System.*;bin\$config$\netcoreapp3.1\Microsoft.*" target="tasks\$Reqnroll_Core_Tools_TFM$" />
<file src="bin\$config$\netcoreapp3.1\*.deps.json" target="tasks\$Reqnroll_Core_Tools_TFM$" />

<file src="bin\$config$\net6.0\*.dll" exclude="bin\$config$\net6.0\System.*;bin\$config$\net6.0\Microsoft.*" target="tasks\$Reqnroll_Net6_TFM$" />
<file src="bin\$config$\net6.0\*.deps.json" target="tasks\$Reqnroll_Net6_TFM$" />
<file src="bin\$config$\net6.0\*.dll" exclude="bin\$config$\net6.0\System.*;bin\$config$\net6.0\Microsoft.*" target="tasks\$Reqnroll_Net6_Tools_TFM$" />
<file src="bin\$config$\net6.0\*.deps.json" target="tasks\$Reqnroll_Net6_Tools_TFM$" />

<file src="$SolutionDir$\Licenses\**\*" target="licenses" />
<file src="$SolutionDir$LICENSE" target="LICENSE" />
Expand Down
13 changes: 0 additions & 13 deletions Tests/Reqnroll.GeneratorTests/Reqnroll.GeneratorTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == '$(Reqnroll_FullFramework_Runtime_TFM)'">
<Reference Include="System.Configuration" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == '$(Reqnroll_Core_Runtime_TFM)' Or '$(TargetFramework)' == '$(Reqnroll_Net6_TFM)'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.1" />
</ItemGroup>

<ItemGroup>

<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
</ItemGroup>


</Project>
12 changes: 0 additions & 12 deletions Tests/Reqnroll.RuntimeTests/Reqnroll.RuntimeTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,9 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == '$(Reqnroll_FullFramework_Runtime_TFM)'">
<Reference Include="System.Configuration" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == '$(Reqnroll_Core_Runtime_TFM)' Or '$(TargetFramework)' == '$(Reqnroll_Net6_TFM)'">
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.1" />
</ItemGroup>


<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
Expand Down

0 comments on commit b02c5b8

Please sign in to comment.