调整项目名,打包名
Browse files- imradv3.sln +1 -1
- src/Setup/Product.wxs +7 -7
- src/Setup/Setup.wixproj +2 -2
- src/Setup/build_installer.ps1 +2 -2
- src/Setup/readme.txt +6 -0
- src/WpfEditor/{WpfEditor.csproj → EchoDict.csproj} +66 -66
imradv3.sln
CHANGED
|
@@ -15,7 +15,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imgui", "3rdparty\imgui\img
|
|
| 15 |
EndProject
|
| 16 |
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WeChatOcrCpp", "src\WeChatOcrCpp\WeChatOcrCpp.vcxproj", "{47E51CB9-6A07-4DF0-A458-6AD4C9D18A07}"
|
| 17 |
EndProject
|
| 18 |
-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "
|
| 19 |
EndProject
|
| 20 |
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScreenGrab", "src\ScreenGrab\ScreenGrab.csproj", "{998A5C87-48A5-B8CF-4435-452B526C6235}"
|
| 21 |
EndProject
|
|
|
|
| 15 |
EndProject
|
| 16 |
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WeChatOcrCpp", "src\WeChatOcrCpp\WeChatOcrCpp.vcxproj", "{47E51CB9-6A07-4DF0-A458-6AD4C9D18A07}"
|
| 17 |
EndProject
|
| 18 |
+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EchoDict", "src\WpfEditor\EchoDict.csproj", "{A995A5F1-6A44-463F-9284-A3F058575206}"
|
| 19 |
EndProject
|
| 20 |
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScreenGrab", "src\ScreenGrab\ScreenGrab.csproj", "{998A5C87-48A5-B8CF-4435-452B526C6235}"
|
| 21 |
EndProject
|
src/Setup/Product.wxs
CHANGED
|
@@ -1,16 +1,16 @@
|
|
| 1 |
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
|
| 2 |
-
<Package Name="
|
| 3 |
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
|
| 4 |
|
| 5 |
<MediaTemplate EmbedCab="yes" />
|
| 6 |
|
| 7 |
<StandardDirectory Id="ProgramFiles64Folder">
|
| 8 |
-
<Directory Id="INSTALLFOLDER" Name="
|
| 9 |
</StandardDirectory>
|
| 10 |
|
| 11 |
<StandardDirectory Id="DesktopFolder" />
|
| 12 |
|
| 13 |
-
<Feature Id="ProductFeature" Title="
|
| 14 |
<ComponentGroupRef Id="PublishedComponents" />
|
| 15 |
<ComponentRef Id="ApplicationShortcut" />
|
| 16 |
</Feature>
|
|
@@ -20,12 +20,12 @@
|
|
| 20 |
|
| 21 |
<Component Id="ApplicationShortcut" Directory="DesktopFolder" Guid="bc845182-019e-4e2b-8395-927653289012">
|
| 22 |
<Shortcut Id="ApplicationStartMenuShortcut"
|
| 23 |
-
Name="
|
| 24 |
-
Description="
|
| 25 |
-
Target="[INSTALLFOLDER]
|
| 26 |
WorkingDirectory="INSTALLFOLDER"
|
| 27 |
Icon="AppIcon"/>
|
| 28 |
-
<RegistryValue Root="HKCU" Key="Software\
|
| 29 |
</Component>
|
| 30 |
|
| 31 |
<UI>
|
|
|
|
| 1 |
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
|
| 2 |
+
<Package Name="EchoDict" Manufacturer="echodict.com" Version="0.0.0.1" UpgradeCode="e4a2f8b0-5c3d-4e6f-9a1b-2c3d4e5f6a7b">
|
| 3 |
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
|
| 4 |
|
| 5 |
<MediaTemplate EmbedCab="yes" />
|
| 6 |
|
| 7 |
<StandardDirectory Id="ProgramFiles64Folder">
|
| 8 |
+
<Directory Id="INSTALLFOLDER" Name="EchoDict" />
|
| 9 |
</StandardDirectory>
|
| 10 |
|
| 11 |
<StandardDirectory Id="DesktopFolder" />
|
| 12 |
|
| 13 |
+
<Feature Id="ProductFeature" Title="EchoDict" Level="1">
|
| 14 |
<ComponentGroupRef Id="PublishedComponents" />
|
| 15 |
<ComponentRef Id="ApplicationShortcut" />
|
| 16 |
</Feature>
|
|
|
|
| 20 |
|
| 21 |
<Component Id="ApplicationShortcut" Directory="DesktopFolder" Guid="bc845182-019e-4e2b-8395-927653289012">
|
| 22 |
<Shortcut Id="ApplicationStartMenuShortcut"
|
| 23 |
+
Name="EchoDict"
|
| 24 |
+
Description="EchoDict Application"
|
| 25 |
+
Target="[INSTALLFOLDER]EchoDict.exe"
|
| 26 |
WorkingDirectory="INSTALLFOLDER"
|
| 27 |
Icon="AppIcon"/>
|
| 28 |
+
<RegistryValue Root="HKCU" Key="Software\echodict\EchoDict" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
|
| 29 |
</Component>
|
| 30 |
|
| 31 |
<UI>
|
src/Setup/Setup.wixproj
CHANGED
|
@@ -1,6 +1,6 @@
|
|
| 1 |
<Project Sdk="WixToolset.Sdk/5.0.0">
|
| 2 |
<PropertyGroup>
|
| 3 |
-
<OutputName>
|
| 4 |
<OutputType>Package</OutputType>
|
| 5 |
<InstallerPlatform>x64</InstallerPlatform>
|
| 6 |
<PublishDir>..\WpfEditor\bin\Release\net8.0-windows\win-x64\publish</PublishDir>
|
|
@@ -11,7 +11,7 @@
|
|
| 11 |
<PackageReference Include="WixToolset.Heat" Version="5.0.0" />
|
| 12 |
</ItemGroup>
|
| 13 |
<ItemGroup>
|
| 14 |
-
<ProjectReference Include="..\WpfEditor\
|
| 15 |
</ItemGroup>
|
| 16 |
<ItemGroup>
|
| 17 |
<HarvestDirectory Include="$(PublishDir)">
|
|
|
|
| 1 |
<Project Sdk="WixToolset.Sdk/5.0.0">
|
| 2 |
<PropertyGroup>
|
| 3 |
+
<OutputName>EchoDictInstaller</OutputName>
|
| 4 |
<OutputType>Package</OutputType>
|
| 5 |
<InstallerPlatform>x64</InstallerPlatform>
|
| 6 |
<PublishDir>..\WpfEditor\bin\Release\net8.0-windows\win-x64\publish</PublishDir>
|
|
|
|
| 11 |
<PackageReference Include="WixToolset.Heat" Version="5.0.0" />
|
| 12 |
</ItemGroup>
|
| 13 |
<ItemGroup>
|
| 14 |
+
<ProjectReference Include="..\WpfEditor\EchoDict.csproj" />
|
| 15 |
</ItemGroup>
|
| 16 |
<ItemGroup>
|
| 17 |
<HarvestDirectory Include="$(PublishDir)">
|
src/Setup/build_installer.ps1
CHANGED
|
@@ -1,11 +1,11 @@
|
|
| 1 |
$ErrorActionPreference = "Stop"
|
| 2 |
|
| 3 |
# Define paths
|
| 4 |
-
$projectPath = Join-Path $PSScriptRoot "..\WpfEditor\
|
| 5 |
$publishDir = Join-Path $PSScriptRoot "..\WpfEditor\bin\Release\net8.0-windows\win-x64\publish"
|
| 6 |
|
| 7 |
# 1. Publish the application
|
| 8 |
-
Write-Host "Publishing
|
| 9 |
dotnet publish $projectPath -c Release -r win-x64 --self-contained false -o $publishDir
|
| 10 |
|
| 11 |
if ($LASTEXITCODE -ne 0) {
|
|
|
|
| 1 |
$ErrorActionPreference = "Stop"
|
| 2 |
|
| 3 |
# Define paths
|
| 4 |
+
$projectPath = Join-Path $PSScriptRoot "..\WpfEditor\EchoDict.csproj"
|
| 5 |
$publishDir = Join-Path $PSScriptRoot "..\WpfEditor\bin\Release\net8.0-windows\win-x64\publish"
|
| 6 |
|
| 7 |
# 1. Publish the application
|
| 8 |
+
Write-Host "Publishing EchoDict..."
|
| 9 |
dotnet publish $projectPath -c Release -r win-x64 --self-contained false -o $publishDir
|
| 10 |
|
| 11 |
if ($LASTEXITCODE -ne 0) {
|
src/Setup/readme.txt
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
打包先把这一行注释掉
|
| 2 |
+
|
| 3 |
+
E:\huggingface\imradv3\src\WpfEditor\EchoDict.csproj
|
| 4 |
+
|
| 5 |
+
<!--<ProjectReference Include="..\WeChatOcrCpp\WeChatOcrCpp.vcxproj" />-->
|
| 6 |
+
|
src/WpfEditor/{WpfEditor.csproj → EchoDict.csproj}
RENAMED
|
@@ -1,66 +1,66 @@
|
|
| 1 |
-
<Project Sdk="Microsoft.NET.Sdk">
|
| 2 |
-
|
| 3 |
-
<PropertyGroup>
|
| 4 |
-
<OutputType>WinExe</OutputType>
|
| 5 |
-
<TargetFramework>net8.0-windows</TargetFramework>
|
| 6 |
-
<Nullable>enable</Nullable>
|
| 7 |
-
<ImplicitUsings>enable</ImplicitUsings>
|
| 8 |
-
<UseWPF>true</UseWPF>
|
| 9 |
-
<Platforms>x64</Platforms>
|
| 10 |
-
</PropertyGroup>
|
| 11 |
-
|
| 12 |
-
<ItemGroup>
|
| 13 |
-
<None Include="..\..\data\**\*.*">
|
| 14 |
-
<Link>data\%(RecursiveDir)%(Filename)%(Extension)</Link>
|
| 15 |
-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
| 16 |
-
</None>
|
| 17 |
-
</ItemGroup>
|
| 18 |
-
|
| 19 |
-
<ItemGroup>
|
| 20 |
-
<None Include="..\..\x64\Release\*.dll">
|
| 21 |
-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
| 22 |
-
<Link>%(Filename)%(Extension)</Link>
|
| 23 |
-
</None>
|
| 24 |
-
</ItemGroup>
|
| 25 |
-
|
| 26 |
-
<ItemGroup>
|
| 27 |
-
<ProjectReference Include="..\EchoDictLib\EchoDictLib.csproj" />
|
| 28 |
-
<ProjectReference Include="..\ScreenGrab\ScreenGrab.csproj" />
|
| 29 |
-
<ProjectReference Include="..\WeChatOcrCpp\WeChatOcrCpp.vcxproj" />
|
| 30 |
-
</ItemGroup>
|
| 31 |
-
|
| 32 |
-
|
| 33 |
-
<ItemGroup>
|
| 34 |
-
<PackageReference Include="CefSharp.Wpf.NETCore" Version="141.0.110" />
|
| 35 |
-
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
|
| 36 |
-
<PackageReference Include="CsvHelper" Version="33.1.0" />
|
| 37 |
-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
| 38 |
-
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.11.0.20250507" />
|
| 39 |
-
<PackageReference Include="OpenCvSharp4.Windows" Version="4.11.0.20250507" />
|
| 40 |
-
<PackageReference Include="OpenCvSharp4.WpfExtensions" Version="4.11.0.20250507" />
|
| 41 |
-
<PackageReference Include="iText" Version="9.2.0" />
|
| 42 |
-
</ItemGroup>
|
| 43 |
-
|
| 44 |
-
<ItemGroup>
|
| 45 |
-
<FrameworkReference Include="Microsoft.WindowsDesktop.App.WindowsForms" />
|
| 46 |
-
</ItemGroup>
|
| 47 |
-
|
| 48 |
-
<ItemGroup>
|
| 49 |
-
<PackageReference Include="AlibabaCloud.SDK.Ocr-api20210707" Version="3.1.3" />
|
| 50 |
-
<PackageReference Include="AlibabaCloud.OpenApiClient" Version="0.1.15" />
|
| 51 |
-
<PackageReference Include="AlibabaCloud.TeaConsole" Version="0.1.0" />
|
| 52 |
-
<PackageReference Include="AlibabaCloud.TeaUtil" Version="0.1.19" />
|
| 53 |
-
<PackageReference Include="Aliyun.Credentials" Version="1.5.2" />
|
| 54 |
-
<PackageReference Include="Tea" Version="1.1.3" />
|
| 55 |
-
</ItemGroup>
|
| 56 |
-
|
| 57 |
-
<ItemGroup>
|
| 58 |
-
<None Update="config.json">
|
| 59 |
-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
| 60 |
-
</None>
|
| 61 |
-
<None Update="ico.ico">
|
| 62 |
-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
| 63 |
-
</None>
|
| 64 |
-
</ItemGroup>
|
| 65 |
-
|
| 66 |
-
</Project>
|
|
|
|
| 1 |
+
<Project Sdk="Microsoft.NET.Sdk">
|
| 2 |
+
|
| 3 |
+
<PropertyGroup>
|
| 4 |
+
<OutputType>WinExe</OutputType>
|
| 5 |
+
<TargetFramework>net8.0-windows</TargetFramework>
|
| 6 |
+
<Nullable>enable</Nullable>
|
| 7 |
+
<ImplicitUsings>enable</ImplicitUsings>
|
| 8 |
+
<UseWPF>true</UseWPF>
|
| 9 |
+
<Platforms>x64</Platforms>
|
| 10 |
+
</PropertyGroup>
|
| 11 |
+
|
| 12 |
+
<ItemGroup>
|
| 13 |
+
<None Include="..\..\data\**\*.*">
|
| 14 |
+
<Link>data\%(RecursiveDir)%(Filename)%(Extension)</Link>
|
| 15 |
+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
| 16 |
+
</None>
|
| 17 |
+
</ItemGroup>
|
| 18 |
+
|
| 19 |
+
<ItemGroup>
|
| 20 |
+
<None Include="..\..\x64\Release\*.dll">
|
| 21 |
+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
| 22 |
+
<Link>%(Filename)%(Extension)</Link>
|
| 23 |
+
</None>
|
| 24 |
+
</ItemGroup>
|
| 25 |
+
|
| 26 |
+
<ItemGroup>
|
| 27 |
+
<ProjectReference Include="..\EchoDictLib\EchoDictLib.csproj" />
|
| 28 |
+
<ProjectReference Include="..\ScreenGrab\ScreenGrab.csproj" />
|
| 29 |
+
<!--<ProjectReference Include="..\WeChatOcrCpp\WeChatOcrCpp.vcxproj" />-->
|
| 30 |
+
</ItemGroup>
|
| 31 |
+
|
| 32 |
+
|
| 33 |
+
<ItemGroup>
|
| 34 |
+
<PackageReference Include="CefSharp.Wpf.NETCore" Version="141.0.110" />
|
| 35 |
+
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
|
| 36 |
+
<PackageReference Include="CsvHelper" Version="33.1.0" />
|
| 37 |
+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
| 38 |
+
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.11.0.20250507" />
|
| 39 |
+
<PackageReference Include="OpenCvSharp4.Windows" Version="4.11.0.20250507" />
|
| 40 |
+
<PackageReference Include="OpenCvSharp4.WpfExtensions" Version="4.11.0.20250507" />
|
| 41 |
+
<PackageReference Include="iText" Version="9.2.0" />
|
| 42 |
+
</ItemGroup>
|
| 43 |
+
|
| 44 |
+
<ItemGroup>
|
| 45 |
+
<FrameworkReference Include="Microsoft.WindowsDesktop.App.WindowsForms" />
|
| 46 |
+
</ItemGroup>
|
| 47 |
+
|
| 48 |
+
<ItemGroup>
|
| 49 |
+
<PackageReference Include="AlibabaCloud.SDK.Ocr-api20210707" Version="3.1.3" />
|
| 50 |
+
<PackageReference Include="AlibabaCloud.OpenApiClient" Version="0.1.15" />
|
| 51 |
+
<PackageReference Include="AlibabaCloud.TeaConsole" Version="0.1.0" />
|
| 52 |
+
<PackageReference Include="AlibabaCloud.TeaUtil" Version="0.1.19" />
|
| 53 |
+
<PackageReference Include="Aliyun.Credentials" Version="1.5.2" />
|
| 54 |
+
<PackageReference Include="Tea" Version="1.1.3" />
|
| 55 |
+
</ItemGroup>
|
| 56 |
+
|
| 57 |
+
<ItemGroup>
|
| 58 |
+
<None Update="config.json">
|
| 59 |
+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
| 60 |
+
</None>
|
| 61 |
+
<None Update="ico.ico">
|
| 62 |
+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
| 63 |
+
</None>
|
| 64 |
+
</ItemGroup>
|
| 65 |
+
|
| 66 |
+
</Project>
|