Move duplicate instance files into separate zip file

Particular · Feb 27, 2024 · e89babe · e89babe
1 parent 9464a03
commit e89babe
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 11 deletions.
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -76,7 +76,7 @@
   <ItemGroup>
     <GlobalPackageReference Include="Microsoft.Build.Artifacts" Version="6.1.10" />
     <GlobalPackageReference Include="Microsoft.Build.CopyOnWrite" Version="1.0.302" />
-    <GlobalPackageReference Include="Particular.Packaging" Version="4.0.0" />
+    <GlobalPackageReference Include="Particular.Packaging" Version="4.1.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/ServiceControl.Audit/ServiceControl.Audit.csproj b/src/ServiceControl.Audit/ServiceControl.Audit.csproj
@@ -46,7 +46,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Artifact Include="$(OutputPath)" FileExclude="ServiceControl.Audit.dll.config" DirExclude=".logs" DestinationFolder="$(ArtifactsPath)Particular.ServiceControl.Audit\ServiceControl.Audit" />
+    <Artifact Include="$(OutputPath)" FileExclude="ServiceControl.Audit.dll.config" DirExclude=".logs" DestinationFolder="$(ArtifactsPath)Particular.ServiceControl.Audit" />
   </ItemGroup>
 
 </Project>
diff --git a/src/ServiceControl.Monitoring/ServiceControl.Monitoring.csproj b/src/ServiceControl.Monitoring/ServiceControl.Monitoring.csproj
@@ -37,7 +37,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Artifact Include="$(OutputPath)" FileExclude="ServiceControl.Monitoring.dll.config;nsb*.txt" DirExclude=".logs" DestinationFolder="$(ArtifactsPath)Particular.ServiceControl.Monitoring\ServiceControl.Monitoring" />
+    <Artifact Include="$(OutputPath)" FileExclude="ServiceControl.Monitoring.dll.config;nsb*.txt" DirExclude=".logs" DestinationFolder="$(ArtifactsPath)Particular.ServiceControl.Monitoring" />
   </ItemGroup>
 
 </Project>
diff --git a/src/ServiceControl/ServiceControl.csproj b/src/ServiceControl/ServiceControl.csproj
@@ -50,7 +50,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Artifact Include="$(OutputPath)" FileExclude="ServiceControl.dll.config;nsb*.txt" DirExclude=".db;.logs" DestinationFolder="$(ArtifactsPath)Particular.ServiceControl\ServiceControl" />
+    <Artifact Include="$(OutputPath)" FileExclude="ServiceControl.dll.config;nsb*.txt" DirExclude=".db;.logs" DestinationFolder="$(ArtifactsPath)Particular.ServiceControl" />
   </ItemGroup>
 
 </Project>
diff --git a/src/ServiceControlInstaller.Packaging/ServiceControlInstaller.Packaging.csproj b/src/ServiceControlInstaller.Packaging/ServiceControlInstaller.Packaging.csproj
@@ -25,43 +25,59 @@
     <Primary>Particular.ServiceControl</Primary>
     <Audit>Particular.ServiceControl.Audit</Audit>
     <Monitoring>Particular.ServiceControl.Monitoring</Monitoring>
+    <InstanceShared>InstanceShared</InstanceShared>
     <Transports>Transports</Transports>
     <RavenDBServer>RavenDBServer</RavenDBServer>
   </PropertyGroup>
 
-  <Target Name="PrepareCreateZipFiles">
+  <UsingTask Condition="'$(ParticularPackagingTasksPath)' != ''" TaskName="Particular.Packaging.Tasks.GetDuplicateFiles" AssemblyFile="$(ParticularPackagingTasksPath)" />
+  <UsingTask Condition="'$(ParticularPackagingTasksPath)' != ''" TaskName="Particular.Packaging.Tasks.ZipFiles" AssemblyFile="$(ParticularPackagingTasksPath)" />
+
+  <Target Name="GetDuplicateInstanceFiles">
+    <GetDuplicateFiles BasePath="$(ArtifactsPath)" Paths="$(Primary);$(Audit);$(Monitoring)">
+      <Output TaskParameter="DuplicateFiles" ItemName="DuplicateInstanceFiles" />
+    </GetDuplicateFiles>
+  </Target>
+
+  <Target Name="PrepareCreateZipFiles" DependsOnTargets="GetDuplicateInstanceFiles">
     <ItemGroup>
       <PrimaryFilesToZip Include="$(ArtifactsPath)$(Primary)\**\*" />
       <AuditFilesToZip Include="$(ArtifactsPath)$(Audit)\**\*" />
       <MonitoringFilesToZip Include="$(ArtifactsPath)$(Monitoring)\**\*" />
+      <InstanceSharedFilesToZip Include="@(DuplicateInstanceFiles->'$(ArtifactsPath)$(Primary)\%(Identity)')" />
       <TransportsFilesToZip Include="$(ArtifactsPath)$(Transports)\**\*" />
       <RavenDBServerFilesToZip Include="$(ArtifactsPath)$(RavenDBServer)\**\*" />
     </ItemGroup>
   </Target>
 
   <Target Name="CreatePrimaryZipFile" AfterTargets="CopyArtifacts" DependsOnTargets="PrepareCreateZipFiles" Inputs="@(PrimaryFilesToZip)" Outputs="$(ZipFolder)$(Primary).zip">
     <MakeDir Directories="$(ZipFolder)" />
-    <ZipDirectory SourceDirectory="$(ArtifactsPath)$(Primary)" DestinationFile="$(ZipFolder)$(Primary).zip" Overwrite="true" />
+    <ZipFiles BasePath="$(ArtifactsPath)$(Primary)" Files="@(PrimaryFilesToZip)" ExcludedFiles="@(DuplicateInstanceFiles)" DestinationFile="$(ZipFolder)$(Primary).zip" />
   </Target>
 
   <Target Name="CreateAuditZipFile" AfterTargets="CopyArtifacts" DependsOnTargets="PrepareCreateZipFiles" Inputs="@(AuditFilesToZip)" Outputs="$(ZipFolder)$(Audit).zip">
     <MakeDir Directories="$(ZipFolder)" />
-    <ZipDirectory SourceDirectory="$(ArtifactsPath)$(Audit)" DestinationFile="$(ZipFolder)$(Audit).zip" Overwrite="true" />
+    <ZipFiles BasePath="$(ArtifactsPath)$(Audit)" Files="@(AuditFilesToZip)" ExcludedFiles="@(DuplicateInstanceFiles)" DestinationFile="$(ZipFolder)$(Audit).zip" />
   </Target>
 
   <Target Name="CreateMonitoringZipFile" AfterTargets="CopyArtifacts" DependsOnTargets="PrepareCreateZipFiles" Inputs="@(MonitoringFilesToZip)" Outputs="$(ZipFolder)$(Monitoring).zip">
     <MakeDir Directories="$(ZipFolder)" />
-    <ZipDirectory SourceDirectory="$(ArtifactsPath)$(Monitoring)" DestinationFile="$(ZipFolder)$(Monitoring).zip" Overwrite="true" />
+    <ZipFiles BasePath="$(ArtifactsPath)$(Monitoring)" Files="@(MonitoringFilesToZip)" ExcludedFiles="@(DuplicateInstanceFiles)" DestinationFile="$(ZipFolder)$(Monitoring).zip" />
+  </Target>
+
+  <Target Name="CreateInstanceSharedZipFile" AfterTargets="CopyArtifacts" DependsOnTargets="PrepareCreateZipFiles" Inputs="@(InstanceSharedFilesToZip)" Outputs="$(ZipFolder)$(InstanceShared).zip">
+    <MakeDir Directories="$(ZipFolder)" />
+    <ZipFiles BasePath="$(ArtifactsPath)$(Primary)" Files="@(InstanceSharedFilesToZip)" DestinationFile="$(ZipFolder)$(InstanceShared).zip" />
   </Target>
 
   <Target Name="CreateTransportsZipFile" AfterTargets="CopyArtifacts" DependsOnTargets="PrepareCreateZipFiles" Inputs="@(TransportsFilesToZip)" Outputs="$(ZipFolder)$(Transports).zip">
     <MakeDir Directories="$(ZipFolder)" />
-    <ZipDirectory SourceDirectory="$(ArtifactsPath)$(Transports)" DestinationFile="$(ZipFolder)$(Transports).zip" Overwrite="true" />
+    <ZipFiles BasePath="$(ArtifactsPath)$(Transports)" Files="@(TransportsFilesToZip)" DestinationFile="$(ZipFolder)$(Transports).zip" />
   </Target>
 
   <Target Name="CreateRavenDBServerZipFile" AfterTargets="CopyArtifacts" DependsOnTargets="PrepareCreateZipFiles" Inputs="@(RavenDBServerFilesToZip)" Outputs="$(ZipFolder)$(RavenDBServer).zip">
     <MakeDir Directories="$(ZipFolder)" />
-    <ZipDirectory SourceDirectory="$(ArtifactsPath)$(RavenDBServer)" DestinationFile="$(ZipFolder)$(RavenDBServer).zip" Overwrite="true" />
+    <ZipFiles BasePath="$(ArtifactsPath)$(RavenDBServer)" Files="@(RavenDBServerFilesToZip)" DestinationFile="$(ZipFolder)$(RavenDBServer).zip" />
   </Target>
 
-</Project>
+</Project>