diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index e1bd6490..17157293 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -30,18 +30,6 @@ jobs: with: fetch-depth: 0 submodules: true - - - name: Download 461 targeting pack - uses: suisei-cn/actions-download-file@818d6b7dc8fe73f2f924b6241f2b1134ca1377d9 # 1.6.0 - id: downloadfile - with: - url: "https://download.microsoft.com/download/F/1/D/F1DEB8DB-D277-4EF9-9F48-3A65D4D8F965/NDP461-DevPack-KB3105179-ENU.exe" - target: public/ - - - name: Install targeting pack - shell: cmd - working-directory: public - run: NDP461-DevPack-KB3105179-ENU.exe /q - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v2 @@ -58,7 +46,7 @@ jobs: choco uninstall wixtoolset choco install wixtoolset --version 3.11.2 --allow-downgrade --force echo "C:\Program Files (x86)\WiX Toolset v3.11\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - if: github.event_name != 'pull_request' + if: github.event_name != 'pull_request' # If we are just doing a CI build we don't need real localizations, but the location must exist - name: Add Fake Localizations for CI @@ -180,13 +168,13 @@ jobs: - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v2 - + - name: Download FlexBridge artifact uses: actions/download-artifact@v4 with: name: FlexBridge.msi path: src/WiXInstaller/BaseInstallerBuild # Target directory for the downloaded artifact - + - name: Build Bundles id: build_bundles working-directory: build @@ -194,7 +182,7 @@ jobs: run: | msbuild FLExBridge.proj /t:RestoreBuildTasks;RestorePackages;GetDotNetFiles;CopyWixOverrides msbuild FLExBridge.proj /t:BuildProductBaseBundles /p:Configuration=Release /p:Platform="Any CPU" - + - name: Extract burn engines id: extract_engines working-directory: BuildDir @@ -202,7 +190,7 @@ jobs: run: | insignia -ib FlexBridge_Offline.exe -o offline-engine.exe insignia -ib FlexBridge_Online.exe -o online-engine.exe - + - name: Upload Offline Engine id: upload-offline-engine uses: actions/upload-artifact@v4 @@ -211,8 +199,8 @@ jobs: path: BuildDir/offline-engine.exe if-no-files-found: error overwrite: true - if: github.event_name != 'pull_request' - + if: github.event_name != 'pull_request' + - name: Upload Offline Bundle(detatched) id: upload-offline-bundle uses: actions/upload-artifact@v4 @@ -221,8 +209,8 @@ jobs: path: BuildDir/FlexBridge_Offline.exe if-no-files-found: error overwrite: true - if: github.event_name != 'pull_request' - + if: github.event_name != 'pull_request' + - name: Upload Online Engine id: upload-online-engine uses: actions/upload-artifact@v4 @@ -231,8 +219,8 @@ jobs: path: BuildDir/online-engine.exe if-no-files-found: error overwrite: true - if: github.event_name != 'pull_request' - + if: github.event_name != 'pull_request' + - name: Upload Online Bundle(detached) id: upload-online-bundle uses: actions/upload-artifact@v4 @@ -242,7 +230,7 @@ jobs: if-no-files-found: error overwrite: true if: github.event_name != 'pull_request' - + sign-offline-engine: name: Sign Offline Engine needs: build-bundles @@ -268,13 +256,13 @@ jobs: reattach-engines: runs-on: windows-latest needs: [sign-offline-engine, sign-online-engine] - steps: + steps: - name: Downgrade Wix Toolset - remove when runner has 3.14.2 run: | choco uninstall wixtoolset choco install wixtoolset --version 3.11.2 --allow-downgrade --force echo "C:\Program Files (x86)\WiX Toolset v3.11\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - + - name: Download signed online engine uses: actions/download-artifact@v4 with: @@ -291,7 +279,7 @@ jobs: uses: actions/download-artifact@v4 with: name: FlexBridge_Offline.exe - + - name: Reattach Engines shell: cmd run: | @@ -317,17 +305,17 @@ jobs: if-no-files-found: error overwrite: true if: github.event_name != 'pull_request' - - - name: Cleanup Offline Engine + + - name: Cleanup Offline Engine uses: geekyeggo/delete-artifact@v5 with: name: offline-engine - - - name: Cleanup Online Engine + + - name: Cleanup Online Engine uses: geekyeggo/delete-artifact@v5 with: name: online-engine - + sign-offline-bundle: name: Sign Offline Bundle needs: reattach-engines diff --git a/Directory.Build.props b/Directory.Build.props index 863ab7b2..30e1b2fc 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - net461 + net462 Debug;Release Library that allows multiple FieldWorks users to collaborate remotely (i.e., not necessarily connected by a local network). SIL @@ -25,11 +25,11 @@ See full changelog at https://github.com/sillsdev/flexbridge/blob/develop/CHANGE ../../CHANGELOG.md false true - 6.0.0-beta* - 10.2.0-beta* + 6.0.0-beta0059 + 11.0.0-beta* - + diff --git a/Directory.Build.targets b/Directory.Build.targets index af95ce54..3e08c64d 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -4,7 +4,7 @@ their presence prevents L10nSharp from extracting strings for localization, since the Linux Geckofx DLL's can't be loaded. Deleting them here fixes both developer builds in Visual Studio and installer builds on the server. --> - + diff --git a/ReadMe.md b/ReadMe.md index 2dc5af2f..c9456240 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -28,10 +28,10 @@ FLEx Bridge depends on several assemblies from Chorus and Palaso. Those are inst ``` [HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\SIL\Flex Bridge\9] - "InstallationDir"="C:\Dev\flexbridge\output\Debug\net461" + "InstallationDir"="C:\Dev\flexbridge\output\Debug\net462" ``` -- On **Linux**, `export FLEXBRIDGEDIR=${HOME}/fwrepo/flexbridge/output/Debug/net461` +- On **Linux**, `export FLEXBRIDGEDIR=${HOME}/fwrepo/flexbridge/output/Debug/net462` ### Build diff --git a/build/FLExBridge.proj b/build/FLExBridge.proj index ea381e73..ef17557a 100644 --- a/build/FLExBridge.proj +++ b/build/FLExBridge.proj @@ -28,6 +28,8 @@ true true false + + net462 @@ -98,8 +100,8 @@ - - + + @@ -109,23 +111,23 @@ - + - + - - - - - - + + + + + + @@ -133,7 +135,7 @@ - + @@ -199,20 +201,20 @@ - + - + diff --git a/src/FLEx-ChorusPluginTests/FLEx-ChorusPluginTests.csproj b/src/FLEx-ChorusPluginTests/FLEx-ChorusPluginTests.csproj index 46a7796b..9b7c5abb 100644 --- a/src/FLEx-ChorusPluginTests/FLEx-ChorusPluginTests.csproj +++ b/src/FLEx-ChorusPluginTests/FLEx-ChorusPluginTests.csproj @@ -5,12 +5,15 @@ FLEx-ChorusPluginTests Unit tests for FLEx-ChorusPlugin false + true ..\AppForTests.config - + + + diff --git a/src/LfMergeBridge/LfMergeBridge.csproj b/src/LfMergeBridge/LfMergeBridge.csproj index 72f87ee8..3af52fc6 100644 --- a/src/LfMergeBridge/LfMergeBridge.csproj +++ b/src/LfMergeBridge/LfMergeBridge.csproj @@ -4,7 +4,7 @@ LfMergeBridge LfMergeBridge SIL.ChorusPlugin.LfMergeBridge - net461;netstandard2.0 + net462;netstandard2.0 diff --git a/src/LibFLExBridge-ChorusPlugin/LibFLExBridge-ChorusPlugin.csproj b/src/LibFLExBridge-ChorusPlugin/LibFLExBridge-ChorusPlugin.csproj index 5752c1a0..e9de315d 100644 --- a/src/LibFLExBridge-ChorusPlugin/LibFLExBridge-ChorusPlugin.csproj +++ b/src/LibFLExBridge-ChorusPlugin/LibFLExBridge-ChorusPlugin.csproj @@ -4,7 +4,7 @@ LibFLExBridgeChorusPlugin LibFLExBridge-ChorusPlugin SIL.ChorusPlugin.LibFLExBridge - net461;netstandard2.0 + net462;netstandard2.0 true diff --git a/src/LibFLExBridge-ChorusPluginTests/LibFLExBridge-ChorusPluginTests.csproj b/src/LibFLExBridge-ChorusPluginTests/LibFLExBridge-ChorusPluginTests.csproj index 6730e1b1..c890d180 100644 --- a/src/LibFLExBridge-ChorusPluginTests/LibFLExBridge-ChorusPluginTests.csproj +++ b/src/LibFLExBridge-ChorusPluginTests/LibFLExBridge-ChorusPluginTests.csproj @@ -5,12 +5,15 @@ LibFLExBridge-ChorusPluginTests Unit tests for LibFLExBridge-ChorusPlugin false + true ..\AppForTests.config - + + + diff --git a/src/LibTriboroughBridge-ChorusPlugin/LibTriboroughBridge-ChorusPlugin.csproj b/src/LibTriboroughBridge-ChorusPlugin/LibTriboroughBridge-ChorusPlugin.csproj index 30cae006..f21c274b 100644 --- a/src/LibTriboroughBridge-ChorusPlugin/LibTriboroughBridge-ChorusPlugin.csproj +++ b/src/LibTriboroughBridge-ChorusPlugin/LibTriboroughBridge-ChorusPlugin.csproj @@ -4,7 +4,7 @@ LibTriboroughBridgeChorusPlugin LibTriboroughBridge-ChorusPlugin SIL.ChorusPlugin.LibTriboroughBridge - net461;netstandard2.0 + net462;netstandard2.0 diff --git a/src/LibTriboroughBridge-ChorusPluginTests/LibTriboroughBridge-ChorusPluginTests.csproj b/src/LibTriboroughBridge-ChorusPluginTests/LibTriboroughBridge-ChorusPluginTests.csproj index cc49d2af..390ebf8a 100644 --- a/src/LibTriboroughBridge-ChorusPluginTests/LibTriboroughBridge-ChorusPluginTests.csproj +++ b/src/LibTriboroughBridge-ChorusPluginTests/LibTriboroughBridge-ChorusPluginTests.csproj @@ -5,11 +5,14 @@ TriboroughBridge-ChorusPluginTests Unit tests for LibTriboroughBridge-ChorusPlugin false + true + + diff --git a/src/LiftBridge-ChorusPluginTests/LiftBridge-ChorusPluginTests.csproj b/src/LiftBridge-ChorusPluginTests/LiftBridge-ChorusPluginTests.csproj index 0c1a3f66..afa107a2 100644 --- a/src/LiftBridge-ChorusPluginTests/LiftBridge-ChorusPluginTests.csproj +++ b/src/LiftBridge-ChorusPluginTests/LiftBridge-ChorusPluginTests.csproj @@ -5,11 +5,14 @@ LiftBridge-ChorusPluginTests Unit tests for LiftBridge-ChorusPlugin false + true - + + + diff --git a/src/RepositoryUtilityTests/RepositoryUtilityTests.csproj b/src/RepositoryUtilityTests/RepositoryUtilityTests.csproj index 43a24459..c53cf0af 100644 --- a/src/RepositoryUtilityTests/RepositoryUtilityTests.csproj +++ b/src/RepositoryUtilityTests/RepositoryUtilityTests.csproj @@ -3,10 +3,13 @@ Unit tests for the FLEx Bridge Repository Utility false + true - + + + diff --git a/src/TriboroughBridge-ChorusPlugin/TriboroughBridgeUtilities.cs b/src/TriboroughBridge-ChorusPlugin/TriboroughBridgeUtilities.cs index 019d847e..92b40cd2 100644 --- a/src/TriboroughBridge-ChorusPlugin/TriboroughBridgeUtilities.cs +++ b/src/TriboroughBridge-ChorusPlugin/TriboroughBridgeUtilities.cs @@ -101,9 +101,9 @@ internal static Dictionary SetupLocalization(Dicti var versionObj = Assembly.GetExecutingAssembly().GetName().Version; // We don't need to reload strings for every "revision" (that might be every time we build). REVIEW (Hasso) 2021.08: then why do we have `build`? var version = $"{versionObj.Major}.{versionObj.Minor}.{versionObj.Build}"; - var flexBridgeLocMan = LocalizationManager.Create(TranslationMemory.XLiff, desiredUiLangId, FlexBridge, Application.ProductName, + var flexBridgeLocMan = LocalizationManager.Create(desiredUiLangId, FlexBridge, Application.ProductName, version, installedL10nBaseDir, userL10nBaseDir, CommonResources.chorus, - FlexLocalizationEmailAddress, FlexBridge, "TriboroughBridge_ChorusPlugin", "FLEx_ChorusPlugin", "SIL.LiftBridge"); + FlexLocalizationEmailAddress, new [] { FlexBridge, "TriboroughBridge_ChorusPlugin", "FLEx_ChorusPlugin", "SIL.LiftBridge" }); results.Add("FlexBridge", flexBridgeLocMan); // In case the UI language was unavailable, change it, so we don't frustrate the user with three dialogs. @@ -111,14 +111,14 @@ internal static Dictionary SetupLocalization(Dicti versionObj = Assembly.GetAssembly(typeof(ChorusSystem)).GetName().Version; version = "" + versionObj.Major + "." + versionObj.Minor + "." + versionObj.Build; - var chorusLocMan = LocalizationManager.Create(TranslationMemory.XLiff, desiredUiLangId, "Chorus", "Chorus", - version, installedL10nBaseDir, userL10nBaseDir, CommonResources.chorus, FlexLocalizationEmailAddress, "Chorus"); + var chorusLocMan = LocalizationManager.Create(desiredUiLangId, "Chorus", "Chorus", + version, installedL10nBaseDir, userL10nBaseDir, CommonResources.chorus, FlexLocalizationEmailAddress, new []{ "Chorus" }); results.Add("Chorus", chorusLocMan); versionObj = Assembly.GetAssembly(typeof(ErrorReport)).GetName().Version; version = "" + versionObj.Major + "." + versionObj.Minor + "." + versionObj.Build; - var palasoLocMan = LocalizationManager.Create(TranslationMemory.XLiff, desiredUiLangId, "Palaso", "Palaso", - version, installedL10nBaseDir, userL10nBaseDir, CommonResources.chorus, FlexLocalizationEmailAddress, "SIL"); + var palasoLocMan = LocalizationManager.Create(desiredUiLangId, "Palaso", "Palaso", + version, installedL10nBaseDir, userL10nBaseDir, CommonResources.chorus, FlexLocalizationEmailAddress, new []{ "SIL" }); results.Add("Palaso", palasoLocMan); } catch (Exception e) diff --git a/src/TriboroughBridge-ChorusPluginTests/TriboroughBridge-ChorusPluginTests.csproj b/src/TriboroughBridge-ChorusPluginTests/TriboroughBridge-ChorusPluginTests.csproj index 920cc466..c0f1e8ce 100644 --- a/src/TriboroughBridge-ChorusPluginTests/TriboroughBridge-ChorusPluginTests.csproj +++ b/src/TriboroughBridge-ChorusPluginTests/TriboroughBridge-ChorusPluginTests.csproj @@ -5,11 +5,14 @@ TriboroughBridge-ChorusPluginTests Unit tests for TriboroughBridge-ChorusPlugin false + true - + + +