Skip to content

Commit fb266e9

Browse files
flier268flier268
authored
Merge pull request #35 from ricky-cck/master
Converted project sdk to Microsoft.NET.Sdk.WindowsDesktop
2 parents e100745 + fce36f0 commit fb266e9

File tree

2 files changed

+47
-288
lines changed

2 files changed

+47
-288
lines changed

‎ConvertZZ/ConvertZZ.csproj

Lines changed: 46 additions & 244 deletions
Original file line numberDiff line numberDiff line change
@@ -1,273 +1,75 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\PropertyChanged.Fody.3.2.6\build\PropertyChanged.Fody.props" Condition="Exists('..\packages\PropertyChanged.Fody.3.2.6\build\PropertyChanged.Fody.props')" />
4-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
2+
53
<PropertyGroup>
6-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8-
<ProjectGuid>{6A1085BA-8F18-4866-937A-883192D2F47C}</ProjectGuid>
94
<OutputType>WinExe</OutputType>
10-
<RootNamespace>ConvertZZ</RootNamespace>
11-
<AssemblyName>ConvertZZ</AssemblyName>
12-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
15-
<WarningLevel>4</WarningLevel>
16-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
17-
<TargetFrameworkProfile />
18-
<NuGetPackageImportStamp>
19-
</NuGetPackageImportStamp>
20-
</PropertyGroup>
21-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
22-
<PlatformTarget>AnyCPU</PlatformTarget>
23-
<DebugSymbols>true</DebugSymbols>
24-
<DebugType>full</DebugType>
25-
<Optimize>false</Optimize>
26-
<OutputPath>bin\Debug\</OutputPath>
27-
<DefineConstants>DEBUG;TRACE</DefineConstants>
28-
<ErrorReport>prompt</ErrorReport>
29-
<WarningLevel>4</WarningLevel>
30-
</PropertyGroup>
31-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
32-
<PlatformTarget>AnyCPU</PlatformTarget>
33-
<DebugType>pdbonly</DebugType>
34-
<Optimize>true</Optimize>
35-
<OutputPath>bin\Release\</OutputPath>
36-
<DefineConstants>TRACE</DefineConstants>
37-
<ErrorReport>prompt</ErrorReport>
38-
<WarningLevel>4</WarningLevel>
39-
</PropertyGroup>
40-
<PropertyGroup>
5+
<TargetFramework>net472</TargetFramework>
6+
<UseWPF>true</UseWPF>
7+
<Copyright>Copyright © flier268 2019</Copyright>
8+
<Version>1.0.0.8</Version>
419
<ApplicationIcon>icon.ico</ApplicationIcon>
4210
</PropertyGroup>
11+
12+
<ItemGroup>
13+
<Compile Remove="Resources\**" />
14+
<EmbeddedResource Remove="Resources\**" />
15+
<None Remove="Resources\**" />
16+
<Page Remove="Resources\**" />
17+
</ItemGroup>
18+
19+
<ItemGroup>
20+
<None Remove="icon.ico" />
21+
<None Remove="Windows Logo.png" />
22+
</ItemGroup>
23+
24+
<ItemGroup>
25+
<PackageReference Include="Fanhuaji-API" Version="1.0.0" />
26+
<PackageReference Include="Flier.Toolbox.Text" Version="1.0.1" />
27+
<PackageReference Include="MaterialDesignThemes" Version="3.0.1" />
28+
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
29+
<PackageReference Include="PropertyChanged.Fody" Version="3.2.6" />
30+
<PackageReference Include="taglib" Version="2.1.0" />
31+
<PackageReference Include="WindowsAPICodePack" Version="1.1.1" />
32+
</ItemGroup>
33+
4334
<ItemGroup>
44-
<Reference Include="Fanhuaji-API, Version=1.0.0.0, Culture=neutral, PublicKeyToken=801680f93d3b8d66, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Fanhuaji-API.1.0.0\lib\netstandard2.0\Fanhuaji-API.dll</HintPath>
46-
</Reference>
47-
<Reference Include="Flier.Toolbox.Text, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Flier.Toolbox.Text.1.0.1\lib\netstandard2.0\Flier.Toolbox.Text.dll</HintPath>
49-
</Reference>
50-
<Reference Include="MaterialDesignColors, Version=1.2.2.920, Culture=neutral, processorArchitecture=MSIL">
51-
<HintPath>..\packages\MaterialDesignColors.1.2.2\lib\net45\MaterialDesignColors.dll</HintPath>
52-
</Reference>
53-
<Reference Include="MaterialDesignThemes.Wpf, Version=3.0.1.920, Culture=neutral, processorArchitecture=MSIL">
54-
<HintPath>..\packages\MaterialDesignThemes.3.0.1\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
55-
</Reference>
56-
<Reference Include="Microsoft.WindowsAPICodePack, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
57-
<HintPath>..\packages\WindowsAPICodePack.1.1.1\lib\Microsoft.WindowsAPICodePack.dll</HintPath>
58-
</Reference>
59-
<Reference Include="Microsoft.WindowsAPICodePack.ExtendedLinguisticServices, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60-
<HintPath>..\packages\WindowsAPICodePack.1.1.1\lib\Microsoft.WindowsAPICodePack.ExtendedLinguisticServices.dll</HintPath>
61-
</Reference>
62-
<Reference Include="Microsoft.WindowsAPICodePack.Sensors, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63-
<HintPath>..\packages\WindowsAPICodePack.1.1.1\lib\Microsoft.WindowsAPICodePack.Sensors.dll</HintPath>
64-
</Reference>
65-
<Reference Include="Microsoft.WindowsAPICodePack.Shell, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
66-
<HintPath>..\packages\WindowsAPICodePack.1.1.1\lib\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
67-
</Reference>
68-
<Reference Include="Microsoft.WindowsAPICodePack.ShellExtensions, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
69-
<HintPath>..\packages\WindowsAPICodePack.1.1.1\lib\Microsoft.WindowsAPICodePack.ShellExtensions.dll</HintPath>
70-
</Reference>
71-
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
72-
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
73-
</Reference>
74-
<Reference Include="policy.2.0.taglib-sharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=db62eba44689b5b0, processorArchitecture=MSIL">
75-
<HintPath>..\packages\taglib.2.1.0.0\lib\policy.2.0.taglib-sharp.dll</HintPath>
76-
</Reference>
77-
<Reference Include="PropertyChanged, Version=3.2.6.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
78-
<HintPath>..\packages\PropertyChanged.Fody.3.2.6\lib\net40\PropertyChanged.dll</HintPath>
79-
</Reference>
80-
<Reference Include="System" />
81-
<Reference Include="System.Data" />
82-
<Reference Include="System.Drawing" />
83-
<Reference Include="System.Web" />
84-
<Reference Include="System.Windows.Forms" />
85-
<Reference Include="System.Xml" />
8635
<Reference Include="Microsoft.CSharp" />
87-
<Reference Include="System.Core" />
88-
<Reference Include="System.Xml.Linq" />
89-
<Reference Include="System.Data.DataSetExtensions" />
9036
<Reference Include="System.Net.Http" />
91-
<Reference Include="System.Xaml">
92-
<RequiredTargetFramework>4.0</RequiredTargetFramework>
93-
</Reference>
94-
<Reference Include="taglib-sharp, Version=2.1.0.0, Culture=neutral, PublicKeyToken=db62eba44689b5b0, processorArchitecture=MSIL">
95-
<HintPath>..\packages\taglib.2.1.0.0\lib\taglib-sharp.dll</HintPath>
96-
</Reference>
97-
<Reference Include="WindowsBase" />
98-
<Reference Include="PresentationCore" />
99-
<Reference Include="PresentationFramework" />
37+
<Reference Include="System.Windows.Forms" />
10038
</ItemGroup>
39+
10140
<ItemGroup>
102-
<ApplicationDefinition Include="App.xaml">
103-
<Generator>MSBuild:Compile</Generator>
104-
<SubType>Designer</SubType>
105-
</ApplicationDefinition>
106-
<Compile Include="CheckboxTreeView.xaml.cs">
107-
<DependentUpon>CheckboxTreeView.xaml</DependentUpon>
108-
</Compile>
109-
<Compile Include="Class\Fanhuaji_Config.cs" />
110-
<Compile Include="Enums\Enum_DictionaryStatus.cs" />
111-
<Compile Include="Enums\Enum_Engine.cs" />
112-
<Compile Include="Enums\Enum_Mode.cs" />
113-
<Compile Include="Moudle\ChineseConverter.cs" />
114-
<Compile Include="Moudle\ConvertString.cs" />
115-
<Compile Include="Moudle\DictionaryFile_Helper.cs" />
116-
<Compile Include="Moudle\EncodingAnalyzer.cs" />
117-
<Compile Include="Moudle\Extension_ID3.cs" />
118-
<Compile Include="Moudle\Extentions.cs" />
119-
<Compile Include="Moudle\Hotkey.cs" />
120-
<Compile Include="Moudle\Shortcut.cs" />
121-
<Compile Include="Moudle\StreamString.cs" />
122-
<Compile Include="Moudle\StringToUnicode.cs" />
123-
<Compile Include="Moudle\Toast.xaml.cs">
124-
<DependentUpon>Toast.xaml</DependentUpon>
125-
</Compile>
126-
<Compile Include="Moudle\TransferEncodeHelper.cs" />
127-
<Compile Include="Moudle\UpdateChecker.cs" />
128-
<Compile Include="Moudle\Window_KeyValueEditor.xaml.cs">
129-
<DependentUpon>Window_KeyValueEditor.xaml</DependentUpon>
130-
</Compile>
131-
<Compile Include="Moudle\Window_MessageBoxEx.xaml.cs">
132-
<DependentUpon>Window_MessageBoxEx.xaml</DependentUpon>
133-
</Compile>
134-
<Compile Include="Pages\Page_AudioTags.xaml.cs">
135-
<DependentUpon>Page_AudioTags.xaml</DependentUpon>
136-
</Compile>
137-
<Compile Include="Pages\Page_ClipBoard.xaml.cs">
138-
<DependentUpon>Page_ClipBoard.xaml</DependentUpon>
139-
</Compile>
140-
<Compile Include="Pages\Page_File.xaml.cs">
141-
<DependentUpon>Page_File.xaml</DependentUpon>
142-
</Compile>
143-
<Compile Include="Settings.cs" />
144-
<Compile Include="Window_About.xaml.cs">
145-
<DependentUpon>Window_About.xaml</DependentUpon>
146-
</Compile>
147-
<Compile Include="Window_DialogHost.xaml.cs">
148-
<DependentUpon>Window_DialogHost.xaml</DependentUpon>
149-
</Compile>
150-
<Compile Include="Window_DictionaryEditor.xaml.cs">
151-
<DependentUpon>Window_DictionaryEditor.xaml</DependentUpon>
152-
</Compile>
153-
<Compile Include="Window_FanhuajiSetting.xaml.cs">
154-
<DependentUpon>Window_FanhuajiSetting.xaml</DependentUpon>
155-
</Compile>
156-
<Compile Include="Window_Report.xaml.cs">
157-
<DependentUpon>Window_Report.xaml</DependentUpon>
158-
</Compile>
159-
<Compile Include="Window_Setting.xaml.cs">
160-
<DependentUpon>Window_Setting.xaml</DependentUpon>
161-
</Compile>
162-
<Page Include="CheckboxTreeView.xaml">
163-
<SubType>Designer</SubType>
164-
<Generator>MSBuild:Compile</Generator>
165-
</Page>
166-
<Page Include="MainWindow.xaml">
167-
<Generator>MSBuild:Compile</Generator>
168-
<SubType>Designer</SubType>
169-
</Page>
170-
<Compile Include="App.xaml.cs">
171-
<DependentUpon>App.xaml</DependentUpon>
172-
<SubType>Code</SubType>
173-
</Compile>
174-
<Compile Include="Moudle\ClipBoardHelper.cs" />
175-
<Compile Include="MainWindow.xaml.cs">
176-
<DependentUpon>MainWindow.xaml</DependentUpon>
177-
<SubType>Code</SubType>
178-
</Compile>
179-
<Page Include="Moudle\Toast.xaml">
180-
<Generator>MSBuild:Compile</Generator>
181-
</Page>
182-
<Page Include="Moudle\Window_KeyValueEditor.xaml">
183-
<Generator>MSBuild:Compile</Generator>
184-
</Page>
185-
<Page Include="Moudle\Window_MessageBoxEx.xaml">
186-
<SubType>Designer</SubType>
187-
<Generator>MSBuild:Compile</Generator>
188-
</Page>
189-
<Page Include="Pages\Page_AudioTags.xaml">
190-
<SubType>Designer</SubType>
191-
<Generator>MSBuild:Compile</Generator>
192-
</Page>
193-
<Page Include="Pages\Page_ClipBoard.xaml">
194-
<SubType>Designer</SubType>
195-
<Generator>MSBuild:Compile</Generator>
196-
</Page>
197-
<Page Include="Pages\Page_File.xaml">
198-
<SubType>Designer</SubType>
199-
<Generator>MSBuild:Compile</Generator>
200-
</Page>
201-
<Page Include="Window_About.xaml">
202-
<SubType>Designer</SubType>
203-
<Generator>MSBuild:Compile</Generator>
204-
</Page>
205-
<Page Include="Window_DialogHost.xaml">
206-
<SubType>Designer</SubType>
207-
<Generator>MSBuild:Compile</Generator>
208-
</Page>
209-
<Page Include="Window_DictionaryEditor.xaml">
210-
<SubType>Designer</SubType>
211-
<Generator>MSBuild:Compile</Generator>
212-
</Page>
213-
<Page Include="Window_FanhuajiSetting.xaml">
214-
<SubType>Designer</SubType>
215-
<Generator>MSBuild:Compile</Generator>
216-
</Page>
217-
<Page Include="Window_Report.xaml">
218-
<SubType>Designer</SubType>
219-
<Generator>MSBuild:Compile</Generator>
220-
</Page>
221-
<Page Include="Window_Setting.xaml">
222-
<SubType>Designer</SubType>
223-
<Generator>MSBuild:Compile</Generator>
224-
</Page>
41+
<Resource Include="icon.ico" />
42+
<Resource Include="Windows Logo.png" />
22543
</ItemGroup>
44+
22645
<ItemGroup>
227-
<Compile Include="Properties\AssemblyInfo.cs">
228-
<SubType>Code</SubType>
229-
</Compile>
230-
<Compile Include="Properties\Resources.Designer.cs">
46+
<Compile Update="Properties\Resources.Designer.cs">
23147
<AutoGen>True</AutoGen>
23248
<DesignTime>True</DesignTime>
23349
<DependentUpon>Resources.resx</DependentUpon>
23450
</Compile>
235-
<Compile Include="Properties\Settings.Designer.cs">
51+
<Compile Update="Properties\Settings.Designer.cs">
23652
<AutoGen>True</AutoGen>
23753
<DependentUpon>Settings.settings</DependentUpon>
23854
<DesignTimeSharedInput>True</DesignTimeSharedInput>
23955
</Compile>
240-
<EmbeddedResource Include="Properties\Resources.resx">
56+
</ItemGroup>
57+
58+
<ItemGroup>
59+
<EmbeddedResource Update="Properties\Resources.resx">
24160
<Generator>ResXFileCodeGenerator</Generator>
24261
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
24362
</EmbeddedResource>
244-
<None Include="Dictionary.csv">
63+
</ItemGroup>
64+
65+
<ItemGroup>
66+
<None Update="Dictionary.csv">
24567
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
24668
</None>
247-
<None Include="packages.config" />
248-
<None Include="Properties\Settings.settings">
69+
<None Update="Properties\Settings.settings">
24970
<Generator>SettingsSingleFileGenerator</Generator>
25071
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
25172
</None>
25273
</ItemGroup>
253-
<ItemGroup>
254-
<None Include="App.config" />
255-
</ItemGroup>
256-
<ItemGroup>
257-
<Resource Include="icon.ico" />
258-
</ItemGroup>
259-
<ItemGroup>
260-
<Resource Include="Windows Logo.png" />
261-
</ItemGroup>
262-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
263-
<Import Project="..\packages\Fody.6.1.0\build\Fody.targets" Condition="Exists('..\packages\Fody.6.1.0\build\Fody.targets')" />
264-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
265-
<PropertyGroup>
266-
<ErrorText>此專案參考這部電腦上所缺少的 NuGet 套件。請啟用 NuGet 套件還原，以下載該套件。如需詳細資訊，請參閱 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的檔案是 {0}。</ErrorText>
267-
</PropertyGroup>
268-
<Error Condition="!Exists('..\packages\Fody.6.1.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.1.0\build\Fody.targets'))" />
269-
<Error Condition="!Exists('..\packages\PropertyChanged.Fody.3.2.6\build\PropertyChanged.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PropertyChanged.Fody.3.2.6\build\PropertyChanged.Fody.props'))" />
270-
<Error Condition="!Exists('..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets'))" />
271-
</Target>
272-
<Import Project="..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets" Condition="Exists('..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets')" />
74+
27375
</Project>

‎ConvertZZ/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,4 @@
1-
using System.Reflection;
2-
using System.Runtime.InteropServices;
3-
using System.Windows;
4-
5-
// 組件的一般資訊是由下列的屬性集控制。
6-
// 變更這些屬性的值即可修改組件的相關
7-
// 資訊。
8-
[assembly: AssemblyTitle("ConvertZZ")]
9-
[assembly: AssemblyDescription("")]
10-
[assembly: AssemblyConfiguration("")]
11-
[assembly: AssemblyCompany("")]
12-
[assembly: AssemblyProduct("ConvertZZ")]
13-
[assembly: AssemblyCopyright("Copyright © flier268 2019")]
14-
[assembly: AssemblyTrademark("")]
15-
[assembly: AssemblyCulture("")]
16-
17-
// 將 ComVisible 設為 false 可對 COM 元件隱藏
18-
// 組件中的類型。若必須從 COM 存取此組件中的類型，
19-
// 的類型，請在該類型上將 ComVisible 屬性設定為 true。
20-
[assembly: ComVisible(false)]
21-
22-
//若要開始建置可當地語系化的應用程式，請在
23-
//.csproj 檔案中的 <UICulture>CultureYouAreCodingWith</UICulture>
24-
//<UICulture>CultureYouAreCodingWith</UICulture>。例如，如果原始程式檔使用美式英文，
25-
//請將 <UICulture> 設為 en-US。然後取消註解下列
26-
//NeutralResourceLanguage 屬性。在下一行中更新 "en-US"，
27-
//以符合專案檔中的 UICulture 設定。
28-
29-
//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
30-
1+
using System.Windows;
312

323
[assembly: ThemeInfo(
334
ResourceDictionaryLocation.None, //主題特定資源字典的位置
@@ -37,17 +8,3 @@
378
//(在頁面中找不到時使用，
389
// 或是應用程式或任何主題特定資源字典中找不到資源時)
3910
)]
40-
41-
42-
// 組件的版本資訊由下列四個值所組成:
43-
//
44-
// 主要版本
45-
// 次要版本
46-
// 組建編號
47-
// 修訂編號
48-
//
49-
// 您可以指定所有的值，或將組建編號或修訂編號設為預設值
50-
// 指定為預設值:
51-
// [assembly: AssemblyVersion("1.0.*")]
52-
[assembly: AssemblyVersion("1.0.0.8")]
53-
[assembly: AssemblyFileVersion("1.0.0.8")]

0 commit comments

Comments
 (0)