SpecFlowOSS · Code-Grump · Nov 12, 2020 · Nov 16, 2020 · Nov 18, 2020 · Nov 18, 2020
diff --git a/SpecFlow.Tools.MsBuild.Generation/build/SpecFlow.Tools.MsBuild.Generation.props b/SpecFlow.Tools.MsBuild.Generation/build/SpecFlow.Tools.MsBuild.Generation.props
@@ -14,6 +14,7 @@
 
 
   <PropertyGroup>
+    <SpecFlowCodeBehindOutputPath Condition="'$(SpecFlowCodeBehindOutputPath)' == ''">$(BaseIntermediateOutputPath)Features.Generated\</SpecFlowCodeBehindOutputPath>
     <OverwriteReadOnlyFiles Condition="'$(OverwriteReadOnlyFiles)'==''">false</OverwriteReadOnlyFiles>
     <ForceGeneration Condition="'$(ForceGeneration)'==''">false</ForceGeneration>
 
@@ -28,12 +29,6 @@
     property group for feature flags
   -->
   <PropertyGroup>
-
-    <!--
-      feature flag to enable experimental support for cleaning up generated code-behind files during rebuild and clean scenarios
-    -->
-    <SpecFlow_DeleteCodeBehindFilesOnCleanRebuild Condition="'$(SpecFlow_DeleteCodeBehindFilesOnCleanRebuild)'==''">false</SpecFlow_DeleteCodeBehindFilesOnCleanRebuild>
-
     <!--
       net.sdk support: feature flag to enable experimental support for net.sdk project system
     -->
@@ -45,23 +40,15 @@
 
   <ItemGroup>
     <SpecFlowFeatureFiles Include="**\*.feature" >
-      <CodeBehindFile>%(RelativeDir)%(Filename).feature$(DefaultLanguageSourceExtension)</CodeBehindFile>
       <Visible>$(UsingMicrosoftNETSdk)</Visible>
     </SpecFlowFeatureFiles>
-
-    <!-- obsolete codebehind files, scenarios:
-         - after rename operation
-         - after deletion of a feature file
-         - after pulling latest changes from version control with above changes
-     -->
-    <SpecFlowObsoleteCodeBehindFiles Include="**\*.feature$(DefaultLanguageSourceExtension)" Exclude="@(SpecFlowFeatureFiles->'%(CodeBehindFile)')" />
-
+
     <!-- Support for Visual Studio Incremental Build
         https://github.com/techtalk/SpecFlow/issues/1319
      -->
     <UpToDateCheckInput Include="@(SpecFlowFeatureFiles)" />
-    <UpToDateCheckBuild Include="@(SpecFlowFeatureFiles->'%(CodeBehindFile)')" Original="@(SpecFlowFeatureFiles)" />
-    <CustomAdditionalCompileInputs Include="@(SpecFlowFeatureFiles->'%(CodeBehindFile)')" />
+    <UpToDateCheckBuild Include="@(SpecFlowFeatureFiles->'$(SpecFlowCodeBehindOutputPath)%(RelativeDir)%(Filename)%(Extension)$(DefaultLanguageSourceExtension)')" Original="@(SpecFlowFeatureFiles)" />
+    <CustomAdditionalCompileInputs Include="@(SpecFlowFeatureFiles->'$(SpecFlowCodeBehindOutputPath)%(RelativeDir)%(Filename)%(Extension)$(DefaultLanguageSourceExtension)')" />
 
   </ItemGroup>
 

diff --git a/SpecFlow.Tools.MsBuild.Generation/build/SpecFlow.Tools.MsBuild.Generation.targets b/SpecFlow.Tools.MsBuild.Generation/build/SpecFlow.Tools.MsBuild.Generation.targets
@@ -9,76 +9,30 @@
   <PropertyGroup Condition="'$(BuildServerMode)' == ''">
     <BuildServerMode Condition="'$(BuildingInsideVisualStudio)'=='true'">false</BuildServerMode>
     <BuildServerMode Condition="'$(BuildingInsideVisualStudio)'!='true'">true</BuildServerMode>
-
-    <!--
-      net.sdk experimental support:
-      - currently we only want to support either classic project system or netsdk project system.
-      - currently we don't want to support globbing with classic project system => ensure globbing only get enabled with 'UsingMicrosoftNETSdk'
-      - currently we are supporting $(EnableDefaultCompileItems) for disabling globbing support for codebehind files
-    -->
-    <_SpecFlow_EnableDefaultCompileItems Condition="'$(SpecFlow_EnableDefaultCompileItems)' == '' And '$(UsingMicrosoftNETSdk)' == 'true'">true</_SpecFlow_EnableDefaultCompileItems>
-    <_SpecFlow_EnableDefaultCompileItems Condition="'$(SpecFlow_EnableDefaultCompileItems)' == 'true' And '$(UsingMicrosoftNETSdk)' == 'true'">true</_SpecFlow_EnableDefaultCompileItems>
   </PropertyGroup>
-
-  <PropertyGroup>
-    <BuildDependsOn>
-      BeforeUpdateFeatureFilesInProject;
-      UpdateFeatureFilesInProject;
-      IncludeCodeBehindFilesInProject;
-      AfterUpdateFeatureFilesInProject;
-      $(BuildDependsOn)
-    </BuildDependsOn>
-    <CleanDependsOn>
-      CleanFeatureFilesInProject;
-      $(CleanDependsOn)
-    </CleanDependsOn>
-    <RebuildDependsOn>
-      SwitchToForceGenerate;
-      $(RebuildDependsOn)
-    </RebuildDependsOn>
-  </PropertyGroup>
-
+
   <!--
-    net.sdk support: update default compile items to show generated files as nested items
+  Hook into the build system to produce SpecFlow sources.
   -->
-  <ItemGroup Condition="'$(_SpecFlow_EnableDefaultCompileItems)' == 'true' and '$(EnableDefaultItems)' == 'true' ">
-    <Compile Update="@(SpecFlowFeatureFiles->'%(CodeBehindFile)')"
-             DependentUpon="%(Filename)"
-             AutoGen="true"
-             DesignTime="true"
-             Visible="true"
-             Condition="'$(EnableDefaultCompileItems)' == 'true'" />
-
-  </ItemGroup>
-
-
-  <Target Name="WarnForFeatureCodeBehindFilesWithoutCorrespondingFeatureFile" AfterTargets="CoreCompile"
-          Condition="'$(SpecFlow_EnableWarnForFeatureCodeBehindFilesWithoutCorrespondingFeatureFile)' == 'true'">
-    <Warning Text="For codebehind file '@(SpecFlowObsoleteCodeBehindFiles)', no feature file was found." File="@(SpecFlowObsoleteCodeBehindFiles)" Condition="'@(SpecFlowObsoleteCodeBehindFiles)' != ''" />
+  <Target 
+    Name="GenerateSpecFlowSources"
+    BeforeTargets="BeforeCompile"
+    DependsOnTargets="BeforeGenerateSpecFlowCodeBehindFiles;GenerateSpecFlowCodeBehindFiles;AfterGenerateSpecFlowCodeBehindFiles">
   </Target>
 
-
-  <Target Name="SwitchToForceGenerate">
-    <PropertyGroup>
-      <ForceGeneration>true</ForceGeneration>
-    </PropertyGroup>
-  </Target>
-
-
-  <Target Name="UpdateFeatureFilesInProject"
-          DependsOnTargets="BeforeUpdateFeatureFilesInProject">
+  <!--
+  Generate the SpecFlow code-behind files.
+  -->
+  <Target Name="GenerateSpecFlowCodeBehindFiles"
+          DependsOnTargets="BeforeGenerateSpecFlowCodeBehindFiles">
 
     <Message Text="SpecFlowFeatureFiles: @(SpecFlowFeatureFiles)" Importance="high" Condition="'$(VerboseOutput)' == 'true'" />
 
     <Error
       Text="SpecFlow designer codebehind generation is not compatible with MSBuild codebehind generation. The custom tool must be removed from the file. See https://www.specflow.org/documentation/Generate-Tests-from-MsBuild"
       File="@(None)"
       Condition="%(None.Extension) == '.feature' AND %(None.Generator) == 'SpecFlowSingleFileGenerator'"/>
-
-    <!-- <PropertyGroup>
-      <SpecFlowCodeBehindOutputPath Condition="'$(SpecFlowCodeBehindOutputPath)' == ''">Features.Generated</SpecFlowCodeBehindOutputPath>
-    </PropertyGroup> -->
-
+
     <PropertyGroup Condition="'$(TargetFrameworkVersion)' != ''">
       <SpecFlow_TargetFramework>$(TargetFrameworkVersion)</SpecFlow_TargetFramework>
     </PropertyGroup>
@@ -109,66 +63,25 @@
 
     <Message Text="SpecFlowGeneratedFiles: %(SpecFlowGeneratedFiles.Identity)" Importance="high" Condition="'$(VerboseOutput)' == 'true'" />
 
-
-    <!--
-      net.sdk support: globbing does not support including files which are dynamically generated inside targets, we have to manually update compile items
-    -->
-    <ItemGroup Condition="'$(_SpecFlow_EnableDefaultCompileItems)' == 'true' and '$(EnableDefaultItems)' == 'true' and '$(EnableDefaultCompileItems)' == 'true'">
-
-      <!-- if this is the first time generation of codebehind files, we have to manually add them as compile items -->
-      <Compile Include="@(SpecFlowFeatureFiles->'%(CodeBehindFile)')"
-               Exclude="@(Compile)"/>
-
-      <!--
-        eather if codebehind files are added manually to compile item group or are added by net.sdk globbing support,
-        ensure they are nested under feature files like in previous specflow versions
-        currently, we cannot use itemgroup update attribute inside a target because of some bugs in MSBuild (all items will be updated)
-        - https://github.com/Microsoft/msbuild/issues/1618
-        - https://github.com/Microsoft/msbuild/issues/2835
-        - https://github.com/Microsoft/msbuild/issues/1124
-      -->
-      <Compile DependentUpon="@(SpecFlowFeatureFiles)"
-               AutoGen="true"
-               DesignTime="true"
-               Visible="true"
-               Condition="'%(Compile.Identity)' == '@(SpecFlowFeatureFiles->'%(CodeBehindFile)')'" />
-
-      <!-- remove files which got obsolete, typically after rename operation, or getting changes from source control -->
-      <Compile Remove="@(SpecFlowObsoleteCodeBehindFiles)" />
+    <ItemGroup>
+      <!-- Include generated files for compilation. -->
+      <Compile Include="@(SpecFlowFeatureFiles->'$(SpecFlowCodeBehindOutputPath)%(RelativeDir)%(Filename)%(Extension)$(DefaultLanguageSourceExtension)')" />
+
+      <!-- Track written files to support build cleaning. -->
+      <FileWrites Include="@(SpecFlowFeatureFiles->'$(SpecFlowCodeBehindOutputPath)%(RelativeDir)%(Filename)%(Extension)$(DefaultLanguageSourceExtension)')" />
     </ItemGroup>
-
   </Target>
 
-  <Target Name="BeforeUpdateFeatureFilesInProject">
+  <Target Name="BeforeGenerateSpecFlowCodeBehindFiles">
 
   </Target>
 
-  <Target Name="IncludeCodeBehindFilesInProject" DependsOnTargets="UpdateFeatureFilesInProject">
-    <ItemGroup Condition="'$(UsingMicrosoftNETSdk)' != 'true'">
-      <Compile Include="@(SpecFlowGeneratedFiles)" Exclude="@(Compile)" />
-    </ItemGroup>
-
+  <Target Name="AfterGenerateSpecFlowCodeBehindFiles">
+    <!-- include any generated SpecFlow files in the compilation of the project if not included yet -->
     <ItemGroup>
       <EmbeddedResource Include="@(SpecFlowFeatureFiles)">
         <LogicalName>%(SpecFlowFeatureFiles.Identity)</LogicalName>
       </EmbeddedResource>
     </ItemGroup>
-
-  </Target>
-
-  <Target Name="AfterUpdateFeatureFilesInProject" DependsOnTargets="IncludeCodeBehindFilesInProject">
-    <!-- include any generated SpecFlow files in the compilation of the project if not included yet -->
-  </Target>
-
-  <Target Name="CleanFeatureFilesInProject" Condition="'$(SpecFlow_DeleteCodeBehindFilesOnCleanRebuild)' == 'true'">
-    <!-- remove known codebehind files for existing feature files -->
-    <Delete Files="%(SpecFlowFeatureFiles.CodeBehindFile)" ContinueOnError="true" />
-
-    <!-- remove obsolete codebehind files, scenarios:
-         - after rename operation
-         - after deletion of a feature file
-         - after pulling latest changes from version control with above changes
-     -->
-    <Delete Files="@(SpecFlowObsoleteCodeBehindFiles)" ContinueOnError="true" />
   </Target>
 </Project>
diff --git a/TechTalk.SpecFlow.Generator/Generation/LinePragmaHandler.cs b/TechTalk.SpecFlow.Generator/Generation/LinePragmaHandler.cs
@@ -1,5 +1,4 @@
 using System.CodeDom;
-using System.IO;
 using TechTalk.SpecFlow.Configuration;
 using TechTalk.SpecFlow.Generator.CodeDom;
 
@@ -22,7 +21,7 @@ public void AddLinePragmaInitial(CodeTypeDeclaration testType, string sourceFile
             if (_specFlowConfiguration.AllowDebugGeneratedFiles)
                 return;
 
-            _codeDomHelper.BindTypeToSourceFile(testType, Path.GetFileName(sourceFile));
+            _codeDomHelper.BindTypeToSourceFile(testType, sourceFile);
         }
     }
 }
diff --git a/changelog.txt b/changelog.txt
@@ -190,6 +190,7 @@ Changes:
 Features:
 + Allow the use of custom subclasses of StepDefinitionBaseAttribute.
 + Be able to get the arguments of the current executed Scenario Outline example - https://github.com/SpecFlowOSS/SpecFlow/pull/1988
++ Code-Behind files (.feature.cs/.feature.vb) are now generated in the obj folder.
 
 Fixes for Development:
 + Changed unit tests to ignore custom user overrides to data formatting in en-US locale