Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Right to left issues #15

Merged
merged 24 commits into from
Sep 1, 2023
Merged

Right to left issues #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
4d48266
fix the title of the feature in the installer to include Google Trans…
Apr 14, 2023
08e8809
don't get the write lock when we *read* the data (to reduce the numbe…
Apr 14, 2023
0cb27e0
the attribute for R2L for a Spellfixer project was stored in the repo…
Apr 14, 2023
3f4f23c
fix bug where it wasn't handling getting null for the source USFM tok…
Jun 9, 2023
f17c047
refactored the BackTranslationHelper plugin so that we could more eas…
Jul 3, 2023
deb9186
added the ability to add menu items to the control's 'Settings' menu …
Jul 3, 2023
ecc602b
added a secondary value for the source text to be translated which in…
Jul 3, 2023
d9a02ca
added a method to get an inner exceptions also when logging an exception
Jul 8, 2023
99932f7
change the occasionally long running and with flakey results setting …
Jul 8, 2023
2fffce2
when ignoring inline text data (e.g. footnotes), translate the 'fq' m…
Jul 8, 2023
fe5d608
when generating the 'alternate' source translation (i.e. ignoring, or…
Jul 10, 2023
74d49f2
Switched several of the dictionaries to use the indexing method for u…
Jul 10, 2023
5b57a00
AddNewProjectForm wasn't closing when the user clicks 'Cancel' or upp…
Jul 22, 2023
62235b1
if we suspect updates in the dialog bkz the user has edits and is cli…
Jul 22, 2023
d344c06
update to v5.1.4
Jul 22, 2023
9d6b33e
Change how clipboard enc converter works so that if it's not in Spell…
Aug 2, 2023
4b0cdbf
if we're updating the BT helper form due to user clicking to reload a…
Aug 2, 2023
0cfbf6a
the system tray icon had a too long tooltip for the other case (where…
Aug 11, 2023
2a81b77
add the ability to update the settings on update to Paratext (for the…
Aug 18, 2023
2efc994
add the \fp and \ms1 markers to be translated when translating all th…
Aug 18, 2023
eb6e6c8
upgraded to v0.7 of EcCore nuget w/ new TECkit
Sep 1, 2023
0e41c94
upgraded a number of other nuget packages (primarily to fix an issue …
Sep 1, 2023
4dfeeb6
added the ability to make the target translation textbox read-only if…
Sep 1, 2023
d908e64
upgraded SILConverters to v5.2
Sep 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<PropertyGroup>
<ApplicationName>SILConverters</ApplicationName>
<SafeApplicationName>SILConverters</SafeApplicationName>
<TruncatedVersion>5.1</TruncatedVersion>
<VersionNumber>5.1.3.0</VersionNumber>
<TruncatedVersion>5.2</TruncatedVersion>
<VersionNumber>5.2.0.0</VersionNumber>
<UpgradeCode>8A50226C-84D0-4CAF-AF8F-B0284643C415</UpgradeCode>
<Year>2023</Year>
<Manufacturer>SIL International</Manufacturer>
Expand Down
4 changes: 2 additions & 2 deletions Installer/Converter Packages/IndicConverters/IndicConverters.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props" Condition="Exists('..\..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props')" />
<Import Project="..\..\..\packages\Encoding-Converters-Core.0.7.0\build\Encoding-Converters-Core.props" Condition="Exists('..\..\..\packages\Encoding-Converters-Core.0.7.0\build\Encoding-Converters-Core.props')" />
<Import Project="..\..\..\packages\WiX.3.11.2\build\wix.props" Condition="Exists('..\..\..\packages\WiX.3.11.2\build\wix.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -82,7 +82,7 @@
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\..\packages\WiX.3.11.2\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WiX.3.11.2\build\wix.props'))" />
<Error Condition="!Exists('..\..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props'))" />
<Error Condition="!Exists('..\..\..\packages\Encoding-Converters-Core.0.7.0\build\Encoding-Converters-Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Encoding-Converters-Core.0.7.0\build\Encoding-Converters-Core.props'))" />
</Target>
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
2 changes: 1 addition & 1 deletion Installer/Converter Packages/IndicConverters/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Encoding-Converters-Core" version="0.6.0" />
<package id="Encoding-Converters-Core" version="0.7.0" />
<package id="WiX" version="3.11.2" />
</packages>
4 changes: 2 additions & 2 deletions Installer/Converter Packages/IndicConverters64bit/IndicConverters64bit.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props" Condition="Exists('..\..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props')" />
<Import Project="..\..\..\packages\Encoding-Converters-Core.0.7.0\build\Encoding-Converters-Core.props" Condition="Exists('..\..\..\packages\Encoding-Converters-Core.0.7.0\build\Encoding-Converters-Core.props')" />
<Import Project="..\..\..\packages\WiX.3.11.2\build\wix.props" Condition="Exists('..\..\..\packages\WiX.3.11.2\build\wix.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
Expand Down Expand Up @@ -40,7 +40,7 @@
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\..\packages\WiX.3.11.2\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WiX.3.11.2\build\wix.props'))" />
<Error Condition="!Exists('..\..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props'))" />
<Error Condition="!Exists('..\..\..\packages\Encoding-Converters-Core.0.7.0\build\Encoding-Converters-Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Encoding-Converters-Core.0.7.0\build\Encoding-Converters-Core.props'))" />
</Target>
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
2 changes: 1 addition & 1 deletion Installer/Converter Packages/IndicConverters64bit/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Encoding-Converters-Core" version="0.6.0" />
<package id="Encoding-Converters-Core" version="0.7.0" />
<package id="WiX" version="3.11.2" />
</packages>
4 changes: 2 additions & 2 deletions Installer/SEC Setup 64bit/EcFeatures.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
<MergeRef Id="DChartHelper"/>
<MergeRef Id="AIGuesser"/>
</Feature>
<Feature Id="Paratext_BackTranslation_Helper_Plugin" Title="Paratext Back Translation Helper Plugin" Description="The Ptx BT Helper can be launched from the Paratext, Tools menu (newer than 9.2.102.17). Allows you to use Bing/DeepL to prepare a back translation of 1 project into another. It requires an internet connection to run." Display="expand" Level="4" AllowAdvertise="no">
<Feature Id="Paratext_BackTranslation_Helper_Plugin" Title="Paratext Back Translation Helper Plugin" Description="The Ptx BT Helper can be launched from the Paratext, Tools menu (newer than 9.2.102.17). Allows you to use Bing/DeepL/Google Translate to prepare a back translation of 1 project into another. It requires an internet connection to run." Display="expand" Level="4" AllowAdvertise="no">
<Condition Level="3"><![CDATA[COMPONENTEXISTS_PARATEXT_9 AND NOT REMOVE]]></Condition>
<MergeRef Id="SEC_EC"/>
<MergeRef Id="ParatextBackTranslationHelperPlugin"/>
Expand All @@ -115,7 +115,7 @@
</Feature>
</Feature>
<Feature Id="Transduction_Engines" Title="Transduction Engines" Description="Expand this node to select or deselect individual transduction engines" Level="3" AllowAdvertise="no">
<Feature Id="BingTranslator" Title="Bing/DeepL Translators" Description="Use the Bing or DeepL Translator for text translation. Requires an internet connection." Display="expand" Level="3" AllowAdvertise="no">
<Feature Id="BingTranslator" Title="Bing/DeepL/Google Translate" Description="Use Bing, DeepL, or Google Translate for text translation. Requires an internet connection." Display="expand" Level="3" AllowAdvertise="no">
<MergeRef Id="EcTranslators" />
</Feature>
<Feature Id="TECkit_DLLs" Title="TECkit" Description="Contains the TECkit conversion and compiling engines (DLLs). Select this component if you intend to use TECkit for encoding conversion or other transduction processing." Display="expand" Level="3" AllowAdvertise="no">
Expand Down
4 changes: 2 additions & 2 deletions Installer/SEC Setup 64bit/Product.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
<Product Id="*" UpgradeCode="{0F7D5D72-E9F3-40BB-9748-D388C70096CD}" Name="SIL Converters 5.1 (x64)" Manufacturer="SIL International"
Language="1033" Version="5.1" >
<Product Id="*" UpgradeCode="{0F7D5D72-E9F3-40BB-9748-D388C70096CD}" Name="SIL Converters 5.2 (x64)" Manufacturer="SIL International"
Language="1033" Version="5.2" >
<Package InstallerVersion="500" Compressed='yes' InstallScope="perMachine"
Platform="x64" />

Expand Down
4 changes: 2 additions & 2 deletions Installer/SEC Setup 64bit/SEC Setup 64bit.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props" Condition="Exists('..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props')" />
<Import Project="..\..\packages\Encoding-Converters-Core.0.7.0\build\Encoding-Converters-Core.props" Condition="Exists('..\..\packages\Encoding-Converters-Core.0.7.0\build\Encoding-Converters-Core.props')" />
<Import Project="..\..\packages\WiX.3.11.2\build\wix.props" Condition="Exists('..\..\packages\WiX.3.11.2\build\wix.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
Expand Down Expand Up @@ -59,7 +59,7 @@
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\WiX.3.11.2\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WiX.3.11.2\build\wix.props'))" />
<Error Condition="!Exists('..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props'))" />
<Error Condition="!Exists('..\..\packages\Encoding-Converters-Core.0.7.0\build\Encoding-Converters-Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Encoding-Converters-Core.0.7.0\build\Encoding-Converters-Core.props'))" />
</Target>
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
2 changes: 1 addition & 1 deletion Installer/SEC Setup 64bit/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Encoding-Converters-Core" version="0.6.0" />
<package id="Encoding-Converters-Core" version="0.7.0" />
<package id="WiX" version="3.11.2" />
</packages>
2 changes: 1 addition & 1 deletion Installer/SEC Setup/EcFeatures.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
</Feature>
</Feature>
<Feature Id="Transduction_Engines" Title="Transduction Engines" Description="Expand this node to select or deselect individual transduction engines" Level="3" AllowAdvertise="no">
<Feature Id="BingTranslator" Title="Bing/DeepL Translators" Description="Use the Bing or DeepL Translator for text translation. Requires an internet connection." Display="expand" Level="3" AllowAdvertise="no">
<Feature Id="BingTranslator" Title="Bing/DeepL/Google Translate" Description="Use Bing, DeepL, or Google Translate for text translation. Requires an internet connection." Display="expand" Level="3" AllowAdvertise="no">
<MergeRef Id="EcTranslators" />
</Feature>
<Feature Id="TECkit_DLLs" Title="TECkit" Description="Contains the TECkit conversion and compiling engines (DLLs). Select this component if you intend to use TECkit for encoding conversion or other transduction processing." Display="expand" Level="3" AllowAdvertise="no">
Expand Down
4 changes: 2 additions & 2 deletions Installer/SEC Setup/Product.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">

<Product Id="*" UpgradeCode="8A50226C-84D0-4CAF-AF8F-B0284643C415" Name="SIL Converters 5.1" Manufacturer="SIL International"
Language="1033" Version="5.1">
<Product Id="*" UpgradeCode="8A50226C-84D0-4CAF-AF8F-B0284643C415" Name="SIL Converters 5.2" Manufacturer="SIL International"
Language="1033" Version="5.2">
<Package InstallerVersion="500" Compressed="yes" InstallScope="perMachine" />

<Condition Message="You need to be an administrator to install this product.">Privileged</Condition>
Expand Down
4 changes: 2 additions & 2 deletions Installer/SEC Setup/SEC Setup.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props" Condition="Exists('..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props')" />
<Import Project="..\..\packages\Encoding-Converters-Core.0.7.0\build\Encoding-Converters-Core.props" Condition="Exists('..\..\packages\Encoding-Converters-Core.0.7.0\build\Encoding-Converters-Core.props')" />
<Import Project="..\..\packages\WiX.3.11.2\build\wix.props" Condition="Exists('..\..\packages\WiX.3.11.2\build\wix.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
Expand Down Expand Up @@ -67,7 +67,7 @@
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\WiX.3.11.2\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WiX.3.11.2\build\wix.props'))" />
<Error Condition="!Exists('..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props'))" />
<Error Condition="!Exists('..\..\packages\Encoding-Converters-Core.0.7.0\build\Encoding-Converters-Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Encoding-Converters-Core.0.7.0\build\Encoding-Converters-Core.props'))" />
</Target>
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
2 changes: 1 addition & 1 deletion Installer/SEC Setup/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Encoding-Converters-Core" version="0.6.0" />
<package id="Encoding-Converters-Core" version="0.7.0" />
<package id="WiX" version="3.11.2" />
</packages>
4 changes: 2 additions & 2 deletions Installer/ScHelpMM/ScHelpMM.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props" Condition="Exists('..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props')" />
<Import Project="..\..\packages\Encoding-Converters-Core.0.7.0\build\Encoding-Converters-Core.props" Condition="Exists('..\..\packages\Encoding-Converters-Core.0.7.0\build\Encoding-Converters-Core.props')" />
<Import Project="..\..\packages\WiX.3.11.2\build\wix.props" Condition="Exists('..\..\packages\WiX.3.11.2\build\wix.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -48,7 +48,7 @@
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\WiX.3.11.2\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WiX.3.11.2\build\wix.props'))" />
<Error Condition="!Exists('..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props'))" />
<Error Condition="!Exists('..\..\packages\Encoding-Converters-Core.0.7.0\build\Encoding-Converters-Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Encoding-Converters-Core.0.7.0\build\Encoding-Converters-Core.props'))" />
</Target>
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
2 changes: 1 addition & 1 deletion Installer/ScHelpMM/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Encoding-Converters-Core" version="0.6.0" />
<package id="Encoding-Converters-Core" version="0.7.0" />
<package id="WiX" version="3.11.2" />
</packages>
8 changes: 4 additions & 4 deletions Installer/SetupSILConverters/SetupSILConverters.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props" Condition="Exists('..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props')" />
<Import Project="..\..\packages\Encoding-Converters-Core.0.7.0\build\Encoding-Converters-Core.props" Condition="Exists('..\..\packages\Encoding-Converters-Core.0.7.0\build\Encoding-Converters-Core.props')" />
<Import Project="$([MSBuild]::GetPathOfFileAbove(directory.build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(directory.build.props))')" />
<Import Project="..\..\packages\WiX.3.11.2\build\wix.props" Condition="Exists('..\..\packages\WiX.3.11.2\build\wix.props')" />
<PropertyGroup>
Expand All @@ -17,10 +17,10 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
<DefineConstants>ApplicationName=SILConverters;SafeApplicationName=SILConverters;TruncatedVersion=5.1;VersionNumber=5.1.3.0;UpgradeCode=8A50226C-84D0-4CAF-AF8F-B0284643C415;Year=2023;Manufacturer=SIL International;EcDistFilesPath=$(EcDistFilesPath)</DefineConstants>
<DefineConstants>ApplicationName=SILConverters;SafeApplicationName=SILConverters;TruncatedVersion=5.2;VersionNumber=5.2.0.0;UpgradeCode=8A50226C-84D0-4CAF-AF8F-B0284643C415;Year=2023;Manufacturer=SIL International;EcDistFilesPath=$(EcDistFilesPath)</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<DefineConstants>ApplicationName=SILConverters;SafeApplicationName=SILConverters;TruncatedVersion=5.1;VersionNumber=5.1.3.0;UpgradeCode=0F7D5D72-E9F3-40BB-9748-D388C70096CD;Year=2023;Manufacturer=SIL International;EcDistFilesPath=$(EcDistFilesPath)</DefineConstants>
<DefineConstants>ApplicationName=SILConverters;SafeApplicationName=SILConverters;TruncatedVersion=5.2;VersionNumber=5.2.0.0;UpgradeCode=0F7D5D72-E9F3-40BB-9748-D388C70096CD;Year=2023;Manufacturer=SIL International;EcDistFilesPath=$(EcDistFilesPath)</DefineConstants>
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
Expand Down Expand Up @@ -66,7 +66,7 @@
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\WiX.3.11.2\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WiX.3.11.2\build\wix.props'))" />
<Error Condition="!Exists('..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props'))" />
<Error Condition="!Exists('..\..\packages\Encoding-Converters-Core.0.7.0\build\Encoding-Converters-Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Encoding-Converters-Core.0.7.0\build\Encoding-Converters-Core.props'))" />
</Target>
<Target Name="PostBuildCopy" AfterTargets="Build">
<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Installer/SetupSILConverters/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Encoding-Converters-Core" version="0.6.0" />
<package id="Encoding-Converters-Core" version="0.7.0" />
<package id="WiX" version="3.11.2" />
</packages>
Loading
Loading