Skip to content

Commit 8f99d63

Browse files
committed
update how theme files are copied to output folder
Moved the copying of themes from the build script to the project file. The recursive copy-item call in the post-build script was causing the 2 files inside `Themes/ThemeBuilder` to also be copied, which resulted in the `Tempalte.xaml` being loaded at runtime as a theme. Closes #38
1 parent 416cc71 commit 8f99d63

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

Flow.Launcher/Flow.Launcher.csproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,14 @@
6262
</Content>
6363
</ItemGroup>
6464

65+
<ItemGroup>
66+
<Content Include="Themes\*.xaml">
67+
<Generator>MSBuild:Compile</Generator>
68+
<SubType>Designer</SubType>
69+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
70+
</Content>
71+
</ItemGroup>
72+
6573
<ItemGroup>
6674
<PackageReference Include="InputSimulator" Version="1.0.4" />
6775
<PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />

Scripts/post_build.ps1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ function Copy-Resources ($path, $config) {
3535
$project = "$path\Flow.Launcher"
3636
$output = "$path\Output"
3737
$target = "$output\$config"
38-
Copy-Item -Recurse -Force $project\Themes\* $target\Themes\
3938
Copy-Item -Recurse -Force $project\Images\* $target\Images\
4039
Copy-Item -Recurse -Force $path\Plugins\HelloWorldPython $target\Plugins\HelloWorldPython
4140
Copy-Item -Recurse -Force $path\JsonRPC $target\JsonRPC

0 commit comments

Comments
 (0)