Skip to content

Commit 597dc06

Browse files
committed
revert unexpected personal change
1 parent 900f009 commit 597dc06

File tree

5 files changed

+12
-6
lines changed

5 files changed

+12
-6
lines changed

Flow.Launcher/Flow.Launcher.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<SubType>Designer</SubType>
6161
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
6262
</Content>
63-
<Content Include="Images\*">
63+
<Content Include="Images\*.png">
6464
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
6565
</Content>
6666
<Content Include="Images\*.svg">
@@ -78,7 +78,7 @@
7878

7979
<ItemGroup>
8080
<PackageReference Include="InputSimulator" Version="1.0.4" />
81-
<PackageReference Include="ModernWpfUI" Version="0.9.2" />
81+
<PackageReference Include="ModernWpfUI" Version="0.8.3" />
8282
<PackageReference Include="NHotkey.Wpf" Version="1.2.1" />
8383
<PackageReference Include="NuGet.CommandLine" Version="5.4.0">
8484
<PrivateAssets>all</PrivateAssets>

Flow.Launcher/Properties/PublishProfiles/Net5-SelfContained.pubxml renamed to Flow.Launcher/Properties/PublishProfiles/NetCore3.1-SelfContained.pubxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
1212
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
1313
<SelfContained>true</SelfContained>
1414
<PublishSingleFile>False</PublishSingleFile>
15-
<PublishReadyToRun>True</PublishReadyToRun>
15+
<PublishReadyToRun>False</PublishReadyToRun>
1616
<PublishTrimmed>False</PublishTrimmed>
1717
</PropertyGroup>
1818
</Project>

Plugins/Flow.Launcher.Plugin.Shell/Flow.Launcher.Plugin.Shell.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<RootNamespace>Flow.Launcher.Plugin.Shell</RootNamespace>
99
<AssemblyName>Flow.Launcher.Plugin.Shell</AssemblyName>
1010
<UseWindowsForms>true</UseWindowsForms>
11-
<UseWPF>true</UseWPF>
1211
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
1312
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1413
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
@@ -55,6 +54,10 @@
5554
<Content Include="Images\*.png">
5655
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
5756
</Content>
57+
<Page Include="ShellSetting.xaml">
58+
<Generator>MSBuild:Compile</Generator>
59+
<SubType>Designer</SubType>
60+
</Page>
5861
</ItemGroup>
5962

6063
<ItemGroup>

Plugins/Flow.Launcher.Plugin.Sys/Flow.Launcher.Plugin.Sys.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<RootNamespace>Flow.Launcher.Plugin.Sys</RootNamespace>
99
<AssemblyName>Flow.Launcher.Plugin.Sys</AssemblyName>
1010
<UseWindowsForms>true</UseWindowsForms>
11-
<UseWPF>true</UseWPF>
1211
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
1312
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1413
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
@@ -49,6 +48,10 @@
4948
<Content Include="Images\*.png">
5049
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
5150
</Content>
51+
<Page Include="SysSettings.xaml">
52+
<Generator>MSBuild:Compile</Generator>
53+
<SubType>Designer</SubType>
54+
</Page>
5255
</ItemGroup>
5356

5457
<ItemGroup>

Scripts/post_build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ function Pack-Squirrel-Installer ($path, $version, $output) {
9090
function Publish-Self-Contained ($p) {
9191

9292
$csproj = Join-Path "$p" "Flow.Launcher/Flow.Launcher.csproj" -Resolve
93-
$profile = Join-Path "$p" "Flow.Launcher/Properties/PublishProfiles/Net5-SelfContained.pubxml" -Resolve
93+
$profile = Join-Path "$p" "Flow.Launcher/Properties/PublishProfiles/NetCore3.1-SelfContained.pubxml" -Resolve
9494

9595
# we call dotnet publish on the main project.
9696
# The other projects should have been built in Release at this point.

0 commit comments

Comments
 (0)