From 49493f8a9628a1fb0df71b0dd781cd2d8d1130a3 Mon Sep 17 00:00:00 2001 From: Robin Munn Date: Wed, 27 Nov 2024 10:50:00 +0700 Subject: [PATCH] A few more 461 -> 462 updates --- Directory.Build.props | 2 +- l10n/l10n.proj | 2 +- src/Chorus/app.config | 2 +- src/ChorusHub/app.config | 2 +- src/ChorusHubApp/app.config | 2 +- src/LibChorus/Properties/launchSettings.json.sample | 4 ++-- src/LibChorus/app.config | 2 +- src/SampleApp/app.config | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index d0cf1ae2b..01bf03074 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -27,7 +27,7 @@ See full changelog at https://github.com/sillsdev/chorus/blob/master/CHANGELOG.m has platform dependent binaries, so msbuild decides that Chorus is platform specific, regardless of the actual platform target. For the same reason we have to set RuntimeIdentifiers when building with .NET 5 on AppVeyor. Otherwise the build - fails with an error that there is no target for'net461/win7-x86'. --> + fails with an error that there is no target for'net462/win7-x86'. --> AnyCPU win-x86;win-x64 diff --git a/l10n/l10n.proj b/l10n/l10n.proj index 6754c84ff..5b6e5f76d 100644 --- a/l10n/l10n.proj +++ b/l10n/l10n.proj @@ -46,7 +46,7 @@ Lines=" <note xml:lang="en">Not found in static scan of compiled code (version 0.0.0)</note>"/> - + diff --git a/src/Chorus/app.config b/src/Chorus/app.config index 4f5f46af5..d4e233644 100644 --- a/src/Chorus/app.config +++ b/src/Chorus/app.config @@ -5,7 +5,7 @@
- + diff --git a/src/ChorusHub/app.config b/src/ChorusHub/app.config index 3dbff35f4..2a0024f75 100644 --- a/src/ChorusHub/app.config +++ b/src/ChorusHub/app.config @@ -1,3 +1,3 @@ - + diff --git a/src/ChorusHubApp/app.config b/src/ChorusHubApp/app.config index 4e05733d3..88a86c811 100644 --- a/src/ChorusHubApp/app.config +++ b/src/ChorusHubApp/app.config @@ -2,4 +2,4 @@ - + diff --git a/src/LibChorus/Properties/launchSettings.json.sample b/src/LibChorus/Properties/launchSettings.json.sample index 32ed1dfed..9183b8576 100644 --- a/src/LibChorus/Properties/launchSettings.json.sample +++ b/src/LibChorus/Properties/launchSettings.json.sample @@ -2,12 +2,12 @@ "profiles": { "FLEx Bridge (Get)": { "commandName": "Executable", - "executablePath": "C:\\fwrepo\\flexbridge\\output\\Debug\\net461\\FLExBridge.exe", + "executablePath": "C:\\fwrepo\\flexbridge\\output\\Debug\\net462\\FLExBridge.exe", "commandLineArgs": "-u developer -p c:\\fwrepo\\fw\\DistFiles\\Projects -v obtain -projDir c:\\fwrepo\\fw\\DistFiles\\Projects -fwAppsDir C:\\fwrepo\\fw\\Output\\Debug -fwmodel 7000072 -liftmodel 0.13_ldml3 -locale en -pipeID SendReceivec:\\fwrepo\\fw\\DistFiles\\Projectsobtain" }, "FLEx Bridge (S&R)": { "commandName": "Executable", - "executablePath": "C:\\fwrepo\\flexbridge\\output\\Debug\\net461\\FLExBridge.exe", + "executablePath": "C:\\fwrepo\\flexbridge\\output\\Debug\\net462\\FLExBridge.exe", "commandLineArgs": "-u developer -p c:\\fwrepo\\fw\\DistFiles\\Projects\\Sena 3\\Sena 3.fwdata -v send_receive -f C:\\fwrepo\\fw\\Output\\Debug\\FixFwData.exe -projDir c:\\fwrepo\\fw\\DistFiles\\Projects -fwAppsDir C:\\fwrepo\\fw\\Output\\Debug -fwmodel 7000072 -liftmodel 0.13_ldml3 -locale en -pipeID SendReceivec:\\fwrepo\\fw\\DistFiles\\Projects\\Sena 3\\Sena 3.fwdatasend_receive -ws seh" } } diff --git a/src/LibChorus/app.config b/src/LibChorus/app.config index 36837ee8f..73187c7b0 100644 --- a/src/LibChorus/app.config +++ b/src/LibChorus/app.config @@ -12,4 +12,4 @@ - + diff --git a/src/SampleApp/app.config b/src/SampleApp/app.config index 0dff63a07..ac5aa757c 100644 --- a/src/SampleApp/app.config +++ b/src/SampleApp/app.config @@ -1,3 +1,3 @@ - +