From 7e032c187b564b7923f0c8c9b0f21408ebc3cdee Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Thu, 23 Mar 2023 14:42:45 +0300
Subject: [PATCH 1/3] Change content type of studio files

---
 common.props                                       | 14 ++++++++++----
 .../Volo.Abp.Account.Installer.csproj              | 10 ++++++++--
 .../Volo.Abp.AuditLogging.Installer.csproj         |  6 ++++--
 .../Volo.Abp.BackgroundJobs.Installer.csproj       | 10 ++++++++--
 .../Volo.Abp.BasicTheme.Installer.csproj           | 10 ++++++++--
 .../Volo.Abp.BlobStoring.Database.Installer.csproj | 10 ++++++++--
 .../Volo.Blogging.Installer.csproj                 | 10 ++++++++--
 .../Volo.CmsKit.Installer.csproj                   | 10 ++++++++--
 .../Volo.Docs.Installer/Volo.Docs.Installer.csproj | 10 ++++++++--
 .../Volo.Abp.FeatureManagement.Installer.csproj    | 10 ++++++++--
 .../Volo.Abp.Identity.Installer.csproj             | 10 ++++++++--
 .../Volo.Abp.IdentityServer.Installer.csproj       |  5 ++++-
 .../Volo.Abp.OpenIddict.Installer.csproj           | 10 ++++++++--
 .../Volo.Abp.PermissionManagement.Installer.csproj | 10 ++++++++--
 .../Volo.Abp.SettingManagement.Installer.csproj    | 10 ++++++++--
 .../Volo.Abp.TenantManagement.Installer.csproj     | 10 ++++++++--
 .../Volo.Abp.Users.Installer.csproj                | 10 ++++++++--
 .../Volo.Abp.VirtualFileExplorer.Installer.csproj  | 10 ++++++++--
 .../MyCompanyName.MyProjectName.Installer.csproj   |  5 ++++-
 19 files changed, 142 insertions(+), 38 deletions(-)

diff --git a/common.props b/common.props
index faab44ccd2..6a1fa9c4b1 100644
--- a/common.props
+++ b/common.props
@@ -19,10 +19,16 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="*.abppkg.analyze.json" />
-    <Content Remove="*.abppkg.analyze.json" />
-    <EmbeddedResource Include="*.abppkg.json" />
-    <Content Remove="*.abppkg.json" />
+    <Content Include="*.abppkg.analyze.json">
+		<Pack>true</Pack>
+		<PackagePath>content\</PackagePath>
+	</Content>
+    <None Remove="*.abppkg.analyze.json" />
+    <Content Include="*.abppkg.json">
+		<Pack>true</Pack>
+		<PackagePath>content\</PackagePath>
+	</Content>
+    <None Remove="*.abppkg.json" />
   </ItemGroup>
   <ItemGroup Condition="$(AssemblyName.EndsWith('HttpApi.Client'))">
     <EmbeddedResource Include="**\*generate-proxy.json" />
diff --git a/modules/account/src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.csproj b/modules/account/src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.csproj
index d9d3f6b21c..e57404af7c 100644
--- a/modules/account/src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.csproj
+++ b/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>
diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.csproj b/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.csproj
index deb16126e8..5272ab63b0 100644
--- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.csproj
+++ b/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>
diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.csproj b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.csproj
index da44184bc4..0a6ad46241 100644
--- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.csproj
+++ b/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>
diff --git a/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.csproj b/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.csproj
index 7b1c87e564..2387cc606a 100644
--- a/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.csproj
+++ b/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>
diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.csproj b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.csproj
index 7ac2ce2691..be7b4b02e5 100644
--- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.csproj
+++ b/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>
diff --git a/modules/blogging/src/Volo.Blogging.Installer/Volo.Blogging.Installer.csproj b/modules/blogging/src/Volo.Blogging.Installer/Volo.Blogging.Installer.csproj
index 74de48410f..fe78c08517 100644
--- a/modules/blogging/src/Volo.Blogging.Installer/Volo.Blogging.Installer.csproj
+++ b/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>
diff --git a/modules/cms-kit/src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.csproj b/modules/cms-kit/src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.csproj
index 916f122386..36c4095def 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.csproj
+++ b/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>
diff --git a/modules/docs/src/Volo.Docs.Installer/Volo.Docs.Installer.csproj b/modules/docs/src/Volo.Docs.Installer/Volo.Docs.Installer.csproj
index e5aa21834b..3e5c1639e0 100644
--- a/modules/docs/src/Volo.Docs.Installer/Volo.Docs.Installer.csproj
+++ b/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>
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo.Abp.FeatureManagement.Installer.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo.Abp.FeatureManagement.Installer.csproj
index b1599f685f..9eb3807b09 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo.Abp.FeatureManagement.Installer.csproj
+++ b/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>
diff --git a/modules/identity/src/Volo.Abp.Identity.Installer/Volo.Abp.Identity.Installer.csproj b/modules/identity/src/Volo.Abp.Identity.Installer/Volo.Abp.Identity.Installer.csproj
index 6978ce16b7..178cce2f58 100644
--- a/modules/identity/src/Volo.Abp.Identity.Installer/Volo.Abp.Identity.Installer.csproj
+++ b/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>
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.csproj b/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.csproj
index fd07105633..0ca42f2d32 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.csproj
+++ b/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>
diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo.Abp.OpenIddict.Installer.csproj b/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo.Abp.OpenIddict.Installer.csproj
index 23e62b1773..633988228d 100644
--- a/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo.Abp.OpenIddict.Installer.csproj
+++ b/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>
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.csproj b/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.csproj
index 166e5ea06c..336bd1305f 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.csproj
+++ b/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>
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.csproj b/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.csproj
index afdc3b8f6f..30f56e6d5b 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.csproj
+++ b/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>
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.csproj
index cd32bccc17..5123574e63 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.csproj
+++ b/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>
diff --git a/modules/users/src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.csproj b/modules/users/src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.csproj
index 905725324b..e63fac79bb 100644
--- a/modules/users/src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.csproj
+++ b/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>
diff --git a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.csproj b/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.csproj
index 1171cd6fb7..499fd62242 100644
--- a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.csproj
+++ b/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>
diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Installer/MyCompanyName.MyProjectName.Installer.csproj b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Installer/MyCompanyName.MyProjectName.Installer.csproj
index 64f9efa66d..394a0c4df4 100644
--- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Installer/MyCompanyName.MyProjectName.Installer.csproj
+++ b/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>

From ad0c18956829b8ab91b24a35069d858b8a0626d2 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Thu, 23 Mar 2023 16:43:22 +0300
Subject: [PATCH 2/3] Update common.props

---
 common.props | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common.props b/common.props
index 6a1fa9c4b1..88dcfe1e36 100644
--- a/common.props
+++ b/common.props
@@ -18,17 +18,17 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup>
+  <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.analyze.json" />
+    <None Remove="*.abppkg.json" />
     <Content Include="*.abppkg.json">
 		<Pack>true</Pack>
 		<PackagePath>content\</PackagePath>
 	</Content>
-    <None Remove="*.abppkg.json" />
   </ItemGroup>
   <ItemGroup Condition="$(AssemblyName.EndsWith('HttpApi.Client'))">
     <EmbeddedResource Include="**\*generate-proxy.json" />

From 9874191db0e280fc352fe2dd1bf27ceeb62a71cb Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Fri, 24 Mar 2023 11:17:04 +0300
Subject: [PATCH 3/3] Update common.props

---
 common.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common.props b/common.props
index 88dcfe1e36..4c86e5be7b 100644
--- a/common.props
+++ b/common.props
@@ -28,7 +28,7 @@
     <Content Include="*.abppkg.json">
 		<Pack>true</Pack>
 		<PackagePath>content\</PackagePath>
-	</Content>
+    </Content>
   </ItemGroup>
   <ItemGroup Condition="$(AssemblyName.EndsWith('HttpApi.Client'))">
     <EmbeddedResource Include="**\*generate-proxy.json" />