Merge dev

This commit is contained in:
张弘韬 2021-01-09 11:04:36 +08:00
parent 62009ac3fb
commit 494312a251
3 changed files with 3 additions and 9 deletions

View file

@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0-windows</TargetFramework>
<UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

View file

@ -7,6 +7,7 @@
<RootNamespace>Flow.Launcher.Plugin.Shell</RootNamespace>
<AssemblyName>Flow.Launcher.Plugin.Shell</AssemblyName>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>true</UseWPF>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
@ -53,10 +54,6 @@
<Content Include="Images\*.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Page Include="ShellSetting.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup>

View file

@ -8,6 +8,7 @@
<RootNamespace>Flow.Launcher.Plugin.Sys</RootNamespace>
<AssemblyName>Flow.Launcher.Plugin.Sys</AssemblyName>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>true</UseWPF>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
@ -48,10 +49,6 @@
<Content Include="Images\*.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Page Include="SysSettings.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup>