Merge pull request #17 from silnrsi/AddedPython3PlusAzureOpenAi

Added several new EncConverters to the core package and updated the BackTranslation Dialog
silnrsi · Mar 11, 2024 · 0e7b04e · 0e7b04e
2 parents ffcdce3 + ec2d6f7
commit 0e7b04e
Show file tree

Hide file tree

Showing 123 changed files with 882 additions and 3,004 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,47 +21,35 @@ jobs:
        fail-fast: false
        matrix:
          build_configuration: ["Debug", "Release"]
-         platform: ['x64', 'x86']
+         build_platform: ['x64', 'x86']
 
     steps:
     - name: Checkout
-      uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2
+      uses: actions/checkout@v4.1.1
       with:
         fetch-depth: 0 # fetch full history for GitVersion
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@c0d4ad69d8bd405d234f1c9166d383b7a4f69ed8 # v2.1.0
+      uses: xt0rted/setup-dotnet@v1.5.0
       with:
         dotnet-version: 6.0.x
 
-    #- name: Restore
-    #  run: dotnet restore
-
     - name: setup-msbuild
-      uses: microsoft/[email protected]
-      with:
-        # Folder location of where vswhere.exe is located if a self-hosted agent
-        vswhere-path: # optional
-        # Version of Visual Studio to search; defaults to latest if not specified
-        vs-version: # optional
-        # Enable searching for pre-release versions of Visual Studio/MSBuild
-        vs-prerelease: # optional
-        # The preferred processor architecture of MSBuild. Can be either "x86" or "x64". "x64" is only available from Visual Studio version 17.0 and later.
-        msbuild-architecture: x64 # optional, default is x86
+      uses: microsoft/setup-msbuild@v2
 
     - name: Fetch nuget dependecies
       run: nuget restore "${{env.SOLUTION_FILE_PATH}}"
 
     # run VsDevCmd.bat so we can get the path to tlbexp.exe for the SpellFixerEc proj
     - uses: ilammy/msvc-dev-cmd@v1
       with:
-        arch: ${{ matrix.platform }}
+        arch: ${{ matrix.build_platform }}
 
     - name: Build
       working-directory: ${{env.GITHUB_WORKSPACE}}
-      # Add additional options to the MSBuild command line here (like platform or verbosity level).
+      # Add additional options to the MSBuild command line here (like build_platform or verbosity level).
       # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
-      run: msbuild /m /p:Configuration=${{matrix.build_configuration}} "${{env.SOLUTION_FILE_PATH}}"
+      run: msbuild /m /p:Configuration=${{matrix.build_configuration}} /p:Platform=${{ matrix.build_platform }} "${{env.SOLUTION_FILE_PATH}}"
 
     # TODO Run tests
     #- name: Test
@@ -70,11 +58,11 @@ jobs:
     # now that we're building on TeamCity (to sign it), this isn't needed
     #- name: rename installer
     #  if: ${{ success() && matrix.build_configuration == 'Release' }}
-    #  run: cp "output/${{matrix.platform}}/SetupSILConverters_${{matrix.platform}}.exe" "output/${{matrix.platform}}/SetupSILConverters_${{matrix.platform}}.${{github.run_number}}.exe"
+    #  run: cp "output/${{matrix.build_platform}}/SetupSILConverters_${{matrix.build_platform}}.exe" "output/${{matrix.build_platform}}/SetupSILConverters_${{matrix.build_platform}}.${{github.run_number}}.exe"
 
     #- name: Upload a Build Artifact
     #  if: ${{ success() && matrix.build_configuration == 'Release' }}
     #  uses: actions/[email protected]
     #  with:
-    #    name: silconverters-installers.${{matrix.platform}}.latest
-    #    path: output/${{matrix.platform}}/SetupSILConverters_${{matrix.platform}}.${{github.run_number}}.exe
+    #    name: silconverters-installers.${{matrix.build_platform}}.latest
+    #    path: output/${{matrix.build_platform}}/SetupSILConverters_${{matrix.build_platform}}.${{github.run_number}}.exe
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,7 +3,7 @@
     <ApplicationName>SILConverters</ApplicationName>
     <SafeApplicationName>SILConverters</SafeApplicationName>
     <TruncatedVersion>5.2</TruncatedVersion>
-    <VersionNumber>5.2.0.0</VersionNumber>
+    <VersionNumber>5.2.5.0</VersionNumber>
     <UpgradeCode>8A50226C-84D0-4CAF-AF8F-B0284643C415</UpgradeCode>
     <Year>2023</Year>
     <Manufacturer>SIL International</Manufacturer>

diff --git a/Installer/AdaptIt2Unicode64bitMM/AdaptIt2Unicode_MergeModule.wxs b/Installer/AdaptIt2Unicode64bitMM/AdaptIt2Unicode_MergeModule.wxs
@@ -23,5 +23,9 @@
         </Directory>
       </Directory>
     </Directory>
+
+    <InstallExecuteSequence>
+      <RemoveShortcuts>Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL"</RemoveShortcuts>
+    </InstallExecuteSequence>
   </Module>
 </Wix>
diff --git a/Installer/AdaptIt2UnicodeMM/AdaptIt2Unicode_MergeModule.wxs b/Installer/AdaptIt2UnicodeMM/AdaptIt2Unicode_MergeModule.wxs
@@ -19,5 +19,9 @@
         </Directory>
       </Directory>
     </Directory>
+
+    <InstallExecuteSequence>
+      <RemoveShortcuts>Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL"</RemoveShortcuts>
+    </InstallExecuteSequence>
   </Module>
 </Wix>
diff --git a/Installer/ClipboardEncConverter64bitMM/ClipboardEncConverter_MergeModule.wxs b/Installer/ClipboardEncConverter64bitMM/ClipboardEncConverter_MergeModule.wxs
@@ -32,5 +32,9 @@
       </Directory>
 
     </Directory>
+
+    <InstallExecuteSequence>
+      <RemoveShortcuts>Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL"</RemoveShortcuts>
+    </InstallExecuteSequence>
   </Module>
 </Wix>
diff --git a/Installer/ClipboardEncConverterMM/ClipboardEncConverter_MergeModule.wxs b/Installer/ClipboardEncConverterMM/ClipboardEncConverter_MergeModule.wxs
@@ -31,5 +31,9 @@
       </Directory>
 
     </Directory>
+
+    <InstallExecuteSequence>
+      <RemoveShortcuts>Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL"</RemoveShortcuts>
+    </InstallExecuteSequence>
   </Module>
 </Wix>
diff --git a/Installer/Converter Packages/IndicConverters/IndicConverters.wixproj b/Installer/Converter Packages/IndicConverters/IndicConverters.wixproj
@@ -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.7.0\build\Encoding-Converters-Core.props" Condition="Exists('..\..\..\packages\Encoding-Converters-Core.0.7.0\build\Encoding-Converters-Core.props')" />
+  <Import Project="..\..\..\packages\Encoding-Converters-Core.0.8.2\build\Encoding-Converters-Core.props" Condition="Exists('..\..\..\packages\Encoding-Converters-Core.0.8.2\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>
@@ -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.7.0\build\Encoding-Converters-Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Encoding-Converters-Core.0.7.0\build\Encoding-Converters-Core.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\Encoding-Converters-Core.0.8.2\build\Encoding-Converters-Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Encoding-Converters-Core.0.8.2\build\Encoding-Converters-Core.props'))" />
   </Target>
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.

diff --git a/Installer/Converter Packages/IndicConverters/IndicConverters_MergeModule.wxs b/Installer/Converter Packages/IndicConverters/IndicConverters_MergeModule.wxs
@@ -192,5 +192,9 @@
         </Directory>
       </Directory>
     </Directory>
+
+    <InstallExecuteSequence>
+      <RemoveShortcuts>Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL"</RemoveShortcuts>
+    </InstallExecuteSequence>
   </Module>
 </Wix>
diff --git a/Installer/Converter Packages/IndicConverters/packages.config b/Installer/Converter Packages/IndicConverters/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Encoding-Converters-Core" version="0.7.0" />
+  <package id="Encoding-Converters-Core" version="0.8.2" />
   <package id="WiX" version="3.11.2" />
 </packages>
diff --git a/Installer/Converter Packages/IndicConverters64bit/IndicConverters64bit.wixproj b/Installer/Converter Packages/IndicConverters64bit/IndicConverters64bit.wixproj
@@ -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.7.0\build\Encoding-Converters-Core.props" Condition="Exists('..\..\..\packages\Encoding-Converters-Core.0.7.0\build\Encoding-Converters-Core.props')" />
+  <Import Project="..\..\..\packages\Encoding-Converters-Core.0.8.2\build\Encoding-Converters-Core.props" Condition="Exists('..\..\..\packages\Encoding-Converters-Core.0.8.2\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>
@@ -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.7.0\build\Encoding-Converters-Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Encoding-Converters-Core.0.7.0\build\Encoding-Converters-Core.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\Encoding-Converters-Core.0.8.2\build\Encoding-Converters-Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Encoding-Converters-Core.0.8.2\build\Encoding-Converters-Core.props'))" />
   </Target>
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.

diff --git a/Installer/Converter Packages/IndicConverters64bit/IndicConverters_MergeModule.wxs b/Installer/Converter Packages/IndicConverters64bit/IndicConverters_MergeModule.wxs
@@ -193,5 +193,9 @@
         </Directory>
       </Directory>
     </Directory>
+
+    <InstallExecuteSequence>
+      <RemoveShortcuts>Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL"</RemoveShortcuts>
+    </InstallExecuteSequence>
   </Module>
 </Wix>
diff --git a/Installer/Converter Packages/IndicConverters64bit/packages.config b/Installer/Converter Packages/IndicConverters64bit/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Encoding-Converters-Core" version="0.7.0" />
+  <package id="Encoding-Converters-Core" version="0.8.2" />
   <package id="WiX" version="3.11.2" />
 </packages>
diff --git a/Installer/ConverterInstaller64bitMM/SILConvertersInstaller_MergeModule.wxs b/Installer/ConverterInstaller64bitMM/SILConvertersInstaller_MergeModule.wxs
@@ -43,5 +43,9 @@
                  <Custom Action="LaunchSecOptionsInstaller" Before="InstallFinalize"><![CDATA[NOT Installed]]></Custom>
              </InstallExecuteSequence>
         -->
+
+      <InstallExecuteSequence>
+        <RemoveShortcuts>Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL"</RemoveShortcuts>
+      </InstallExecuteSequence>
     </Module>
 </Wix>
diff --git a/Installer/ConverterInstallerMM/SILConvertersInstaller_MergeModule.wxs b/Installer/ConverterInstallerMM/SILConvertersInstaller_MergeModule.wxs
@@ -42,5 +42,9 @@
                  <Custom Action="LaunchSecOptionsInstaller" Before="InstallFinalize"><![CDATA[NOT Installed]]></Custom>
              </InstallExecuteSequence>
         -->
+
+      <InstallExecuteSequence>
+        <RemoveShortcuts>Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL"</RemoveShortcuts>
+      </InstallExecuteSequence>
     </Module>
 </Wix>
diff --git a/Installer/CscDotMM/CscDot_MergeModule.wxs b/Installer/CscDotMM/CscDot_MergeModule.wxs
@@ -20,5 +20,9 @@
         </Directory>
       </Directory>
     </Directory>
+
+    <InstallExecuteSequence>
+      <RemoveShortcuts>Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL"</RemoveShortcuts>
+    </InstallExecuteSequence>
   </Module>
 </Wix>
diff --git a/Installer/DChartHelper64bitMM/DChartHelper_MergeModule.wxs b/Installer/DChartHelper64bitMM/DChartHelper_MergeModule.wxs
@@ -48,5 +48,9 @@
       </Directory>
 
     </Directory>
+
+    <InstallExecuteSequence>
+      <RemoveShortcuts>Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL"</RemoveShortcuts>
+    </InstallExecuteSequence>
   </Module>
 </Wix>
diff --git a/Installer/DChartHelperMM/DChartHelper_MergeModule.wxs b/Installer/DChartHelperMM/DChartHelper_MergeModule.wxs
@@ -46,5 +46,9 @@
       </Directory>
 
     </Directory>
+
+    <InstallExecuteSequence>
+      <RemoveShortcuts>Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL"</RemoveShortcuts>
+    </InstallExecuteSequence>
   </Module>
 </Wix>
diff --git a/Installer/DcmDotMM/DcmDot_MergeModule.wxs b/Installer/DcmDotMM/DcmDot_MergeModule.wxs
@@ -22,5 +22,9 @@
       </Directory>
 
     </Directory>
+
+    <InstallExecuteSequence>
+      <RemoveShortcuts>Installed AND NOT UPGRADINGPRODUCTCODE AND REMOVE="ALL"</RemoveShortcuts>
+    </InstallExecuteSequence>
   </Module>
 </Wix>
diff --git a/Installer/SEC Setup 64bit/EcFeatures.wxs b/Installer/SEC Setup 64bit/EcFeatures.wxs
@@ -143,8 +143,8 @@
         <Condition Level="3"><![CDATA[SIL_PERL_FOUND AND NOT REMOVE]]></Condition>
         <MergeRef Id="PerlEC"/>
       </Feature>
-      <Feature Id="Python_2.7" Title="Python Script Functions 2.7" Description="Python plug-in to use Python functions for text transduction. Requires a separately-installed distribution of Python v2.7.x." Level="4" AllowAdvertise="no">
-        <Condition Level="3"><![CDATA[SIL_PYTHON_FOUND AND NOT REMOVE]]></Condition>
+      <Feature Id="Python" Title="Python Scripts" Description="Python plug-in to use Python functions for text transduction. Requires a separately-installed distribution of Python v2.7.x or v3.x" Level="4" AllowAdvertise="no">
+        <Condition Level="3"><![CDATA[(SIL_PYTHON_FOUND OR (SIL_PYTHON3_FOUND = "Python Software Foundation")) AND NOT REMOVE]]></Condition>
         <MergeRef Id="SEC_PythonEC"/>
         <MergeRef Id="SetPath"/>
         <MergeRef Id="MFC"/>

diff --git a/Installer/SEC Setup 64bit/EcMergeModules.wxs b/Installer/SEC Setup 64bit/EcMergeModules.wxs
@@ -5,9 +5,9 @@
 
     <DirectoryRef Id="INSTALLDIR">
       <!-- The following merge modules install to the default directory: C:\Program Files\SIL\SILConverters -->
-      <Merge Id="SEC_EC" Language="1033" SourceFile="$(var.EcDistFilesPath)\MergeModules\x64\EC_40_64bit_MM.msm" DiskId="1"/>
-      <Merge Id="CcDLLsMM" Language="1033" SourceFile="$(var.EcDistFilesPath)\MergeModules\x64\CcDLLs64bitMM.msm" DiskId="1" />
-      <Merge Id="AIGuesser" Language="1033" SourceFile="$(var.EcDistFilesPath)\MergeModules\x64\AIGuesser64bitMM.msm" DiskId="1"/>
+      <Merge Id="SEC_EC" Language="1033" SourceFile="$(var.EcDistFilesPath)\MergeModules\x64\Release\EC_40_64bit_MM.msm" DiskId="1"/>
+      <Merge Id="CcDLLsMM" Language="1033" SourceFile="$(var.EcDistFilesPath)\MergeModules\x64\Release\CcDLLs64bitMM.msm" DiskId="1" />
+      <Merge Id="AIGuesser" Language="1033" SourceFile="$(var.EcDistFilesPath)\MergeModules\x64\Release\AIGuesser64bitMM.msm" DiskId="1"/>
       <Merge Id="AdaptIt2Unicode" Language="1033" SourceFile="..\MergeModules\x64\AdaptIt2Unicode64bitMM.msm" DiskId="1"/>
       <Merge Id="ConverterInstaller" Language="1033" SourceFile="..\MergeModules\x64\ConverterInstaller64bitMM.msm" DiskId="1"/>
       <Merge Id="IndicConverters" Language="1033" SourceFile="..\MergeModules\x64\IndicConverters64bit.msm" DiskId="1"/>
@@ -17,17 +17,17 @@
       <Merge Id="SCOffice10" Language="1033" SourceFile="..\MergeModules\x64\SCOffice1064bitMM.msm" DiskId="1"/>
       <Merge Id="SILConvertersForWord" Language="1033" SourceFile="..\MergeModules\x64\SilConvertersForWord64bitMM.msm" DiskId="1"/>
       <Merge Id="SFM_Converter" Language="1033" SourceFile="..\MergeModules\x64\SFM Converter 64bit MM.msm" DiskId="1"/>
-      <Merge Id="PerlEC" Language="1033" SourceFile="$(var.EcDistFilesPath)\MergeModules\x64\PerlEc64bitMM.msm" DiskId="1"/>
-      <Merge Id="SEC_PythonEC" Language="1033" SourceFile="$(var.EcDistFilesPath)\MergeModules\x64\PythonEc64bitMM.msm" DiskId="1"/>
+      <Merge Id="PerlEC" Language="1033" SourceFile="$(var.EcDistFilesPath)\MergeModules\x64\Release\PerlEc64bitMM.msm" DiskId="1"/>
+      <Merge Id="SEC_PythonEC" Language="1033" SourceFile="$(var.EcDistFilesPath)\MergeModules\x64\Release\PythonEc64bitMM.msm" DiskId="1"/>
       <Merge Id="TECkitMapUEditor" Language="1033" SourceFile="..\MergeModules\x64\TECkitMapUEditor64bit.msm" DiskId="1"/>
       <Merge Id="XmlConverters" Language="1033" SourceFile="..\MergeModules\x64\XmlConverters64bitMM.msm" DiskId="1"/>
       <Merge Id="SpellFixerEc" Language="1033" SourceFile="..\MergeModules\x64\SpellFixerEc64bitMM.msm" DiskId="1"/>
       <Merge Id="TECkit_Package" Language="1033" SourceFile="..\MergeModules\x64\TECkitPackage64bitMM.msm" DiskId="1"/>
-      <Merge Id="EcTranslators" Language="1033" SourceFile="$(var.EcDistFilesPath)\MergeModules\x64\EcTranslators64bitMM.msm" DiskId="1"/>
+      <Merge Id="EcTranslators" Language="1033" SourceFile="$(var.EcDistFilesPath)\MergeModules\x64\Release\EcTranslators64bitMM.msm" DiskId="1"/>
     </DirectoryRef>
 
     <DirectoryRef Id="Firefox">
-      <Merge Id="EcFirefox" Language="1033" SourceFile="$(var.EcDistFilesPath)\MergeModules\x64\EcFireFox64.msm" DiskId="1"/>
+      <Merge Id="EcFirefox" Language="1033" SourceFile="$(var.EcDistFilesPath)\MergeModules\x64\Release\EcFireFox64.msm" DiskId="1"/>
     </DirectoryRef>
 
     <DirectoryRef Id="Paratext9">
@@ -58,8 +58,8 @@
     <DirectoryRef Id="CommonFilesFolderSIL">
       <!--The following merge modules install to the directory: C:\Program Files\Common Files\SIL-->
       <Merge Id="SetPath" Language="1033" SourceFile="..\MergeModules\x64\SetPath.msm" DiskId="1"/>
-      <Merge Id="TECkit_DLLs" Language="1033" SourceFile="$(var.EcDistFilesPath)\MergeModules\x64\TECkit64bitDllsMM.msm" DiskId="1"/>
-      <Merge Id="SEC_ICU" Language="1033" SourceFile="$(var.EcDistFilesPath)\MergeModules\x64\ICU_40_64bit.msm" DiskId="1"/>
+      <Merge Id="TECkit_DLLs" Language="1033" SourceFile="$(var.EcDistFilesPath)\MergeModules\x64\Release\TECkit64bitDllsMM.msm" DiskId="1"/>
+      <Merge Id="SEC_ICU" Language="1033" SourceFile="$(var.EcDistFilesPath)\MergeModules\x64\Release\ICU_40_64bit.msm" DiskId="1"/>
     </DirectoryRef>
     <DirectoryRef Id="System64Folder">
       <Merge Id="CRT" Language="1033" SourceFile="..\ExternalMergeModules\Microsoft_VC142_CRT_x64.msm" DiskId="1"/>