BuildMultiTargeting 2 (#8739)

OrchardCMS · Mar 3, 2021 · 44d034e · 44d034e
1 parent abe41d3
commit 44d034e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/OrchardCore/OrchardCore.Module.Targets/OrchardCore.Module.Targets.csproj b/src/OrchardCore/OrchardCore.Module.Targets/OrchardCore.Module.Targets.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <!-- NuGet properties-->
@@ -32,6 +32,9 @@
     <None Include="OrchardCore.Module.Targets.props" Pack="true">
       <PackagePath>build\OrchardCore.Module.Targets.props</PackagePath>
     </None>
+    <None Include="buildMultiTargeting\OrchardCore.Module.Targets.props" Pack="true">
+      <PackagePath>buildMultiTargeting\OrchardCore.Module.Targets.props</PackagePath>
+    </None>
     <None Include="OrchardCore.Module.Targets.targets" Pack="true">
       <PackagePath>build\OrchardCore.Module.Targets.targets</PackagePath>
     </None>

diff --git a/src/OrchardCore/OrchardCore.Module.Targets/OrchardCore.Module.Targets.props b/src/OrchardCore/OrchardCore.Module.Targets/OrchardCore.Module.Targets.props
@@ -31,9 +31,6 @@
     <None Include="$(MSBuildThisFileDirectory)Package.Build.props" Pack="true">
       <PackagePath>build\$(AssemblyName).props</PackagePath>
     </None>
-    <None Include="$(MSBuildThisFileDirectory)Package.BuildMultiTargeting.props" Pack="true">
-      <PackagePath>buildMultitargeting\$(AssemblyName).props</PackagePath>
-    </None>
   </ItemGroup>
 
 </Project>
diff --git a/...chardCore/OrchardCore.Module.Targets/buildMultiTargeting/OrchardCore.Module.Targets.props b/...chardCore/OrchardCore.Module.Targets/buildMultiTargeting/OrchardCore.Module.Targets.props
@@ -0,0 +1,3 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\build\OrchardCore.Module.Targets.props" />
+</Project>