Fixed CI build to work with latest version of VS

.github/workflows/build-test-installer-release.yml

@@ -79,8 +79,6 @@ jobs:
 
       - name: Setup MSBuild
         uses: microsoft/setup-msbuild@v2
-        with:
-          vs-version: '[17.0,18.0)'
 
       - name: Build
         run: msbuild build\SayMore.proj /t:Build /p:Configuration=$env:Configuration /p:Version=$env:Version /m
@@ -96,14 +94,10 @@ jobs:
           if-no-files-found: warn
           path: output/x64/${{ env.Configuration }}/net48/TestResults.xml
 
-      - name: Copy CHM file into DistFiles
-        run: copy "docs\SayMore.chm" "DistFiles\SayMore.chm"
-
       - name: Create HTML release notes
         run: msbuild build\SayMore.proj /t:ConvertReleaseNotesToHtml /p:Version=$env:Version /m
 
       - name: Build installer
-        if: ${{ github.event_name != 'pull_request' }}
         run: msbuild build\SayMore.proj /t:Installer /p:Configuration=$env:Configuration /p:Version=$env:Version /m
 
       - name: Sign installer
@@ -115,7 +109,6 @@ jobs:
           files-folder-filter: SayMoreInstaller*.msi
 
       - name: Upload installer artifacts
-        if: ${{ github.event_name != 'pull_request' }}
         uses: actions/upload-artifact@v4
         with:
           name: saymore-installer

.gitignore

@@ -31,8 +31,6 @@ UpgradeLog.XML
 RAMP, REAP, METS/cat_mets.ppt
 UpgradeLog2.XML
 Interface Design Strategies for Computer-Assisted Speech Transcription.pdf
-DistFiles/SayMore.chm
-SayMore.chm
 
 HG Setup.eml
 *.orig
@@ -48,7 +46,6 @@ SayMore Lightning Talk (Conf. 2011).docx
 SayMore Presentation.docx
 DistFiles/mplayer/media/*
 artwork/layer1-9.png
-DistFiles/SayMore.chw
 Thumbs.db
 src/AutoSegmenter/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
 /DistFiles/Palaso.*.xlf

DistFiles/.guidsForInstaller.xml

@@ -9,8 +9,6 @@
   <File Id="ProgramDir.Genres.xml" Guid="86a67200-5a58-46ae-9ad5-eee1a75300d6" />
   <File Id="ProgramDir.license.rtf" Guid="c515cf6a-3364-4578-bf4e-a3999294087c" />
   <File Id="ProgramDir.releaseNotes.md" Guid="bdbc42c3-9be7-4ca5-a2bc-9c91d58883f0" />
-  <File Id="ProgramDir.SayMore.chm" Guid="8a822c10-ac11-40d1-8c2e-a33b7236ccd1" />
-  <File Id="ProgramDir.SayMore.chw" Guid="91b6685c-df54-45a3-b2f0-accfd76991aa" />
   <File Id="ProgramDir.SessionFileInfoTemplates.xml" Guid="79c9620d-5ae8-4fbb-bdcf-3a88a57c9ae0" />
   <File Id="ProgramDir.SayMore.es.xlf" Guid="ba5a04a9-3330-49e6-8f70-30f912c3014b" />
   <File Id="ProgramDir.SayMore.fr.xlf" Guid="ca34e91c-f353-46ec-b2b0-d36a4e75c19e" />

DistFiles/aboutBox.htm

@@ -7,7 +7,7 @@
     <base target="_blank" rel="noopener noreferrer"><!-- Links should open in new window -->
 </head>
 <body>
-    <h1 style="margin-top:8px">Copyright © 2011-2025 <a href="https://www.sil.org/">SIL Global</a></h1>
+    <h1 style="margin-top:8px">Copyright © 2011-2026 <a href="https://www.sil.org/">SIL Global</a></h1>
 
     <h1>License</h1>
     <p>Open source (<a href="https://sil.mit-license.org/">MIT</a>).</p>
@@ -35,7 +35,6 @@ <h1>Thanks</h1>
     <p>Payap University Linguistics Institute, Chiang Mai, Thailand</p>
     <p>Steven Bird (University of Melbourne)</p>
     <p>Sarah Moeller, Tim Gaved, Cambell Prince, Michael Cochran, Gary Simons, John Wickberg, Will Reiman (SIL Global)</p>
-    <p>JetBrains for <a href="https://www.jetbrains.com/resharper/">Resharper</a>, which helps keep our C# code clean and agile, and <a href="https://www.jetbrains.com/teamcity/">TeamCity</a>, which we use for continuous integration and builds.</p>
     <p>Microsoft for <a href="https://github.com/">Github</a>, the repository where our open-source code is hosted for free, and also for free use of <a href="https://visualstudio.microsoft.com/vs/community/">Visual Studio Community</a>, our preferred IDE.</p>
     <p>Atlassian, for a free open-source license for <a href="https://www.atlassian.com/software/jira/overview">Jira</a>, where we keep bug reports.</p>
 

build/TestInstallerBuild.bat

@@ -1,18 +1,10 @@
-REM IF NOT "%msbuildpath%"=="" GOTO unexpectedsystemvariableinuse
-pushd .
-copy "..\..\SaymoreDocumentation\SayMore.chm" ..\DistFiles
-REM IF EXIST "\Program Files (x86)\MSBuild\14.0\Bin" SET msbuildpath="\Program Files (x86)\MSBuild\14.0\Bin\MSbuild"
-REM ELSE IF EXIST "\Program Files (x86)\MSBuild\12.0\Bin" SET msbuildpath="\Program Files (x86)\MSBuild\12.0\Bin\MSbuild"
-REM ELSE SET msbuildpath=MSbuild
-REM %msbuildpath% /target:installer /property:teamcity_build_checkoutDir=..\ /verbosity:detailed /property:teamcity_dotnet_nunitlauncher_msbuild_task="notthere" /property:BUILD_NUMBER="*.*.6.789" /property:Configuration=Release"
+pushd .\
+FOR /F "tokens=*" %%i IN ('"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe') DO SET msbuildexe="%%i"
 dotnet restore ..\SayMore.sln
-msbuild /target:Build  /verbosity:detailed
-msbuild /target:ConvertReleaseNotesToHtml;installer /property:Version=3.8.2000 /verbosity:detailed
+%msbuildexe% /target:Build  /verbosity:detailed
+%msbuildexe% /target:ConvertReleaseNotesToHtml;installer /property:Version=3.8.2000 /verbosity:detailed
 popd
 GOTO pauseforusertoseeoutput
-
-REM :unexpectedsystemvariableinuse
-REM @ECHO Unexpected system variable msbuildpath is in use. Value: %msbuildpath%
 :pauseforusertoseeoutput
 ECHO %CMDCMDLINE% | findstr /i "/c" >nul
-IF NOT errorlevel 1 PAUSE
+IF NOT errorlevel 1 PAUSE

src/Installer/Installer.wxs

@@ -358,6 +358,10 @@ are trying to support, you're better off using non-advertised shortcuts. "-->
 			<Component Id="irrKlang.NET4.x64" Guid="{F0CAECD1-8D7E-4D4F-9147-A4E8ED2B742B}" Win64="yes">
 				<File Id="irrKlang.NET4.x64" Name="irrKlang.NET4.dll" KeyPath="yes" Source="$(var.OutputDir)lib\win-x64\irrKlang.NET4.dll" />
 			</Component>
+
+			<Component Id="SayMore.chm" Guid="{8a822c10-ac11-40d1-8c2e-a33b7236ccd1}" Win64="yes">
+				<File Id="SayMore.chm" Name="SayMore.chm" KeyPath="yes" Source="..\..\docs\SayMore.chm" />
+			</Component>
 		</Directory>
 	  </Directory>
 	</Directory>
@@ -419,6 +423,7 @@ are trying to support, you're better off using non-advertised shortcuts. "-->
 		<ComponentRef Id="ikpFlac.x64"/>
 		<ComponentRef Id="ikpMP3.x64"/>
 		<ComponentRef Id="irrKlang.NET4.x64"/>
+		<ComponentRef Id="SayMore.chm"/>
 		<ComponentRef Id="IMDILists"/>
 		<ComponentGroupRef Id="DistFiles"/>
 	</Feature>

src/SayMore/Program.cs

@@ -684,10 +684,25 @@ public static void ResumeBackgroundProcesses(bool processAllPendingEventsNow)
 				WaitCursor.Hide();
 		}
 
+		/// ------------------------------------------------------------------------------------
+		internal static string GetHelpFilePath()
+		{
+			const string kHelpFileName = "SayMore.chm";
+			var path = FileLocationUtilities.GetFileDistributedWithApplication(false, kHelpFileName);
+			if (path != null)
+				return path;
+			// In the dev environment, SayMore.chm is in the docs submodule, not DistFiles.
+			// TODO: Replace once SIL.IO's FileLocationUtilities supports AdditionalSearchDirectories.
+			var docsDir = FileLocationUtilities.GetDirectoryDistributedWithApplication(false, "docs");
+			if (docsDir != null)
+				return Path.Combine(docsDir, kHelpFileName);
+			throw new FileNotFoundException($"Could not find {kHelpFileName}.");
+		}
+
 		/// ------------------------------------------------------------------------------------
 		public static void ShowHelpTopic(string topicLink)
 		{
-			var path = FileLocationUtilities.GetFileDistributedWithApplication("SayMore.chm");
+			var path = GetHelpFilePath();
 			Help.ShowHelp(new Label(), path, topicLink);
 
 			Analytics.Track("Show Help Topic", new Dictionary<string, string> {

src/SayMore/UI/ProjectWindow/ProjectWindow.cs

@@ -317,7 +317,7 @@ private static void HandleAboutDialogCheckForUpdatesClick(object sender, EventAr
 		private void HandleHelpClick(object sender, EventArgs e)
 		{
 			//nb: when the file is in our source code, and not in the program directory, windows security will squawk and then not show content.
-			var path = FileLocationUtilities.GetFileDistributedWithApplication(false,"SayMore.chm");
+			var path = Program.GetHelpFilePath();
 			try
 			{
 				Process.Start(path);