From 8d2a1c7356a3b249a0bba6bf89d15f5e5711af1f Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@163.com>
Date: Thu, 5 Sep 2019 13:58:06 +0800
Subject: [PATCH] refactor: rearrange file folder

---
 .gitignore                                 | 2 +-
 Directory.Build.props                      | 4 ++--
 src/admin/Bootstrap.Admin/Dockerfile       | 2 +-
 src/admin/Bootstrap.Admin/Linux.Dockerfile | 2 +-
 src/admin/{ => keys}/Longbow.lic           | 0
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename src/admin/{ => keys}/Longbow.lic (100%)

diff --git a/.gitignore b/.gitignore
index c6b305e5..3f99431e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -347,7 +347,7 @@ ASALocalRun/
 **/[tT]humbs.db
 
 # Net Core Keys
-[Kk]eys/
+**/[Kk]eys/*.xml
 Bootstrap.Admin.xml
 
 ###### -- Custom Ignore Section, Make sure all files you add to the git repo are below this line  --  ######
diff --git a/Directory.Build.props b/Directory.Build.props
index 10e936d4..9df49bac 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -14,8 +14,8 @@
 
   <Target Condition=" '$(TargetFramework)' == 'netcoreapp2.2' " Name="PostBuild" AfterTargets="PostBuildEvent">
     <Message Text="Copy file -> $(TargetDir)" Importance="high" />
-    <Copy Condition="'$(OS)' == 'Windows_NT'" DestinationFolder="$(TargetDir)" SourceFiles="$(MSBuildThisFileDirectory)src\admin\Longbow.lic" SkipUnchangedFiles="true" />
-    <Copy Condition="'$(OS)' == 'UNIX'" DestinationFolder="$(TargetDir)" SourceFiles="$(MSBuildThisFileDirectory)src/admin/Longbow.lic" SkipUnchangedFiles="true" />
+    <Copy Condition="'$(OS)' == 'Windows_NT'" DestinationFolder="$(TargetDir)" SourceFiles="$(MSBuildThisFileDirectory)src\admin\keys\Longbow.lic" SkipUnchangedFiles="true" />
+    <Copy Condition="'$(OS)' == 'UNIX'" DestinationFolder="$(TargetDir)" SourceFiles="$(MSBuildThisFileDirectory)src/admin/keys/Longbow.lic" SkipUnchangedFiles="true" />
   </Target>
 
 </Project>
\ No newline at end of file
diff --git a/src/admin/Bootstrap.Admin/Dockerfile b/src/admin/Bootstrap.Admin/Dockerfile
index ee7219dc..9d5bfa4f 100644
--- a/src/admin/Bootstrap.Admin/Dockerfile
+++ b/src/admin/Bootstrap.Admin/Dockerfile
@@ -17,5 +17,5 @@ FROM base AS final
 WORKDIR /app
 COPY --from=publish /app .
 COPY --from=publish ["/src/Bootstrap.Admin/BootstrapAdmin.db", "./BootstrapAdmin.db"]
-COPY --from=publish ["/src/Longbow.lic", "./Longbow.lic"]
+COPY --from=publish ["/src/keys/Longbow.lic", "./Longbow.lic"]
 ENTRYPOINT ["dotnet", "Bootstrap.Admin.dll"]
\ No newline at end of file
diff --git a/src/admin/Bootstrap.Admin/Linux.Dockerfile b/src/admin/Bootstrap.Admin/Linux.Dockerfile
index 59a4c78a..fe4ea758 100644
--- a/src/admin/Bootstrap.Admin/Linux.Dockerfile
+++ b/src/admin/Bootstrap.Admin/Linux.Dockerfile
@@ -17,5 +17,5 @@ FROM base AS final
 WORKDIR /app
 COPY --from=publish /app .
 COPY --from=publish ["/src/Bootstrap.Admin/BootstrapAdmin.db", "./BootstrapAdmin.db"]
-COPY --from=publish ["/src/Longbow.lic", "./Longbow.lic"]
+COPY --from=publish ["/src/keys/Longbow.lic", "./Longbow.lic"]
 ENTRYPOINT ["dotnet", "Bootstrap.Admin.dll"]
\ No newline at end of file
diff --git a/src/admin/Longbow.lic b/src/admin/keys/Longbow.lic
similarity index 100%
rename from src/admin/Longbow.lic
rename to src/admin/keys/Longbow.lic