Merge branch 'master' into dotnet-core-upgrade

# Conflicts:
#	src/modules/launcher/Plugins/Wox.Plugin.BrowserBookmark/Wox.Plugin.BrowserBookmark.csproj
#	src/modules/launcher/Plugins/Wox.Plugin.Calculator/Wox.Plugin.Calculator.csproj
#	src/modules/launcher/Plugins/Wox.Plugin.Color/Wox.Plugin.Color.csproj
#	src/modules/launcher/Plugins/Wox.Plugin.ControlPanel/Wox.Plugin.ControlPanel.csproj
#	src/modules/launcher/Plugins/Wox.Plugin.Everything/Wox.Plugin.Everything.csproj
#	src/modules/launcher/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj
#	src/modules/launcher/Plugins/Wox.Plugin.Indexer/Properties/AssemblyInfo.cs
#	src/modules/launcher/Plugins/Wox.Plugin.Indexer/Wox.Plugin.Indexer.csproj
#	src/modules/launcher/Plugins/Wox.Plugin.PluginIndicator/Wox.Plugin.PluginIndicator.csproj
#	src/modules/launcher/Plugins/Wox.Plugin.PluginManagement/Wox.Plugin.PluginManagement.csproj
#	src/modules/launcher/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj
#	src/modules/launcher/Plugins/Wox.Plugin.Shell/Wox.Plugin.Shell.csproj
#	src/modules/launcher/Plugins/Wox.Plugin.Sys/Wox.Plugin.Sys.csproj
#	src/modules/launcher/Plugins/Wox.Plugin.Url/Wox.Plugin.Url.csproj
#	src/modules/launcher/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj
#	src/modules/launcher/Wox.Core/Wox.Core.csproj
#	src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj
#	src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj
#	src/modules/launcher/Wox.Test/Wox.Test.csproj
#	src/modules/launcher/Wox/Wox.csproj
This commit is contained in:
Barbara Kudiess
2020-03-23 17:28:10 -07:00
187 changed files with 717 additions and 5369 deletions

View File

@@ -11,26 +11,30 @@
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\Output\Debug\Plugins\Wox.Plugin.Program\</OutputPath>
<OutputPath>..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Wox.Plugin.Program\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\Output\Release\Plugins\Wox.Plugin.Program\</OutputPath>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>..\..\..\..\..\x64\Release\modules\launcher\Plugins\Wox.Plugin.Program\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>