Merge pull request #215 from ArielBlanco1990/Fix_Hotcakes_Template_Bugs

Fix_Hotcakes_Template_Bugs
UpendoVentures · Aug 8, 2023 · e3ae827 · e3ae827
2 parents 35cd31b + 605fd02
commit e3ae827
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 48 deletions.
diff --git a/generators/common/src-hotcakes-hcc/creditcardgateway/Module.build b/generators/common/src-hotcakes-hcc/creditcardgateway/Module.build
@@ -7,7 +7,8 @@
     <BuildScriptsPath>$(MSBuildProjectDirectory)\..\..\Build</BuildScriptsPath>
     <WebsitePath>$(MSBuildProjectDirectory)\..\..\Website</WebsitePath>
     <WebsiteInstallPath>$(WebsitePath)\Install\Module</WebsiteInstallPath>
-    <FullModulePath>$(WebsitePath)\DesktopModules\Hotcakes\Core\Admin\Parts\CreditCardGateways\$(ModulePath)</FullModulePath>
+    <FullModulePath>$(WebsitePath)\DesktopModules\Hotcakes\Core\Admin\Parts\CreditCardGateways\$(DNNFileName)</FullModulePath>
+    <ModulePathFiles>$(MSBuildProjectDirectory)\DesktopModules\Hotcakes\Core\Admin\Parts\CreditCardGateways\$(DNNFileName)</ModulePathFiles>
   </PropertyGroup>
   <Import Project="$(BuildScriptsPath)\ModulePackage.Targets" />
   <Target Name="AfterBuild" DependsOnTargets="CopyBin;GetFiles;DebugProject;PackageModule">
@@ -17,8 +18,9 @@
       <Manifest Include="*.dnn;*.dnn5;*.dnn6" Exclude="*_Symbols.dnn" />
       <TextFiles Include="*.txt" Exclude="releasenotes.txt;license.txt" />
       <SourceFiles Include="*.css;*.htm;*.html" />
-      <Views Include="*.ascx;" />
-      <ResourceFiles Include="App_LocalResources/*.resx" />
+      <Views Include="$(ModulePathFiles)/*.ascx;" />
+      <CsFiles Include="$(ModulePathFiles)/*.cs;" />
+      <ResourceFiles Include="$(ModulePathFiles)/App_LocalResources/*.resx" />
       <Images Include="Images/**/*.*" />
       <JsFiles Include="js/**/*.*" />
       <Styles Include="Styles/**/*.*" />
@@ -42,8 +44,7 @@
     <Copy SourceFiles="@(BinSourceInclude)" DestinationFolder="$(WebsitePath)\bin" />
   </Target>
   <Target Name="DebugProject" Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <Copy SourceFiles="@(Manifest)" DestinationFolder="$(FullModulePath)" />
-    <Copy SourceFiles="@(TextFiles)" DestinationFolder="$(FullModulePath)" />
+    <Copy SourceFiles="@(CsFiles)" DestinationFolder="$(FullModulePath)" />
     <Copy SourceFiles="@(SourceFiles)" DestinationFolder="$(FullModulePath)" />
     <Copy SourceFiles="@(Views)" DestinationFolder="$(FullModulePath)" />
     <Copy SourceFiles="@(ResourceFiles)" DestinationFolder="$(FullModulePath)\App_LocalResources" />

diff --git a/generators/common/src-hotcakes-hcc/giftcardgateway/Module.build b/generators/common/src-hotcakes-hcc/giftcardgateway/Module.build
@@ -7,7 +7,8 @@
     <BuildScriptsPath>$(MSBuildProjectDirectory)\..\..\Build</BuildScriptsPath>
     <WebsitePath>$(MSBuildProjectDirectory)\..\..\Website</WebsitePath>
     <WebsiteInstallPath>$(WebsitePath)\Install\Module</WebsiteInstallPath>
-    <FullModulePath>$(WebsitePath)\DesktopModules\Hotcakes\Core\Admin\Parts\GiftCardGateways\$(ModulePath)</FullModulePath>
+    <FullModulePath>$(WebsitePath)\DesktopModules\Hotcakes\Core\Admin\Parts\GiftCardGateways\$(DNNFileName)</FullModulePath>
+    <ModulePathFiles>$(MSBuildProjectDirectory)\DesktopModules\Hotcakes\Core\Admin\Parts\GiftCardGateways\$(DNNFileName)</ModulePathFiles>
   </PropertyGroup>
   <Import Project="$(BuildScriptsPath)\ModulePackage.Targets" />
   <Target Name="AfterBuild" DependsOnTargets="CopyBin;GetFiles;DebugProject;PackageModule">
@@ -17,8 +18,9 @@
       <Manifest Include="*.dnn;*.dnn5;*.dnn6" Exclude="*_Symbols.dnn" />
       <TextFiles Include="*.txt" Exclude="releasenotes.txt;license.txt" />
       <SourceFiles Include="*.css;*.htm;*.html" />
-      <Views Include="*.ascx;" />
-      <ResourceFiles Include="App_LocalResources/*.resx" />
+      <Views Include="$(ModulePathFiles)/*.ascx;" />
+      <CsFiles Include="$(ModulePathFiles)/*.cs;" />
+      <ResourceFiles Include="$(ModulePathFiles)/App_LocalResources/*.resx" />
       <Images Include="Images/**/*.*" />
       <JsFiles Include="js/**/*.*" />
       <Styles Include="Styles/**/*.*" />
@@ -42,8 +44,7 @@
     <Copy SourceFiles="@(BinSourceInclude)" DestinationFolder="$(WebsitePath)\bin" />
   </Target>
   <Target Name="DebugProject" Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <Copy SourceFiles="@(Manifest)" DestinationFolder="$(FullModulePath)" />
-    <Copy SourceFiles="@(TextFiles)" DestinationFolder="$(FullModulePath)" />
+    <Copy SourceFiles="@(CsFiles)" DestinationFolder="$(FullModulePath)" />
     <Copy SourceFiles="@(SourceFiles)" DestinationFolder="$(FullModulePath)" />
     <Copy SourceFiles="@(Views)" DestinationFolder="$(FullModulePath)" />
     <Copy SourceFiles="@(ResourceFiles)" DestinationFolder="$(FullModulePath)\App_LocalResources" />

diff --git a/generators/common/src-hotcakes-hcc/paymentmethod/Module.build b/generators/common/src-hotcakes-hcc/paymentmethod/Module.build
@@ -7,7 +7,8 @@
     <BuildScriptsPath>$(MSBuildProjectDirectory)\..\..\Build</BuildScriptsPath>
     <WebsitePath>$(MSBuildProjectDirectory)\..\..\Website</WebsitePath>
     <WebsiteInstallPath>$(WebsitePath)\Install\Module</WebsiteInstallPath>
-    <FullModulePath>$(WebsitePath)\DesktopModules\Hotcakes\Core\Admin\Parts\PaymentMethods\$(ModulePath)</FullModulePath>
+     <FullModulePath>$(WebsitePath)\DesktopModules\Hotcakes\Core\Admin\Parts\PaymentMethods\$(DNNFileName)</FullModulePath>
+    <ModulePathFiles>$(MSBuildProjectDirectory)\DesktopModules\Hotcakes\Core\Admin\Parts\PaymentMethods\$(DNNFileName)</ModulePathFiles>
     <FullModulePortalPath>$(WebsitePath)\Portals\_default\HotcakesViews\_default\Views\$(ModulePath)</FullModulePortalPath>
   </PropertyGroup>
   <Import Project="$(BuildScriptsPath)\ModulePackage.Targets" />
@@ -18,8 +19,9 @@
       <Manifest Include="*.dnn;*.dnn5;*.dnn6" Exclude="*_Symbols.dnn" />
       <TextFiles Include="*.txt" Exclude="releasenotes.txt;license.txt" />
       <SourceFiles Include="*.css;*.htm;*.html" />
-      <Views Include="*.ascx;" />
-      <ResourceFiles Include="App_LocalResources/*.resx" />
+      <Views Include="$(ModulePathFiles)/*.ascx;" />
+      <CsFiles Include="$(ModulePathFiles)/*.cs;" />
+      <ResourceFiles Include="$(ModulePathFiles)/App_LocalResources/*.resx" />
       <Images Include="Images/**/*.*" />
       <JsFiles Include="js/**/*.*" />
       <Styles Include="Styles/**/*.*" />
@@ -44,8 +46,7 @@
     <Copy SourceFiles="@(BinSourceInclude)" DestinationFolder="$(WebsitePath)\bin" />
   </Target>
   <Target Name="DebugProject" Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <Copy SourceFiles="@(Manifest)" DestinationFolder="$(FullModulePath)" />
-    <Copy SourceFiles="@(TextFiles)" DestinationFolder="$(FullModulePath)" />
+    <Copy SourceFiles="@(CsFiles)" DestinationFolder="$(FullModulePath)" />
     <Copy SourceFiles="@(SourceFiles)" DestinationFolder="$(FullModulePath)" />
     <Copy SourceFiles="@(Views)" DestinationFolder="$(FullModulePath)" />
     <Copy SourceFiles="@(ResourceFiles)" DestinationFolder="$(FullModulePath)\App_LocalResources" />

diff --git a/generators/common/src-hotcakes-hcc/taxprovider/Module.build b/generators/common/src-hotcakes-hcc/taxprovider/Module.build
@@ -7,7 +7,8 @@
     <BuildScriptsPath>$(MSBuildProjectDirectory)\..\..\Build</BuildScriptsPath>
     <WebsitePath>$(MSBuildProjectDirectory)\..\..\Website</WebsitePath>
     <WebsiteInstallPath>$(WebsitePath)\Install\Module</WebsiteInstallPath>
-    <FullModulePath>$(WebsitePath)\DesktopModules\Hotcakes\Core\Admin\Parts\TaxProviders\$(ModulePath)</FullModulePath>
+    <FullModulePath>$(WebsitePath)\DesktopModules\Hotcakes\Core\Admin\Parts\TaxProviders\$(DNNFileName)</FullModulePath>
+    <ModulePathFiles>$(MSBuildProjectDirectory)\DesktopModules\Hotcakes\Core\Admin\Parts\TaxProviders\$(DNNFileName)</ModulePathFiles>
   </PropertyGroup>
   <Import Project="$(BuildScriptsPath)\ModulePackage.Targets" />
   <Target Name="AfterBuild" DependsOnTargets="CopyBin;GetFiles;DebugProject;PackageModule">
@@ -17,8 +18,9 @@
       <Manifest Include="*.dnn;*.dnn5;*.dnn6" Exclude="*_Symbols.dnn" />
       <TextFiles Include="*.txt" Exclude="releasenotes.txt;license.txt" />
       <SourceFiles Include="*.css;*.htm;*.html" />
-      <Views Include="*.ascx;" />
-      <ResourceFiles Include="App_LocalResources/*.resx" />
+      <Views Include="$(ModulePathFiles)/*.ascx;" />
+      <CsFiles Include="$(ModulePathFiles)/*.cs;" />
+      <ResourceFiles Include="$(ModulePathFiles)/App_LocalResources/*.resx" />
       <Images Include="Images/**/*.*" />
       <JsFiles Include="js/**/*.*" />
       <Styles Include="Styles/**/*.*" />
@@ -42,8 +44,7 @@
     <Copy SourceFiles="@(BinSourceInclude)" DestinationFolder="$(WebsitePath)\bin" />
   </Target>
   <Target Name="DebugProject" Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <Copy SourceFiles="@(Manifest)" DestinationFolder="$(FullModulePath)" />
-    <Copy SourceFiles="@(TextFiles)" DestinationFolder="$(FullModulePath)" />
+    <Copy SourceFiles="@(CsFiles)" DestinationFolder="$(FullModulePath)" />
     <Copy SourceFiles="@(SourceFiles)" DestinationFolder="$(FullModulePath)" />
     <Copy SourceFiles="@(Views)" DestinationFolder="$(FullModulePath)" />
     <Copy SourceFiles="@(ResourceFiles)" DestinationFolder="$(FullModulePath)\App_LocalResources" />

diff --git a/generators/hcc/index.js b/generators/hcc/index.js
@@ -249,13 +249,13 @@ module.exports = class extends DnnGeneratorBase {
 
       this.fs.copyTpl(
         this.templatePath(hccType + '/DesktopModules/Hotcakes/Core/Admin/Parts/GiftCardGateways/MyTestGateway/MyTestGateway.cs'),
-        this.destinationPath(extensionName + '/DesktopModules/Hotcakes/Core/Admin/Parts/GiftCardGateways/'+ extensionName + '/' + extensionName+'_GiftCardGateway.cs'),
+        this.destinationPath(extensionName + '/DesktopModules/Hotcakes/Core/Admin/Parts/GiftCardGateways/'+ extensionName + '/' + extensionName+'.cs'),
         template
       );
 
       this.fs.copyTpl(
         this.templatePath(hccType + '/DesktopModules/Hotcakes/Core/Admin/Parts/GiftCardGateways/MyTestGateway/MyTestGatewaySettings.cs'),
-        this.destinationPath(extensionName + '/DesktopModules/Hotcakes/Core/Admin/Parts/GiftCardGateways/'+ extensionName + '/' + extensionName+'_GiftCardGatewaySettings.cs'),
+        this.destinationPath(extensionName + '/DesktopModules/Hotcakes/Core/Admin/Parts/GiftCardGateways/'+ extensionName + '/' + extensionName+'Settings.cs'),
         template
       );
 
@@ -307,33 +307,33 @@ module.exports = class extends DnnGeneratorBase {
 
       this.fs.copyTpl(
         this.templatePath(hccType + '/DesktopModules/Hotcakes/Core/Admin/Parts/PaymentMethods/MyPaymentMethod/MyCustomWorkflowFactory.cs'),
-        this.destinationPath(extensionName + '/DesktopModules/Hotcakes/Core/Admin/Parts/PaymentMethods/'+ extensionName + '/' + extensionName + '_CustomWorkflowFactory.cs'),
+        this.destinationPath(extensionName + '/DesktopModules/Hotcakes/Core/Admin/Parts/PaymentMethods/'+ extensionName + '/' + extensionName + 'CustomWorkflowFactory.cs'),
         template
       );
 
       this.fs.copyTpl(
         this.templatePath(hccType + '/DesktopModules/Hotcakes/Core/Admin/Parts/PaymentMethods/MyPaymentMethod/MyPaymentMethod.cs'),
-        this.destinationPath(extensionName + '/DesktopModules/Hotcakes/Core/Admin/Parts/PaymentMethods/'+ extensionName + '/' + extensionName + '_PaymentMethod.cs'),
+        this.destinationPath(extensionName + '/DesktopModules/Hotcakes/Core/Admin/Parts/PaymentMethods/'+ extensionName + '/' + extensionName + 'PaymentMethod.cs'),
         template
       );
 
       this.fs.copyTpl(
         this.templatePath(hccType + '/DesktopModules/Hotcakes/Core/Admin/Parts/PaymentMethods/MyPaymentMethod/MyPaymentMethodCheckoutController.cs'),
-        this.destinationPath(extensionName + '/DesktopModules/Hotcakes/Core/Admin/Parts/PaymentMethods/'+ extensionName + '/' + extensionName + '_PaymentMethodCheckoutController.cs'),
+        this.destinationPath(extensionName + '/DesktopModules/Hotcakes/Core/Admin/Parts/PaymentMethods/'+ extensionName + '/' + extensionName + 'PaymentMethodCheckoutController.cs'),
         template
       );
 
 
       this.fs.copyTpl(
         this.templatePath(hccType + '/DesktopModules/Hotcakes/Core/Admin/Parts/PaymentMethods/MyPaymentMethod/MyPaymentMethodSettings.cs'),
-        this.destinationPath(extensionName + '/DesktopModules/Hotcakes/Core/Admin/Parts/PaymentMethods/'+ extensionName + '/' + extensionName + '_PaymentMethodSettings.cs'),
+        this.destinationPath(extensionName + '/DesktopModules/Hotcakes/Core/Admin/Parts/PaymentMethods/'+ extensionName + '/' + extensionName + 'PaymentMethodSettings.cs'),
         template
       );
 
 
       this.fs.copyTpl(
         this.templatePath(hccType + '/DesktopModules/Hotcakes/Core/Admin/Parts/PaymentMethods/MyPaymentMethod/StartMyPaymentMethodCheckout.cs'),
-        this.destinationPath(extensionName + '/DesktopModules/Hotcakes/Core/Admin/Parts/PaymentMethods/'+ extensionName + '/Start_' + extensionName + '_PaymentMethodCheckout.cs'),
+        this.destinationPath(extensionName + '/DesktopModules/Hotcakes/Core/Admin/Parts/PaymentMethods/'+ extensionName + '/Start' + extensionName + 'PaymentMethodCheckout.cs'),
         template
       );
 
@@ -421,31 +421,31 @@ module.exports = class extends DnnGeneratorBase {
 
         this.fs.copyTpl(
           this.templatePath(hccType + '/DesktopModules/Hotcakes/Core/Admin/Parts/TaxProviders/MyProvider/MyTaxProvider.cs'),
-          this.destinationPath(extensionName + '/DesktopModules/Hotcakes/Core/Admin/Parts/TaxProviders/'+ extensionName + '/' + extensionName +'_TaxProvider.cs'),
+          this.destinationPath(extensionName + '/DesktopModules/Hotcakes/Core/Admin/Parts/TaxProviders/'+ extensionName + '/' + extensionName +'.cs'),
           template
         );
 
         this.fs.copyTpl(
           this.templatePath(hccType + '/DesktopModules/Hotcakes/Core/Admin/Parts/TaxProviders/MyProvider/MyTaxProviderGateway.cs'),
-          this.destinationPath(extensionName + '/DesktopModules/Hotcakes/Core/Admin/Parts/TaxProviders/'+ extensionName + '/' + extensionName +'_TaxProviderGateway.cs'),
+          this.destinationPath(extensionName + '/DesktopModules/Hotcakes/Core/Admin/Parts/TaxProviders/'+ extensionName + '/' + extensionName +'Gateway.cs'),
           template
         );
 
         this.fs.copyTpl(
           this.templatePath(hccType + '/DesktopModules/Hotcakes/Core/Admin/Parts/TaxProviders/MyProvider/MyTaxProviderLineResult.cs'),
-          this.destinationPath(extensionName + '/DesktopModules/Hotcakes/Core/Admin/Parts/TaxProviders/'+ extensionName + '/' + extensionName +'_TaxProviderLineResult.cs'),
+          this.destinationPath(extensionName + '/DesktopModules/Hotcakes/Core/Admin/Parts/TaxProviders/'+ extensionName + '/' + extensionName +'LineResult.cs'),
           template
         );
 
         this.fs.copyTpl(
           this.templatePath(hccType + '/DesktopModules/Hotcakes/Core/Admin/Parts/TaxProviders/MyProvider/MyTaxProviderResult.cs'),
-          this.destinationPath(extensionName + '/DesktopModules/Hotcakes/Core/Admin/Parts/TaxProviders/'+ extensionName + '/' + extensionName +'_TaxProviderResult.cs'),
+          this.destinationPath(extensionName + '/DesktopModules/Hotcakes/Core/Admin/Parts/TaxProviders/'+ extensionName + '/' + extensionName +'Result.cs'),
           template
         );
 
         this.fs.copyTpl(
           this.templatePath(hccType + '/DesktopModules/Hotcakes/Core/Admin/Parts/TaxProviders/MyProvider/MyTaxProviderSettings.cs'),
-          this.destinationPath(extensionName + '/DesktopModules/Hotcakes/Core/Admin/Parts/TaxProviders/'+ extensionName + '/' + extensionName +'_TaxProviderSettings.cs'),
+          this.destinationPath(extensionName + '/DesktopModules/Hotcakes/Core/Admin/Parts/TaxProviders/'+ extensionName + '/' + extensionName +'Settings.cs'),
           template
         );
 
@@ -496,13 +496,13 @@ module.exports = class extends DnnGeneratorBase {
 
         this.fs.copyTpl(
           this.templatePath(hccType + '/DesktopModules/Hotcakes/Core/Admin/Parts/CreditCardGateways/MyTestGateway/MyTestGateway.cs'),
-          this.destinationPath(extensionName + '/DesktopModules/Hotcakes/Core/Admin/Parts/CreditCardGateways/'+ extensionName + '/' + extensionName+'_CreditCardGateway.cs'),
+          this.destinationPath(extensionName + '/DesktopModules/Hotcakes/Core/Admin/Parts/CreditCardGateways/'+ extensionName + '/' + extensionName+'.cs'),
           template
         );
 
         this.fs.copyTpl(
           this.templatePath(hccType + '/DesktopModules/Hotcakes/Core/Admin/Parts/CreditCardGateways/MyTestGateway/MyTestGatewaySettings.cs'),
-          this.destinationPath(extensionName + '/DesktopModules/Hotcakes/Core/Admin/Parts/CreditCardGateways/'+ extensionName + '/' + extensionName+'_CreditCardGatewaySettings.cs'),
+          this.destinationPath(extensionName + '/DesktopModules/Hotcakes/Core/Admin/Parts/CreditCardGateways/'+ extensionName + '/' + extensionName+'Settings.cs'),
           template
         );
 

diff --git a/generators/hcc/templates/creditcardgateway/extension.csproj b/generators/hcc/templates/creditcardgateway/extension.csproj
@@ -92,8 +92,8 @@
     <Compile Include="DesktopModules\Hotcakes\Core\Admin\Parts\CreditCardGateways\<%= extensionName %>\Edit.ascx.designer.cs">
       <DependentUpon>Edit.ascx</DependentUpon>
     </Compile>
-    <Compile Include="DesktopModules\Hotcakes\Core\Admin\Parts\CreditCardGateways\<%= extensionName %>\<%= extensionName %>_CreditCardGateway.cs" />
-    <Compile Include="DesktopModules\Hotcakes\Core\Admin\Parts\CreditCardGateways\<%= extensionName %>\<%= extensionName %>_CreditCardGatewaySettings.cs" />
+    <Compile Include="DesktopModules\Hotcakes\Core\Admin\Parts\CreditCardGateways\<%= extensionName %>\<%= extensionName %>.cs" />
+    <Compile Include="DesktopModules\Hotcakes\Core\Admin\Parts\CreditCardGateways\<%= extensionName %>\<%= extensionName %>Settings.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

diff --git a/generators/hcc/templates/giftcardgateway/extension.csproj b/generators/hcc/templates/giftcardgateway/extension.csproj
@@ -90,8 +90,8 @@
     <Compile Include="DesktopModules\Hotcakes\Core\Admin\Parts\GiftCardGateways\<%= extensionName %>\Edit.ascx.designer.cs">
       <DependentUpon>Edit.ascx</DependentUpon>
     </Compile>
-    <Compile Include="DesktopModules\Hotcakes\Core\Admin\Parts\GiftCardGateways\<%= extensionName %>\<%= extensionName %>_GiftCardGateway.cs" />
-    <Compile Include="DesktopModules\Hotcakes\Core\Admin\Parts\GiftCardGateways\<%= extensionName %>\<%= extensionName %>_GiftCardGatewaySettings.cs" />
+    <Compile Include="DesktopModules\Hotcakes\Core\Admin\Parts\GiftCardGateways\<%= extensionName %>\<%= extensionName %>.cs" />
+    <Compile Include="DesktopModules\Hotcakes\Core\Admin\Parts\GiftCardGateways\<%= extensionName %>\<%= extensionName %>Settings.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

diff --git a/generators/hcc/templates/paymentmethod/extension.csproj b/generators/hcc/templates/paymentmethod/extension.csproj
@@ -102,11 +102,11 @@
     <Compile Include="DesktopModules\Hotcakes\Core\Admin\Parts\PaymentMethods\<%= extensionName %>\Edit.ascx.designer.cs">
       <DependentUpon>Edit.ascx</DependentUpon>
     </Compile>
-    <Compile Include="DesktopModules\Hotcakes\Core\Admin\Parts\PaymentMethods\<%= extensionName %>\<%= extensionName %>_CustomWorkflowFactory.cs" />
-    <Compile Include="DesktopModules\Hotcakes\Core\Admin\Parts\PaymentMethods\<%= extensionName %>\<%= extensionName %>_PaymentMethod.cs" />
-    <Compile Include="DesktopModules\Hotcakes\Core\Admin\Parts\PaymentMethods\<%= extensionName %>\Start_<%= extensionName %>_PaymentMethodCheckout.cs" />
-    <Compile Include="DesktopModules\Hotcakes\Core\Admin\Parts\PaymentMethods\<%= extensionName %>\<%= extensionName %>_PaymentMethodSettings.cs" />
-    <Compile Include="DesktopModules\Hotcakes\Core\Admin\Parts\PaymentMethods\<%= extensionName %>\<%= extensionName %>_PaymentMethodCheckoutController.cs" />
+    <Compile Include="DesktopModules\Hotcakes\Core\Admin\Parts\PaymentMethods\<%= extensionName %>\<%= extensionName %>CustomWorkflowFactory.cs" />
+    <Compile Include="DesktopModules\Hotcakes\Core\Admin\Parts\PaymentMethods\<%= extensionName %>\<%= extensionName %>PaymentMethod.cs" />
+    <Compile Include="DesktopModules\Hotcakes\Core\Admin\Parts\PaymentMethods\<%= extensionName %>\Start<%= extensionName %>PaymentMethodCheckout.cs" />
+    <Compile Include="DesktopModules\Hotcakes\Core\Admin\Parts\PaymentMethods\<%= extensionName %>\<%= extensionName %>PaymentMethodSettings.cs" />
+    <Compile Include="DesktopModules\Hotcakes\Core\Admin\Parts\PaymentMethods\<%= extensionName %>\<%= extensionName %>PaymentMethodCheckoutController.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>