Merge pull request #16078 from abpframework/auto-merge/rel-7-1/1825

Merge branch dev with rel-7.1

common.props

@@ -18,11 +18,17 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="*.abppkg.analyze.json" />
-    <Content Remove="*.abppkg.analyze.json" />
-    <EmbeddedResource Include="*.abppkg.json" />
-    <Content Remove="*.abppkg.json" />
+  <ItemGroup Condition="'$(UsingMicrosoftNETSdkWeb)' != 'true' AND '$(UsingMicrosoftNETSdkRazor)' != 'true'">
+    <None Remove="*.abppkg.analyze.json" />
+    <Content Include="*.abppkg.analyze.json">
+		<Pack>true</Pack>
+		<PackagePath>content\</PackagePath>
+	</Content>
+    <None Remove="*.abppkg.json" />
+    <Content Include="*.abppkg.json">
+		<Pack>true</Pack>
+		<PackagePath>content\</PackagePath>
+    </Content>
   </ItemGroup>
   <ItemGroup Condition="$(AssemblyName.EndsWith('HttpApi.Client'))">
     <EmbeddedResource Include="**\*generate-proxy.json" />

modules/account/src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.csproj

@@ -16,9 +16,15 @@
 
     <ItemGroup>
       <None Remove="..\..\Volo.Abp.Account.abpmdl.json" />
-      <EmbeddedResource Include="..\..\Volo.Abp.Account.abpmdl.json" />
+      <Content Include="..\..\Volo.Abp.Account.abpmdl.json">
+          <Pack>true</Pack>
+          <PackagePath>content\</PackagePath>
+      </Content>
       <None Remove="..\..\**\*.abppkg*.json" />
-      <EmbeddedResource Include="..\..\**\*.abppkg*.json" />
+        <Content Include="..\..\**\*.abppkg*.json">
+            <Pack>true</Pack>
+            <PackagePath>content\</PackagePath>
+        </Content>
     </ItemGroup>
 
 </Project>

modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.csproj

@@ -10,13 +10,15 @@
     </PropertyGroup>
 
     <ItemGroup>
-        
         <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.VirtualFileSystem\Volo.Abp.VirtualFileSystem.csproj" />
     </ItemGroup>
 
     <ItemGroup>
       <None Remove="..\..\Volo.Abp.AuditLogging.abpmdl.json" />
-      <EmbeddedResource Include="..\..\Volo.Abp.AuditLogging.abpmdl.json" />
+      <Content Include="..\..\Volo.Abp.AuditLogging.abpmdl.json">
+        <Pack>true</Pack>
+        <PackagePath>content\</PackagePath>
+      </Content>
     </ItemGroup>
 
 </Project>

modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.csproj

@@ -16,9 +16,15 @@
 
     <ItemGroup>
       <None Remove="..\..\Volo.Abp.BackgroundJobs.abpmdl.json" />
-      <EmbeddedResource Include="..\..\Volo.Abp.BackgroundJobs.abpmdl.json" />
+      <Content Include="..\..\Volo.Abp.BackgroundJobs.abpmdl.json">
+        <Pack>true</Pack>
+        <PackagePath>content\</PackagePath>
+      </Content>
       <None Remove="..\..\**\*.abppkg*.json" />
-      <EmbeddedResource Include="..\..\**\*.abppkg*.json" />
+      <Content Include="..\..\**\*.abppkg*.json">
+        <Pack>true</Pack>
+        <PackagePath>content\</PackagePath>
+      </Content>
     </ItemGroup>
 
 </Project>

modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.csproj

@@ -16,9 +16,15 @@
 
     <ItemGroup>
       <None Remove="..\..\Volo.Abp.BasicTheme.abpmdl.json" />
-      <EmbeddedResource Include="..\..\Volo.Abp.BasicTheme.abpmdl.json" />
+      <Content Include="..\..\Volo.Abp.BasicTheme.abpmdl.json">
+        <Pack>true</Pack>
+        <PackagePath>content\</PackagePath>
+      </Content>
       <None Remove="..\..\**\*.abppkg*.json" />
-      <EmbeddedResource Include="..\..\**\*.abppkg*.json" />
+      <Content Include="..\..\**\*.abppkg*.json">
+        <Pack>true</Pack>
+        <PackagePath>content\</PackagePath>
+      </Content>
     </ItemGroup>
 
 </Project>

modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.csproj

@@ -16,9 +16,15 @@
 
     <ItemGroup>
       <None Remove="..\..\Volo.Abp.BlobStoring.Database.abpmdl.json" />
-      <EmbeddedResource Include="..\..\Volo.Abp.BlobStoring.Database.abpmdl.json" />
+      <Content Include="..\..\Volo.Abp.BlobStoring.Database.abpmdl.json">
+        <Pack>true</Pack>
+        <PackagePath>content\</PackagePath>
+      </Content>
       <None Remove="..\..\**\*.abppkg*.json" />
-      <EmbeddedResource Include="..\..\**\*.abppkg*.json" />
+      <Content Include="..\..\**\*.abppkg*.json">
+        <Pack>true</Pack>
+        <PackagePath>content\</PackagePath>
+      </Content>
     </ItemGroup>
 
 </Project>

modules/blogging/src/Volo.Blogging.Installer/Volo.Blogging.Installer.csproj

@@ -16,9 +16,15 @@
 
     <ItemGroup>
         <None Remove="..\..\Volo.Blogging.abpmdl.json" />
-        <EmbeddedResource Include="..\..\Volo.Blogging.abpmdl.json" />
+        <Content Include="..\..\Volo.Blogging.abpmdl.json">
+			<Pack>true</Pack>
+			<PackagePath>content\</PackagePath>
+		</Content>
         <None Remove="..\..\**\*.abppkg*.json" />
-        <EmbeddedResource Include="..\..\**\*.abppkg*.json" />
+        <Content Include="..\..\**\*.abppkg*.json" >
+			<Pack>true</Pack>
+			<PackagePath>content\</PackagePath>
+		</Content>
     </ItemGroup>
 
 </Project>

modules/cms-kit/src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.csproj

@@ -16,9 +16,15 @@
 
     <ItemGroup>
       <None Remove="..\..\Volo.CmsKit.abpmdl.json" />
-      <EmbeddedResource Include="..\..\Volo.CmsKit.abpmdl.json" />
+      <Content Include="..\..\Volo.CmsKit.abpmdl.json">
+        <Pack>true</Pack>
+        <PackagePath>content\</PackagePath>
+      </Content>
       <None Remove="..\..\**\*.abppkg*.json" />
-      <EmbeddedResource Include="..\..\**\*.abppkg*.json" />
+      <Content Include="..\..\**\*.abppkg*.json">
+        <Pack>true</Pack>
+        <PackagePath>content\</PackagePath>
+      </Content>
     </ItemGroup>
 
 </Project>

modules/docs/src/Volo.Docs.Installer/Volo.Docs.Installer.csproj

@@ -16,9 +16,15 @@
 
     <ItemGroup>
         <None Remove="..\..\Volo.Docs.abpmdl.json" />
-        <EmbeddedResource Include="..\..\Volo.Docs.abpmdl.json" />
+        <Content Include="..\..\Volo.Docs.abpmdl.json">
+			<Pack>true</Pack>
+			<PackagePath>content\</PackagePath>
+		</Content>
         <None Remove="..\..\**\*.abppkg*.json" />
-        <EmbeddedResource Include="..\..\**\*.abppkg*.json" />
+        <Content Include="..\..\**\*.abppkg*.json">
+			<Pack>true</Pack>
+			<PackagePath>content\</PackagePath>
+		</Content>
     </ItemGroup>
 
 </Project>

modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo.Abp.FeatureManagement.Installer.csproj

@@ -16,9 +16,15 @@
 
     <ItemGroup>
       <None Remove="..\..\Volo.Abp.FeatureManagement.abpmdl.json" />
-      <EmbeddedResource Include="..\..\Volo.Abp.FeatureManagement.abpmdl.json" />
+      <Content Include="..\..\Volo.Abp.FeatureManagement.abpmdl.json">
+        <Pack>true</Pack>
+        <PackagePath>content\</PackagePath>
+      </Content>
       <None Remove="..\..\**\*.abppkg*.json" />
-      <EmbeddedResource Include="..\..\**\*.abppkg*.json" />
+      <Content Include="..\..\**\*.abppkg*.json">
+        <Pack>true</Pack>
+        <PackagePath>content\</PackagePath>
+      </Content>
     </ItemGroup>
 
 </Project>

modules/identity/src/Volo.Abp.Identity.Installer/Volo.Abp.Identity.Installer.csproj

@@ -16,9 +16,15 @@
 
     <ItemGroup>
       <None Remove="..\..\Volo.Abp.Identity.abpmdl.json" />
-      <EmbeddedResource Include="..\..\Volo.Abp.Identity.abpmdl.json" />
+      <Content Include="..\..\Volo.Abp.Identity.abpmdl.json">
+        <Pack>true</Pack>
+        <PackagePath>content\</PackagePath>
+      </Content>
       <None Remove="..\..\**\*.abppkg*.json" />
-      <EmbeddedResource Include="..\..\**\*.abppkg*.json" />
+      <Content Include="..\..\**\*.abppkg*.json">
+        <Pack>true</Pack>
+        <PackagePath>content\</PackagePath>
+      </Content>
     </ItemGroup>
 
 </Project>

modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.csproj

@@ -16,7 +16,10 @@
 
     <ItemGroup>
       <None Remove="..\..\Volo.Abp.IdentityServer.abpmdl.json" />
-      <EmbeddedResource Include="..\..\Volo.Abp.IdentityServer.abpmdl.json" />
+      <Content Include="..\..\Volo.Abp.IdentityServer.abpmdl.json">
+        <Pack>true</Pack>
+        <PackagePath>content\</PackagePath>
+      </Content>
     </ItemGroup>
 
 </Project>

modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo.Abp.OpenIddict.Installer.csproj

@@ -16,9 +16,15 @@
 
     <ItemGroup>
         <None Remove="..\..\Volo.Abp.OpenIddict.abpmdl.json" />
-        <EmbeddedResource Include="..\..\Volo.Abp.OpenIddict.abpmdl.json" />
+        <Content Include="..\..\Volo.Abp.OpenIddict.abpmdl.json">
+			<Pack>true</Pack>
+			<PackagePath>content\</PackagePath>
+		</Content>
         <None Remove="..\..\**\*.abppkg*.json" />
-        <EmbeddedResource Include="..\..\**\*.abppkg*.json" />
+        <Content Include="..\..\**\*.abppkg*.json">
+			<Pack>true</Pack>
+			<PackagePath>content\</PackagePath>
+		</Content>
     </ItemGroup>
 
 </Project>

modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.csproj

@@ -16,9 +16,15 @@
 
     <ItemGroup>
       <None Remove="..\..\Volo.Abp.PermissionManagement.abpmdl.json" />
-      <EmbeddedResource Include="..\..\Volo.Abp.PermissionManagement.abpmdl.json" />
+      <Content Include="..\..\Volo.Abp.PermissionManagement.abpmdl.json">
+        <Pack>true</Pack>
+        <PackagePath>content\</PackagePath>
+      </Content>
       <None Remove="..\..\**\*.abppkg*.json" />
-      <EmbeddedResource Include="..\..\**\*.abppkg*.json" />
+      <Content Include="..\..\**\*.abppkg*.json">
+        <Pack>true</Pack>
+        <PackagePath>content\</PackagePath>
+      </Content>
     </ItemGroup>
 
 </Project>

modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.csproj

@@ -16,9 +16,15 @@
 
     <ItemGroup>
       <None Remove="..\..\Volo.Abp.SettingManagement.abpmdl.json" />
-      <EmbeddedResource Include="..\..\Volo.Abp.SettingManagement.abpmdl.json" />
+      <Content Include="..\..\Volo.Abp.SettingManagement.abpmdl.json">
+        <Pack>true</Pack>
+        <PackagePath>content\</PackagePath>
+      </Content>
       <None Remove="..\..\**\*.abppkg*.json" />
-      <EmbeddedResource Include="..\..\**\*.abppkg*.json" />
+      <Content Include="..\..\**\*.abppkg*.json">
+        <Pack>true</Pack>
+        <PackagePath>content\</PackagePath>
+      </Content>
     </ItemGroup>
 
 </Project>

modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.csproj

@@ -16,9 +16,15 @@
 
     <ItemGroup>
       <None Remove="..\..\Volo.Abp.TenantManagement.abpmdl.json" />
-      <EmbeddedResource Include="..\..\Volo.Abp.TenantManagement.abpmdl.json" />
+      <Content Include="..\..\Volo.Abp.TenantManagement.abpmdl.json">
+        <Pack>true</Pack>
+        <PackagePath>content\</PackagePath>
+      </Content>
       <None Remove="..\..\**\*.abppkg*.json" />
-      <EmbeddedResource Include="..\..\**\*.abppkg*.json" />
+      <Content Include="..\..\**\*.abppkg*.json">
+        <Pack>true</Pack>
+        <PackagePath>content\</PackagePath>
+      </Content>
     </ItemGroup>
 
 </Project>

modules/users/src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.csproj

@@ -16,9 +16,15 @@
 
     <ItemGroup>
       <None Remove="..\..\Volo.Abp.Users.abpmdl.json" />
-      <EmbeddedResource Include="..\..\Volo.Abp.Users.abpmdl.json" />
+      <Content Include="..\..\Volo.Abp.Users.abpmdl.json">
+        <Pack>true</Pack>
+        <PackagePath>content\</PackagePath>
+      </Content>
       <None Remove="..\..\**\*.abppkg*.json" />
-      <EmbeddedResource Include="..\..\**\*.abppkg*.json" />
+      <Content Include="..\..\**\*.abppkg*.json">
+        <Pack>true</Pack>
+        <PackagePath>content\</PackagePath>
+      </Content>
     </ItemGroup>
 
 </Project>

modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.csproj

@@ -16,9 +16,15 @@
 
     <ItemGroup>
       <None Remove="..\..\Volo.Abp.VirtualFileExplorer.abpmdl.json" />
-      <EmbeddedResource Include="..\..\Volo.Abp.VirtualFileExplorer.abpmdl.json" />
+      <Content Include="..\..\Volo.Abp.VirtualFileExplorer.abpmdl.json">
+        <Pack>true</Pack>
+        <PackagePath>content\</PackagePath>
+      </Content>
       <None Remove="..\..\**\*.abppkg*.json" />
-      <EmbeddedResource Include="..\..\**\*.abppkg*.json" />
+      <Content Include="..\..\**\*.abppkg*.json">
+        <Pack>true</Pack>
+        <PackagePath>content\</PackagePath>
+      </Content>
     </ItemGroup>
 
 </Project>

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Installer/MyCompanyName.MyProjectName.Installer.csproj

@@ -15,7 +15,10 @@
 
     <ItemGroup>
       <None Remove="..\..\MyCompanyName.MyProjectName.abpmdl.json" />
-      <EmbeddedResource Include="..\..\MyCompanyName.MyProjectName.abpmdl.json" />
+      <Content Include="..\..\MyCompanyName.MyProjectName.abpmdl.json">
+        <Pack>true</Pack>
+        <PackagePath>content\</PackagePath>
+      </Content>
     </ItemGroup>
 
 </Project>