Implement custom Package.Build.props file

OrchardCMS · Jan 30, 2025 · 03543e8 · 03543e8
1 parent 39088b0
commit 03543e8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/src/Modules/OrchardCore.Commerce/OrchardCore.Commerce.csproj b/src/Modules/OrchardCore.Commerce/OrchardCore.Commerce.csproj
@@ -16,17 +16,6 @@
     <PackageIcon>OrchardCoreIcon.png</PackageIcon>
   </PropertyGroup>
 
-  <!-- Ensure that NuGet dependencies that are modules get propagated so all modules get listed and loaded by OC. -->
-  <ItemGroup>
-    <ModulePackageNames Include="OrchardCore.Commerce" />
-    <ModulePackageNames Include="OrchardCore.Commerce.ContentFields" />
-    <ModulePackageNames Include="OrchardCore.Commerce.Inventory" />
-    <ModulePackageNames Include="OrchardCore.Commerce.Payment.Exactly" />
-    <ModulePackageNames Include="OrchardCore.Commerce.Payment" />
-    <ModulePackageNames Include="OrchardCore.Commerce.Promotion" />
-    <ModulePackageNames Include="OrchardCore.Commerce.Tax" />
-  </ItemGroup>
-
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
@@ -44,7 +33,7 @@
     <PackageReference Include="OrchardCore.ContentTypes.Abstractions" />
     <PackageReference Include="OrchardCore.Html" />
     <PackageReference Include="OrchardCore.Localization" />
-    <PackageReference Include="OrchardCore.Module.Targets" />
+    <PackageReference Include="OrchardCore.Module.Targets" GeneratePathProperty="true" />
     <PackageReference Include="OrchardCore.Navigation.Core" />
     <PackageReference Include="OrchardCore.Title" />
     <PackageReference Include="OrchardCore.Workflows.Abstractions" />
@@ -75,4 +64,10 @@
     <PackageReference Include="Lombiq.NodeJs.Extensions" />
   </ItemGroup>
 
+  <!-- Override NuGet props file from OrchardCore.Module.Targets with our custom version. -->
+  <ItemGroup>
+    <None Remove="$(PkgOrchardCore_Module_Targets)/build/Package.Build.props" />
+    <None Update="Package.Build.props" Pack="true" PackagePath="build\$(AssemblyName).props" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Modules/OrchardCore.Commerce/Package.Build.props b/src/Modules/OrchardCore.Commerce/Package.Build.props
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Ensure that NuGet dependencies that are modules get propagated so all modules get listed and loaded by OC. -->
+  <ItemGroup>
+    <ModulePackageNames Include="OrchardCore.Commerce" />
+    <ModulePackageNames Include="OrchardCore.Commerce.ContentFields" />
+    <ModulePackageNames Include="OrchardCore.Commerce.Inventory" />
+    <ModulePackageNames Include="OrchardCore.Commerce.Payment.Exactly" />
+    <ModulePackageNames Include="OrchardCore.Commerce.Payment" />
+    <ModulePackageNames Include="OrchardCore.Commerce.Promotion" />
+    <ModulePackageNames Include="OrchardCore.Commerce.Tax" />
+  </ItemGroup>
+</Project>