Skip to content

Commit 4b45a19

Browse files
committed
Plugins converted from .NET Framework to .NET Core
1 parent 556ff97 commit 4b45a19

File tree

27 files changed

+440
-964
lines changed

27 files changed

+440
-964
lines changed
Lines changed: 19 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
75
<ProjectGuid>{03FFA443-5F50-48D5-8869-F3DF316803AA}</ProjectGuid>
8-
<OutputType>Library</OutputType>
96
<AppDesignerFolder>Properties</AppDesignerFolder>
107
<RootNamespace>HelloWorldCSharp</RootNamespace>
118
<AssemblyName>HelloWorldCSharp</AssemblyName>
12-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
15-
<TargetFrameworkProfile />
9+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
10+
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
11+
<ApplicationIcon />
12+
<OutputType>Library</OutputType>
13+
<StartupObject />
1614
</PropertyGroup>
15+
1716
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1817
<PlatformTarget>AnyCPU</PlatformTarget>
1918
<DebugSymbols>true</DebugSymbols>
@@ -25,6 +24,7 @@
2524
<WarningLevel>4</WarningLevel>
2625
<Prefer32Bit>false</Prefer32Bit>
2726
</PropertyGroup>
27+
2828
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2929
<PlatformTarget>AnyCPU</PlatformTarget>
3030
<DebugType>pdbonly</DebugType>
@@ -35,47 +35,26 @@
3535
<WarningLevel>4</WarningLevel>
3636
<Prefer32Bit>false</Prefer32Bit>
3737
</PropertyGroup>
38-
<PropertyGroup>
39-
<StartupObject />
40-
</PropertyGroup>
41-
<ItemGroup>
42-
<Reference Include="System" />
43-
<Reference Include="System.Core" />
44-
<Reference Include="System.Xml.Linq" />
45-
<Reference Include="System.Data.DataSetExtensions" />
46-
<Reference Include="Microsoft.CSharp" />
47-
<Reference Include="System.Data" />
48-
<Reference Include="System.Net.Http" />
49-
<Reference Include="System.Xml" />
50-
</ItemGroup>
51-
<ItemGroup>
52-
<Compile Include="Main.cs" />
53-
<Compile Include="Properties\AssemblyInfo.cs" />
54-
</ItemGroup>
38+
5539
<ItemGroup>
5640
<None Include="App.config" />
5741
<None Include="plugin.json">
5842
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
5943
</None>
6044
</ItemGroup>
45+
6146
<ItemGroup>
62-
<ProjectReference Include="..\..\Wox.Plugin\Wox.Plugin.csproj">
63-
<Project>{8451ECDD-2EA4-4966-BB0A-7BBC40138E80}</Project>
64-
<Name>Wox.Plugin</Name>
65-
</ProjectReference>
47+
<ProjectReference Include="..\..\Wox.Plugin\Wox.Plugin.csproj" />
6648
</ItemGroup>
67-
<ItemGroup />
49+
6850
<ItemGroup>
6951
<Content Include="Images\app.png">
7052
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
7153
</Content>
7254
</ItemGroup>
73-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
74-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
75-
Other similar extension points exist, see Microsoft.Common.targets.
76-
<Target Name="BeforeBuild">
77-
</Target>
78-
<Target Name="AfterBuild">
79-
</Target>
80-
-->
55+
56+
<ItemGroup>
57+
<Folder Include="Properties\" />
58+
</ItemGroup>
59+
8160
</Project>
Lines changed: 23 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,15 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
75
<ProjectGuid>{9B130CC5-14FB-41FF-B310-0A95B6894C37}</ProjectGuid>
8-
<OutputType>Library</OutputType>
96
<AppDesignerFolder>Properties</AppDesignerFolder>
107
<RootNamespace>Wox.Plugin.BrowserBookmark</RootNamespace>
118
<AssemblyName>Wox.Plugin.BrowserBookmark</AssemblyName>
12-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
15-
<RestorePackages>true</RestorePackages>
16-
<TargetFrameworkProfile />
17-
<NuGetPackageImportStamp>
18-
</NuGetPackageImportStamp>
9+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
10+
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
1911
</PropertyGroup>
12+
2013
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2114
<DebugSymbols>true</DebugSymbols>
2215
<DebugType>full</DebugType>
@@ -27,6 +20,7 @@
2720
<WarningLevel>4</WarningLevel>
2821
<Prefer32Bit>false</Prefer32Bit>
2922
</PropertyGroup>
23+
3024
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3125
<DebugType>pdbonly</DebugType>
3226
<Optimize>true</Optimize>
@@ -36,34 +30,14 @@
3630
<WarningLevel>4</WarningLevel>
3731
<Prefer32Bit>false</Prefer32Bit>
3832
</PropertyGroup>
39-
<ItemGroup>
40-
<Reference Include="PresentationCore" />
41-
<Reference Include="PresentationFramework" />
42-
<Reference Include="System" />
43-
<Reference Include="System.ComponentModel.DataAnnotations" />
44-
<Reference Include="System.Core" />
45-
<Reference Include="System.Data" />
46-
<Reference Include="System.Xaml" />
47-
<Reference Include="WindowsBase" />
48-
</ItemGroup>
49-
<ItemGroup>
50-
<Compile Include="Bookmark.cs" />
51-
<Compile Include="ChromeBookmarks.cs" />
52-
<Compile Include="Commands\Bookmarks.cs" />
53-
<Compile Include="FirefoxBookmarks.cs" />
54-
<Compile Include="Main.cs" />
55-
<Compile Include="Models\Settings.cs" />
56-
<Compile Include="Properties\AssemblyInfo.cs" />
57-
<Compile Include="Views\SettingsControl.xaml.cs">
58-
<DependentUpon>SettingsControl.xaml</DependentUpon>
59-
</Compile>
60-
</ItemGroup>
33+
6134
<ItemGroup>
6235
<None Include="app.config" />
6336
<None Include="plugin.json">
6437
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
6538
</None>
6639
</ItemGroup>
40+
6741
<ItemGroup>
6842
<Content Include="Images\bookmark.png">
6943
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -80,47 +54,35 @@
8054
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
8155
</Content>
8256
</ItemGroup>
57+
8358
<ItemGroup>
84-
<ProjectReference Include="..\..\Wox.Infrastructure\Wox.Infrastructure.csproj">
85-
<Project>{4fd29318-a8ab-4d8f-aa47-60bc241b8da3}</Project>
86-
<Name>Wox.Infrastructure</Name>
87-
</ProjectReference>
88-
<ProjectReference Include="..\..\Wox.Plugin\Wox.Plugin.csproj">
89-
<Project>{8451ecdd-2ea4-4966-bb0a-7bbc40138e80}</Project>
90-
<Name>Wox.Plugin</Name>
91-
</ProjectReference>
59+
<ProjectReference Include="..\..\Wox.Infrastructure\Wox.Infrastructure.csproj" />
60+
<ProjectReference Include="..\..\Wox.Plugin\Wox.Plugin.csproj" />
9261
</ItemGroup>
62+
9363
<ItemGroup>
9464
<Content Include="Languages\tr.xaml">
9565
<Generator>MSBuild:Compile</Generator>
9666
<SubType>Designer</SubType>
9767
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
9868
</Content>
9969
</ItemGroup>
70+
10071
<ItemGroup>
10172
<Page Include="Views\SettingsControl.xaml">
10273
<Generator>MSBuild:Compile</Generator>
10374
<SubType>Designer</SubType>
10475
</Page>
10576
</ItemGroup>
77+
78+
<ItemGroup>
79+
<PackageReference Include="System.Data.SQLite" Version="1.0.112" />
80+
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.112" />
81+
<PackageReference Include="UnidecodeSharp" Version="1.0.0" />
82+
</ItemGroup>
83+
10684
<ItemGroup>
107-
<PackageReference Include="System.Data.SQLite">
108-
<Version>1.0.111</Version>
109-
</PackageReference>
110-
<PackageReference Include="System.Data.SQLite.Core">
111-
<Version>1.0.111</Version>
112-
</PackageReference>
113-
<PackageReference Include="UnidecodeSharp">
114-
<Version>1.0.0</Version>
115-
</PackageReference>
85+
<Folder Include="Properties\" />
11686
</ItemGroup>
117-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
118-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
119-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
120-
Other similar extension points exist, see Microsoft.Common.targets.
121-
<Target Name="BeforeBuild">
122-
</Target>
123-
<Target Name="AfterBuild">
124-
</Target>
125-
-->
87+
12688
</Project>
Lines changed: 27 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
75
<ProjectGuid>{59BD9891-3837-438A-958D-ADC7F91F6F7E}</ProjectGuid>
8-
<OutputType>Library</OutputType>
96
<AppDesignerFolder>Properties</AppDesignerFolder>
107
<RootNamespace>Wox.Plugin.Caculator</RootNamespace>
118
<AssemblyName>Wox.Plugin.Caculator</AssemblyName>
12-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
15-
<TargetFrameworkProfile />
9+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
10+
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
1611
</PropertyGroup>
12+
1713
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1814
<DebugSymbols>true</DebugSymbols>
1915
<DebugType>full</DebugType>
@@ -24,6 +20,7 @@
2420
<WarningLevel>4</WarningLevel>
2521
<Prefer32Bit>false</Prefer32Bit>
2622
</PropertyGroup>
23+
2724
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2825
<DebugType>pdbonly</DebugType>
2926
<Optimize>true</Optimize>
@@ -33,111 +30,80 @@
3330
<WarningLevel>4</WarningLevel>
3431
<Prefer32Bit>false</Prefer32Bit>
3532
</PropertyGroup>
36-
<ItemGroup>
37-
<Reference Include="JetBrains.Annotations, Version=10.3.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
38-
<HintPath>..\..\packages\JetBrains.Annotations.10.3.0\lib\net\JetBrains.Annotations.dll</HintPath>
39-
<Private>True</Private>
40-
</Reference>
41-
<Reference Include="Mages.Core, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\..\packages\Mages.1.5.0\lib\net35\Mages.Core.dll</HintPath>
43-
<Private>True</Private>
44-
</Reference>
45-
<Reference Include="PresentationCore" />
46-
<Reference Include="PresentationFramework" />
47-
<Reference Include="System" />
48-
<Reference Include="System.Core" />
49-
</ItemGroup>
50-
<ItemGroup>
51-
<Compile Include="..\..\SolutionAssemblyInfo.cs">
52-
<Link>Properties\SolutionAssemblyInfo.cs</Link>
53-
</Compile>
54-
<Compile Include="NumberTranslator.cs" />
55-
<Compile Include="Main.cs" />
56-
<Compile Include="Properties\AssemblyInfo.cs" />
57-
</ItemGroup>
33+
5834
<ItemGroup>
5935
<None Include="plugin.json">
6036
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
6137
</None>
6238
</ItemGroup>
39+
6340
<ItemGroup>
64-
<ProjectReference Include="..\..\Wox.Infrastructure\Wox.Infrastructure.csproj">
65-
<Project>{4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}</Project>
66-
<Name>Wox.Infrastructure</Name>
67-
</ProjectReference>
68-
<ProjectReference Include="..\..\Wox.Plugin\Wox.Plugin.csproj">
69-
<Project>{8451ecdd-2ea4-4966-bb0a-7bbc40138e80}</Project>
70-
<Name>Wox.Plugin</Name>
71-
</ProjectReference>
41+
<ProjectReference Include="..\..\Wox.Infrastructure\Wox.Infrastructure.csproj" />
42+
<ProjectReference Include="..\..\Wox.Plugin\Wox.Plugin.csproj" />
7243
</ItemGroup>
44+
7345
<ItemGroup>
7446
<None Include="Images\calculator.png">
7547
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
7648
</None>
7749
</ItemGroup>
50+
7851
<ItemGroup>
7952
<Content Include="Languages\en.xaml">
8053
<Generator>MSBuild:Compile</Generator>
8154
<SubType>Designer</SubType>
8255
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
8356
</Content>
8457
</ItemGroup>
58+
8559
<ItemGroup>
8660
<Content Include="Languages\zh-cn.xaml">
8761
<Generator>MSBuild:Compile</Generator>
8862
<SubType>Designer</SubType>
8963
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
9064
</Content>
9165
</ItemGroup>
66+
9267
<ItemGroup>
9368
<Content Include="Languages\zh-tw.xaml">
9469
<Generator>MSBuild:Compile</Generator>
9570
<SubType>Designer</SubType>
9671
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
9772
</Content>
9873
</ItemGroup>
74+
9975
<ItemGroup>
10076
<Content Include="Languages\de.xaml">
10177
<Generator>MSBuild:Compile</Generator>
10278
<SubType>Designer</SubType>
10379
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
10480
</Content>
10581
</ItemGroup>
82+
10683
<ItemGroup>
10784
<Content Include="Languages\pl.xaml">
10885
<Generator>MSBuild:Compile</Generator>
10986
<SubType>Designer</SubType>
11087
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
11188
</Content>
11289
</ItemGroup>
90+
11391
<ItemGroup>
11492
<Content Include="Languages\tr.xaml">
11593
<Generator>MSBuild:Compile</Generator>
11694
<SubType>Designer</SubType>
11795
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
11896
</Content>
11997
</ItemGroup>
98+
12099
<ItemGroup>
121-
<PackageReference Include="JetBrains.Annotations">
122-
<Version>10.3.0</Version>
123-
</PackageReference>
124-
<PackageReference Include="Mages">
125-
<Version>1.5.0</Version>
126-
</PackageReference>
127-
<PackageReference Include="System.Runtime">
128-
<Version>4.0.0</Version>
129-
</PackageReference>
100+
<PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
101+
<PackageReference Include="Mages" Version="1.6.0" />
102+
<PackageReference Include="System.Runtime" Version="4.3.1" />
130103
</ItemGroup>
131-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
132-
<PropertyGroup>
133-
<PostBuildEvent>
134-
</PostBuildEvent>
135-
</PropertyGroup>
136-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
137-
Other similar extension points exist, see Microsoft.Common.targets.
138-
<Target Name="BeforeBuild">
139-
</Target>
140-
<Target Name="AfterBuild">
141-
</Target>
142-
-->
104+
105+
<ItemGroup>
106+
<Folder Include="Properties\" />
107+
</ItemGroup>
108+
143109
</Project>

0 commit comments

Comments
 (0)