diff --git a/Directory.Build.props b/Directory.Build.props index d0cf1ae2..01bf0307 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 6754c84f..5b6e5f76 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 4f5f46af..d4e23364 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 3dbff35f..2a0024f7 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 4e05733d..88a86c81 100644 --- a/src/ChorusHubApp/app.config +++ b/src/ChorusHubApp/app.config @@ -2,4 +2,4 @@ - + diff --git a/src/Installer/ChorusHub.wxs b/src/Installer/ChorusHub.wxs index b17d9066..7192f36c 100644 --- a/src/Installer/ChorusHub.wxs +++ b/src/Installer/ChorusHub.wxs @@ -22,9 +22,9 @@ http://blogs.msdn.com/robmen/archive/2003/10/04/56479.aspx --> - - - + + + - + @@ -73,46 +73,46 @@ http://blogs.msdn.com/robmen/archive/2003/10/04/56479.aspx --> - + - + - + - + - + - + - + - + - + - + @@ -149,7 +149,7 @@ http://blogs.msdn.com/robmen/archive/2003/10/04/56479.aspx --> - + diff --git a/src/Installer/ChorusMergeModule.wxs b/src/Installer/ChorusMergeModule.wxs index 703c5197..b95e61b4 100644 --- a/src/Installer/ChorusMergeModule.wxs +++ b/src/Installer/ChorusMergeModule.wxs @@ -45,13 +45,13 @@ http://blogs.msdn.com/robmen/archive/2003/10/04/56479.aspx --> - + - + - + @@ -59,34 +59,34 @@ http://blogs.msdn.com/robmen/archive/2003/10/04/56479.aspx --> - + - + - + - + - + - + - + - + - + diff --git a/src/LibChorus/Properties/launchSettings.json.sample b/src/LibChorus/Properties/launchSettings.json.sample index 32ed1dfe..9183b857 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 36837ee8..73187c7b 100644 --- a/src/LibChorus/app.config +++ b/src/LibChorus/app.config @@ -12,4 +12,4 @@ - + diff --git a/src/LibChorusTests/FileHandlers/ChorusFileTypeHandlerCollectionTests.cs b/src/LibChorusTests/FileHandlers/ChorusFileTypeHandlerCollectionTests.cs index 70344314..773f9fc7 100644 --- a/src/LibChorusTests/FileHandlers/ChorusFileTypeHandlerCollectionTests.cs +++ b/src/LibChorusTests/FileHandlers/ChorusFileTypeHandlerCollectionTests.cs @@ -22,7 +22,7 @@ private static string SamplePluginPath var configOutputDir = Directory.GetParent(BaseDir); var outputDir = configOutputDir.Parent.FullName; var config = configOutputDir.Name; - var samplePluginDllPath = Path.Combine(outputDir, "SamplePlugin", config, "net461", "Tests-ChorusPlugin.dll"); + var samplePluginDllPath = Path.Combine(outputDir, "SamplePlugin", config, "net462", "Tests-ChorusPlugin.dll"); return samplePluginDllPath; } } diff --git a/src/SampleApp/app.config b/src/SampleApp/app.config index 0dff63a0..ac5aa757 100644 --- a/src/SampleApp/app.config +++ b/src/SampleApp/app.config @@ -1,3 +1,3 @@ - +