Merge branch 'master' into feature/quick_image_svgaii

DEVBOX10 · Oct 31, 2021 · bc1286d · bc1286d
2 parents bda8f8f + b296d7a
commit bc1286d
Show file tree

Hide file tree

Showing 3 changed files with 220 additions and 181 deletions.
diff --git a/source/Cosmos.Build.Tasks/build/Cosmos.Build.targets b/source/Cosmos.Build.Tasks/build/Cosmos.Build.targets
@@ -301,7 +301,11 @@
             Inputs="$(BinFile)"
             Outputs="$(IsoFile)"
             Condition="'$(Deployment)' == 'ISO'">
-
+
+		<ItemGroup>
+			<_IsoCustomFiles Include="$(MSBuildProjectDirectory)\isoFiles\**\*.*" />
+		</ItemGroup>
+
         <ItemGroup>
             <_IsoFile Include="$(SyslinuxPath)core\isolinux.bin" />
             <_IsoFile Include="$(SyslinuxPath)com32\elflink\ldlinux\ldlinux.c32" />
@@ -317,6 +321,9 @@
         <Copy SourceFiles="@(_IsoFile)"
               DestinationFolder="$(IntermediateIsoDirectory)" />
 
+        <Copy SourceFiles="@(_IsoCustomFiles)"
+             DestinationFolder="$(IntermediateIsoDirectory)" />
+
         <CreateSyslinuxConfig TargetDirectory="$(IntermediateIsoDirectory)"
                               BinName="$([System.IO.Path]::GetFileName('$(BinFile)'))" />