Fixes packages import files. (#1053)

Fixes #1052
OrchardCMS · Oct 2, 2017 · 59cbb03 · 59cbb03
1 parent fbe458b
commit 59cbb03
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 15 deletions.
diff --git a/src/OrchardCore.Cms.Web/OrchardCore.Cms.Web.csproj b/src/OrchardCore.Cms.Web/OrchardCore.Cms.Web.csproj
@@ -3,8 +3,8 @@
   <Import Project="..\OrchardCore.Build\Dependencies.props" />
 
   <!-- Necessary as we reference the Project and not the Package -->
-  <Import Project="..\OrchardCore\OrchardCore.Application.Cms.Targets\OrchardCore.Application.Cms.props" />
-  <Import Project="..\OrchardCore\OrchardCore.Application.Targets\OrchardCore.Application.targets" />
+  <Import Project="..\OrchardCore\OrchardCore.Application.Cms.Targets\OrchardCore.Application.Cms.Targets.props" />
+  <Import Project="..\OrchardCore\OrchardCore.Application.Targets\OrchardCore.Application.Targets.targets" />
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>

diff --git a/src/OrchardCore.Modules/Directory.Build.props b/src/OrchardCore.Modules/Directory.Build.props
@@ -1,4 +1,4 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\OrchardCore.Build\OrchardCore.Commons.props" />
-  <Import Project="..\OrchardCore\OrchardCore.Module.Targets\OrchardCore.Module.props" />
+  <Import Project="..\OrchardCore\OrchardCore.Module.Targets\OrchardCore.Module.Targets.props" />
 </Project>
diff --git a/src/OrchardCore.Mvc.Web/OrchardCore.Mvc.Web.csproj b/src/OrchardCore.Mvc.Web/OrchardCore.Mvc.Web.csproj
@@ -2,7 +2,7 @@
 
   <Import Project="..\OrchardCore.Build\Dependencies.props" />
   <!-- Necessary as we reference the Project and not the Package -->
-  <Import Project="..\OrchardCore\OrchardCore.Application.Targets\OrchardCore.Application.targets" />
+  <Import Project="..\OrchardCore\OrchardCore.Application.Targets\OrchardCore.Application.Targets.targets" />
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>

diff --git a/src/OrchardCore.Nancy.Web/OrchardCore.Nancy.Web.csproj b/src/OrchardCore.Nancy.Web/OrchardCore.Nancy.Web.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\OrchardCore.Build\Dependencies.props" />
 
   <!-- Necessary as we reference the Project and not the Package -->
-  <Import Project="..\OrchardCore\OrchardCore.Application.Targets\OrchardCore.Application.targets" />
+  <Import Project="..\OrchardCore\OrchardCore.Application.Targets\OrchardCore.Application.Targets.targets" />
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>

diff --git a/src/OrchardCore.Themes/Directory.Build.props b/src/OrchardCore.Themes/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\OrchardCore.Build\OrchardCore.Commons.props" />
-  <Import Project="..\OrchardCore\OrchardCore.Theme.Targets\OrchardCore.Theme.props" />
-  <Import Project="..\OrchardCore\OrchardCore.Module.Targets\OrchardCore.Module.props" />
+  <Import Project="..\OrchardCore\OrchardCore.Theme.Targets\OrchardCore.Theme.Targets.props" />
+  <Import Project="..\OrchardCore\OrchardCore.Module.Targets\OrchardCore.Module.Targets.props" />
 </Project>
diff --git a/...rchardCore/OrchardCore.Application.Cms.Targets/OrchardCore.Application.Cms.Targets.csproj b/...rchardCore/OrchardCore.Application.Cms.Targets/OrchardCore.Application.Cms.Targets.csproj
@@ -7,8 +7,8 @@
 
   <!-- Add a ".props" file in the package specific to the "Cms" bundle -->
   <ItemGroup>
-    <None Include="OrchardCore.Application.Cms.props" Pack="true">
-      <PackagePath>build\netstandard2.0\OrchardCore.Application.Cms.props</PackagePath>
+    <None Include="OrchardCore.Application.Cms.Targets.props" Pack="true">
+      <PackagePath>build\netstandard2.0\OrchardCore.Application.Cms.Targets.props</PackagePath>
     </None>
   </ItemGroup>
 

diff --git a/...Targets/OrchardCore.Application.Cms.props → ...OrchardCore.Application.Cms.Targets.props b/...Targets/OrchardCore.Application.Cms.props → ...OrchardCore.Application.Cms.Targets.props
diff --git a/src/OrchardCore/OrchardCore.Application.Targets/OrchardCore.Application.Targets.csproj b/src/OrchardCore/OrchardCore.Application.Targets/OrchardCore.Application.Targets.csproj
@@ -13,8 +13,8 @@
   -->
 
   <ItemGroup>
-    <None Include="OrchardCore.Application.targets" Pack="true">
-      <PackagePath>build\$(TargetFramework)\OrchardCore.Application.targets</PackagePath>
+    <None Include="OrchardCore.Application.Targets.targets" Pack="true">
+      <PackagePath>build\$(TargetFramework)\OrchardCore.Application.Targets.targets</PackagePath>
     </None>
   </ItemGroup>
 

diff --git a/...n.Targets/OrchardCore.Application.targets → ...s/OrchardCore.Application.Targets.targets b/...n.Targets/OrchardCore.Application.targets → ...s/OrchardCore.Application.Targets.targets
diff --git a/src/OrchardCore/OrchardCore.Module.Targets/OrchardCore.Module.Targets.csproj b/src/OrchardCore/OrchardCore.Module.Targets/OrchardCore.Module.Targets.csproj
@@ -6,8 +6,8 @@
 
   <!-- Add the OrchardCore.Module.props file in the package -->
   <ItemGroup>
-    <None Include="OrchardCore.Module.props" Pack="true">
-      <PackagePath>build\$(TargetFramework)\OrchardCore.Module.props</PackagePath>
+    <None Include="OrchardCore.Module.Targets.props" Pack="true">
+      <PackagePath>build\$(TargetFramework)\OrchardCore.Module.Targets.props</PackagePath>
     </None>
     <None Include="Package.Build.props" Pack="true">
       <PackagePath>build\$(TargetFramework)\Package.Build.props</PackagePath>

diff --git a/...e.Module.Targets/OrchardCore.Module.props → ....Targets/OrchardCore.Module.Targets.props b/...e.Module.Targets/OrchardCore.Module.props → ....Targets/OrchardCore.Module.Targets.props
diff --git a/src/OrchardCore/OrchardCore.Theme.Targets/OrchardCore.Theme.Targets.csproj b/src/OrchardCore/OrchardCore.Theme.Targets/OrchardCore.Theme.Targets.csproj
@@ -6,8 +6,8 @@
 
   <!-- Add a ".props" file in the package specific to the "Theme" module type -->
   <ItemGroup>
-    <None Include="OrchardCore.Theme.props" Pack="true">
-      <PackagePath>build\netstandard2.0\OrchardCore.Theme.props</PackagePath>
+    <None Include="OrchardCore.Theme.Targets.props" Pack="true">
+      <PackagePath>build\netstandard2.0\OrchardCore.Theme.Targets.props</PackagePath>
     </None>
   </ItemGroup>
   <ItemGroup>

diff --git a/...ore.Theme.Targets/OrchardCore.Theme.props → ...e.Targets/OrchardCore.Theme.Targets.props b/...ore.Theme.Targets/OrchardCore.Theme.props → ...e.Targets/OrchardCore.Theme.Targets.props