diff --git a/Build/mkall.targets b/Build/mkall.targets index 2cd0a8895d..81b6a53364 100644 --- a/Build/mkall.targets +++ b/Build/mkall.targets @@ -283,9 +283,9 @@ 5.2.0-beta0003 - 13.0.0-beta0076 + 15.0.0-beta0117 9.4.0.1-beta - 11.0.0-beta0104 + 11.0.0-beta0111 70.1.123 3.4.2 1.1.1-beta0001 @@ -326,7 +326,11 @@ + + + + @@ -350,6 +354,7 @@ + @@ -493,30 +498,33 @@ 4.7.3lib/net45/*.*true 4.4.0lib/netstandard2.0/*.*true - $(PalasoNugetVersion)lib/net461/*.*$(UsingLocalLibraryBuild) + $(PalasoNugetVersion)lib/net462/*.*$(UsingLocalLibraryBuild) $(PalasoNugetVersion)contentFiles/any/any/*.*true - $(PalasoNugetVersion)lib/net461/*.*$(UsingLocalLibraryBuild) - $(PalasoNugetVersion)lib/net461/*.*$(UsingLocalLibraryBuild) + $(PalasoNugetVersion)lib/net462/*.*$(UsingLocalLibraryBuild) + $(PalasoNugetVersion)lib/net462/*.*$(UsingLocalLibraryBuild) $(PalasoNugetVersion)build/**/*.*true - $(PalasoNugetVersion)lib/net461/*.*$(UsingLocalLibraryBuild) + $(PalasoNugetVersion)lib/net462/*.*$(UsingLocalLibraryBuild) $(PalasoNugetVersion)contentFiles/any/any/*.*true - $(PalasoNugetVersion)lib/net461/*.*$(UsingLocalLibraryBuild) - $(PalasoNugetVersion)lib/net461/*.*$(UsingLocalLibraryBuild) - $(PalasoNugetVersion)lib/net461/*.*$(UsingLocalLibraryBuild) - $(PalasoNugetVersion)lib/net461/*.*$(UsingLocalLibraryBuild) - $(PalasoNugetVersion)lib/net461/*.*$(UsingLocalLibraryBuild) + $(PalasoNugetVersion)lib/net462/*.*$(UsingLocalLibraryBuild) + $(PalasoNugetVersion)lib/net462/*.*$(UsingLocalLibraryBuild) + $(PalasoNugetVersion)lib/net462/*.*$(UsingLocalLibraryBuild) + $(PalasoNugetVersion)lib/net462/*.*$(UsingLocalLibraryBuild) + $(PalasoNugetVersion)lib/net462/*.*$(UsingLocalLibraryBuild) $(PalasoNugetVersion)build/Interop.WIA.dlltrue $(PalasoNugetVersion)build/x64/Interop.WIA.dlltrue - $(PalasoNugetVersion)lib/net461/*.*$(UsingLocalLibraryBuild) + $(PalasoNugetVersion)lib/net462/*.*$(UsingLocalLibraryBuild) + $(PalasoNugetVersion)contentFiles/any/any/*.*true + $(PalasoNugetVersion)lib/net462/*.*$(UsingLocalLibraryBuild) $(PalasoNugetVersion)build/*.*true $(PalasoNugetVersion)contentFiles/any/any/*.*true - $(PalasoNugetVersion)lib/net461/*.*$(UsingLocalLibraryBuild) - $(PalasoNugetVersion)lib/net461/*.*$(UsingLocalLibraryBuild) - $(PalasoNugetVersion)lib/net461/*.*$(UsingLocalLibraryBuild) - $(PalasoNugetVersion)lib/net461/*.*$(UsingLocalLibraryBuild) + $(PalasoNugetVersion)lib/net462/*.*$(UsingLocalLibraryBuild) + $(PalasoNugetVersion)lib/net462/*.*$(UsingLocalLibraryBuild) + $(PalasoNugetVersion)lib/net462/*.*$(UsingLocalLibraryBuild) + $(PalasoNugetVersion)lib/net462/*.*$(UsingLocalLibraryBuild) + 9.0.0lib/net462/*.*true 4.5.4lib/net461/*.*true 4.6.0lib/netstandard2.0/*.*true - 6.0.0lib/net461/*.* + 7.0.0lib/net461/*.* 1.4.3-beta0010lib/net461/*.* 1.4.3-beta0010contentFiles/any/any/*.*true 0.15.0lib/*.*true @@ -648,7 +656,7 @@ - + @@ -679,7 +687,6 @@ - diff --git a/Build/nuget-common/packages.config b/Build/nuget-common/packages.config index ce42997ecc..e4f9b6ed1e 100644 --- a/Build/nuget-common/packages.config +++ b/Build/nuget-common/packages.config @@ -16,10 +16,10 @@ - + - + @@ -30,7 +30,6 @@ - @@ -40,52 +39,53 @@ - + - + + - - - - - - - - - - - + + + + + + + + + + - - + + - - - - - - - - + + + + + + + + + - + + + - - diff --git a/Lib/src/Converter/ConvertConsole/ConverterConsole.csproj b/Lib/src/Converter/ConvertConsole/ConverterConsole.csproj index 52c4b67292..272a9644f6 100644 --- a/Lib/src/Converter/ConvertConsole/ConverterConsole.csproj +++ b/Lib/src/Converter/ConvertConsole/ConverterConsole.csproj @@ -10,7 +10,7 @@ Properties ConverterConsole ConverterConsole - v4.6.1 + v4.6.2 512 diff --git a/Lib/src/Converter/Converter/Converter.csproj b/Lib/src/Converter/Converter/Converter.csproj index d0ec55e138..6c6cd68d31 100644 --- a/Lib/src/Converter/Converter/Converter.csproj +++ b/Lib/src/Converter/Converter/Converter.csproj @@ -10,7 +10,7 @@ Properties Converter Converter - v4.6.1 + v4.6.2 512 Converter.Program diff --git a/Lib/src/Converter/Convertlib/ConvertLib.csproj b/Lib/src/Converter/Convertlib/ConvertLib.csproj index 774fa93d6c..7d8470f824 100644 --- a/Lib/src/Converter/Convertlib/ConvertLib.csproj +++ b/Lib/src/Converter/Convertlib/ConvertLib.csproj @@ -10,7 +10,7 @@ Properties Converter ConvertLib - v4.6.1 + v4.6.2 512 diff --git a/Lib/src/ObjectBrowser/ObjectBrowser.csproj b/Lib/src/ObjectBrowser/ObjectBrowser.csproj index 610a6c360e..cf074c20c4 100644 --- a/Lib/src/ObjectBrowser/ObjectBrowser.csproj +++ b/Lib/src/ObjectBrowser/ObjectBrowser.csproj @@ -10,7 +10,7 @@ Properties SIL.ObjectBrowser ObjectBrowser - v4.6.1 + v4.6.2 512 diff --git a/Lib/src/ScrChecks/ScrChecks.csproj b/Lib/src/ScrChecks/ScrChecks.csproj index 4f80cd8876..29e2ed3442 100644 --- a/Lib/src/ScrChecks/ScrChecks.csproj +++ b/Lib/src/ScrChecks/ScrChecks.csproj @@ -18,7 +18,7 @@ false - v4.6.1 + v4.6.2 publish\ true Disk diff --git a/Lib/src/ScrChecks/ScrChecksTests/ScrChecksTests.csproj b/Lib/src/ScrChecks/ScrChecksTests/ScrChecksTests.csproj index 1e1f13c94a..fb536e19e2 100644 --- a/Lib/src/ScrChecks/ScrChecksTests/ScrChecksTests.csproj +++ b/Lib/src/ScrChecks/ScrChecksTests/ScrChecksTests.csproj @@ -16,7 +16,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true Disk diff --git a/Src/AppForTests.config b/Src/AppForTests.config index f04f5919ef..72c2d932de 100644 --- a/Src/AppForTests.config +++ b/Src/AppForTests.config @@ -14,11 +14,11 @@ - + - - + + @@ -35,41 +35,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Src/CacheLight/CacheLight.csproj b/Src/CacheLight/CacheLight.csproj index b65f699126..868593482d 100644 --- a/Src/CacheLight/CacheLight.csproj +++ b/Src/CacheLight/CacheLight.csproj @@ -36,7 +36,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true Disk diff --git a/Src/CacheLight/CacheLightTests/CacheLightTests.csproj b/Src/CacheLight/CacheLightTests/CacheLightTests.csproj index f4f224b6df..057bdc4292 100644 --- a/Src/CacheLight/CacheLightTests/CacheLightTests.csproj +++ b/Src/CacheLight/CacheLightTests/CacheLightTests.csproj @@ -29,7 +29,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true Disk diff --git a/Src/Common/Controls/Design/Design.csproj b/Src/Common/Controls/Design/Design.csproj index 58d7965546..2205d238a3 100644 --- a/Src/Common/Controls/Design/Design.csproj +++ b/Src/Common/Controls/Design/Design.csproj @@ -30,7 +30,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true diff --git a/Src/Common/Controls/DetailControls/DetailControls.csproj b/Src/Common/Controls/DetailControls/DetailControls.csproj index 9764de7b24..56101932d0 100644 --- a/Src/Common/Controls/DetailControls/DetailControls.csproj +++ b/Src/Common/Controls/DetailControls/DetailControls.csproj @@ -24,7 +24,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true Disk diff --git a/Src/Common/Controls/DetailControls/DetailControlsTests/DetailControlsTests.csproj b/Src/Common/Controls/DetailControls/DetailControlsTests/DetailControlsTests.csproj index eeb6d8e1db..ff8f34d167 100644 --- a/Src/Common/Controls/DetailControls/DetailControlsTests/DetailControlsTests.csproj +++ b/Src/Common/Controls/DetailControls/DetailControlsTests/DetailControlsTests.csproj @@ -37,7 +37,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true diff --git a/Src/Common/Controls/FwControls/FwControls.csproj b/Src/Common/Controls/FwControls/FwControls.csproj index f32741db97..6df2439dcb 100644 --- a/Src/Common/Controls/FwControls/FwControls.csproj +++ b/Src/Common/Controls/FwControls/FwControls.csproj @@ -33,7 +33,7 @@ false false true - v4.6.1 + v4.6.2 @@ -214,10 +214,6 @@ ..\..\..\..\Output\Debug\icu.net.dll True - - False - ..\..\..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll - diff --git a/Src/Common/Controls/FwControls/FwControlsTests/FwControlsTests.csproj b/Src/Common/Controls/FwControls/FwControlsTests/FwControlsTests.csproj index 5acb58694d..84a4259d2d 100644 --- a/Src/Common/Controls/FwControls/FwControlsTests/FwControlsTests.csproj +++ b/Src/Common/Controls/FwControls/FwControlsTests/FwControlsTests.csproj @@ -29,7 +29,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true Disk @@ -264,8 +264,4 @@ - - - - \ No newline at end of file diff --git a/Src/Common/Controls/Widgets/Widgets.csproj b/Src/Common/Controls/Widgets/Widgets.csproj index 60787540c7..6bcc48816d 100644 --- a/Src/Common/Controls/Widgets/Widgets.csproj +++ b/Src/Common/Controls/Widgets/Widgets.csproj @@ -29,7 +29,7 @@ 3.5 false - v4.6.1 + v4.6.2 publish\ true Disk diff --git a/Src/Common/Controls/Widgets/WidgetsTests/WidgetsTests.csproj b/Src/Common/Controls/Widgets/WidgetsTests/WidgetsTests.csproj index 337a57f820..15f9585bb2 100644 --- a/Src/Common/Controls/Widgets/WidgetsTests/WidgetsTests.csproj +++ b/Src/Common/Controls/Widgets/WidgetsTests/WidgetsTests.csproj @@ -37,7 +37,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true diff --git a/Src/Common/Controls/XMLViews/XMLViews.csproj b/Src/Common/Controls/XMLViews/XMLViews.csproj index 1404f460ca..bb0a386a87 100644 --- a/Src/Common/Controls/XMLViews/XMLViews.csproj +++ b/Src/Common/Controls/XMLViews/XMLViews.csproj @@ -30,7 +30,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true Disk diff --git a/Src/Common/Controls/XMLViews/XMLViewsTests/XMLViewsTests.csproj b/Src/Common/Controls/XMLViews/XMLViewsTests/XMLViewsTests.csproj index 1b2b72eea8..82dc831c5a 100644 --- a/Src/Common/Controls/XMLViews/XMLViewsTests/XMLViewsTests.csproj +++ b/Src/Common/Controls/XMLViews/XMLViewsTests/XMLViewsTests.csproj @@ -37,7 +37,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true Disk diff --git a/Src/Common/FieldWorks/App.config b/Src/Common/FieldWorks/App.config index de9a71d728..141063c514 100644 --- a/Src/Common/FieldWorks/App.config +++ b/Src/Common/FieldWorks/App.config @@ -6,10 +6,18 @@ + + + + + + + + @@ -27,38 +35,38 @@ Comment out the following section when the ParatextData and FieldWorks versions --> - + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/Src/Common/FieldWorks/FieldWorks.cs b/Src/Common/FieldWorks/FieldWorks.cs index e95a6e3d64..00a5662a5c 100644 --- a/Src/Common/FieldWorks/FieldWorks.cs +++ b/Src/Common/FieldWorks/FieldWorks.cs @@ -3628,8 +3628,8 @@ internal static void InitializeLocalizationManager() var versionObj = Assembly.LoadFrom(Path.Combine(fieldWorksFolder ?? string.Empty, "Chorus.exe")).GetName().Version; var version = $"{versionObj.Major}.{versionObj.Minor}.{versionObj.Build}"; // First create localization manager for Chorus with english - LocalizationManager.Create(TranslationMemory.XLiff, "en", - "Chorus", "Chorus", version, installedL10nBaseDir, userL10nBaseDir, null, "flex_localization@sil.org", "Chorus", "LibChorus"); + LocalizationManager.Create("en", + "Chorus", "Chorus", version, installedL10nBaseDir, userL10nBaseDir, null, "flex_localization@sil.org", new [] { "Chorus", "LibChorus" }); // Now that we have one manager initialized check and see if the users UI language has // localizations available var uiCulture = CultureInfo.CurrentUICulture.TwoLetterISOLanguageName; @@ -3641,8 +3641,8 @@ internal static void InitializeLocalizationManager() versionObj = Assembly.GetAssembly(typeof(ErrorReport)).GetName().Version; version = $"{versionObj.Major}.{versionObj.Minor}.{versionObj.Build}"; - LocalizationManager.Create(TranslationMemory.XLiff, LocalizationManager.UILanguageId, "Palaso", "Palaso", version, installedL10nBaseDir, - userL10nBaseDir, null, "flex_localization@sil.org", "SIL.Windows.Forms"); + LocalizationManager.Create(LocalizationManager.UILanguageId, "Palaso", "Palaso", version, installedL10nBaseDir, + userL10nBaseDir, null, "flex_localization@sil.org", new [] { "SIL.Windows.Forms" }); } catch (Exception e) { diff --git a/Src/Common/FieldWorks/FieldWorks.csproj b/Src/Common/FieldWorks/FieldWorks.csproj index 5d7dcbb785..f3b4738f8d 100644 --- a/Src/Common/FieldWorks/FieldWorks.csproj +++ b/Src/Common/FieldWorks/FieldWorks.csproj @@ -16,7 +16,7 @@ false - v4.6.1 + v4.6.2 true BookOnCube.ico publish\ @@ -158,10 +158,7 @@ False ..\..\..\Output\Debug\CommonServiceLocator.dll - - False - ..\..\packages\NETStandard.Library.NETFramework.2.0.0-preview2-25405-01\build\net461\lib\netstandard.dll - + False ..\..\..\Output\Debug\ParatextShared.dll diff --git a/Src/Common/FieldWorks/FieldWorksTests/FieldWorksTests.csproj b/Src/Common/FieldWorks/FieldWorksTests/FieldWorksTests.csproj index 0f36d48c52..e308d839ee 100644 --- a/Src/Common/FieldWorks/FieldWorksTests/FieldWorksTests.csproj +++ b/Src/Common/FieldWorks/FieldWorksTests/FieldWorksTests.csproj @@ -17,7 +17,7 @@ false - v4.6.1 + v4.6.2 publish\ true Disk diff --git a/Src/Common/Filters/Filters.csproj b/Src/Common/Filters/Filters.csproj index 789dc54287..0bcb70adeb 100644 --- a/Src/Common/Filters/Filters.csproj +++ b/Src/Common/Filters/Filters.csproj @@ -24,7 +24,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true diff --git a/Src/Common/Filters/FiltersTests/FiltersTests.csproj b/Src/Common/Filters/FiltersTests/FiltersTests.csproj index a29d498145..6a04a41415 100644 --- a/Src/Common/Filters/FiltersTests/FiltersTests.csproj +++ b/Src/Common/Filters/FiltersTests/FiltersTests.csproj @@ -29,7 +29,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true diff --git a/Src/Common/Framework/Framework.csproj b/Src/Common/Framework/Framework.csproj index 9f04695db3..4f89ce21c4 100644 --- a/Src/Common/Framework/Framework.csproj +++ b/Src/Common/Framework/Framework.csproj @@ -36,7 +36,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true Disk diff --git a/Src/Common/Framework/FrameworkTests/FrameworkTests.csproj b/Src/Common/Framework/FrameworkTests/FrameworkTests.csproj index c6884e7029..bd03eb4645 100644 --- a/Src/Common/Framework/FrameworkTests/FrameworkTests.csproj +++ b/Src/Common/Framework/FrameworkTests/FrameworkTests.csproj @@ -29,7 +29,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true Disk diff --git a/Src/Common/FwUtils/FwUtils.csproj b/Src/Common/FwUtils/FwUtils.csproj index e7124c800e..0a03928a3a 100644 --- a/Src/Common/FwUtils/FwUtils.csproj +++ b/Src/Common/FwUtils/FwUtils.csproj @@ -28,7 +28,7 @@ 3.5 - v4.6.1 + v4.6.2 false publish\ @@ -154,10 +154,7 @@ False ..\..\..\Output\Debug\NAudio.dll - - False - /opt/mono5-sil/lib/mono/xbuild/Microsoft/Microsoft.NET.Build.Extensions/net461/lib/netstandard.dll - + False ..\..\..\Output\Debug\NAudio.Lame.dll @@ -173,10 +170,6 @@ - - False - ..\..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll - False diff --git a/Src/Common/FwUtils/FwUtilsTests/FwUtilsTests.csproj b/Src/Common/FwUtils/FwUtilsTests/FwUtilsTests.csproj index 69a3865ed6..e7079b7707 100644 --- a/Src/Common/FwUtils/FwUtilsTests/FwUtilsTests.csproj +++ b/Src/Common/FwUtils/FwUtilsTests/FwUtilsTests.csproj @@ -29,7 +29,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true Disk @@ -144,6 +144,7 @@ AnyCPU + False ..\..\..\..\Output\Debug\SIL.Core.Desktop.dll diff --git a/Src/Common/RootSite/RootSite.csproj b/Src/Common/RootSite/RootSite.csproj index 60c15165cd..1717ad5f86 100644 --- a/Src/Common/RootSite/RootSite.csproj +++ b/Src/Common/RootSite/RootSite.csproj @@ -36,7 +36,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true Disk diff --git a/Src/Common/RootSite/RootSiteTests/RootSiteTests.csproj b/Src/Common/RootSite/RootSiteTests/RootSiteTests.csproj index 3455d0eccd..0ed672c778 100644 --- a/Src/Common/RootSite/RootSiteTests/RootSiteTests.csproj +++ b/Src/Common/RootSite/RootSiteTests/RootSiteTests.csproj @@ -29,7 +29,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true Disk diff --git a/Src/Common/ScriptureUtils/ScriptureUtils.csproj b/Src/Common/ScriptureUtils/ScriptureUtils.csproj index 5bf51a0adc..898d200987 100644 --- a/Src/Common/ScriptureUtils/ScriptureUtils.csproj +++ b/Src/Common/ScriptureUtils/ScriptureUtils.csproj @@ -37,7 +37,7 @@ 3.5 false - v4.6.1 + v4.6.2 publish\ true Disk @@ -184,10 +184,6 @@ - - False - ..\..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll - False ..\..\..\Output\Debug\Utilities.dll diff --git a/Src/Common/ScriptureUtils/ScriptureUtilsTests/ScriptureUtilsTests.csproj b/Src/Common/ScriptureUtils/ScriptureUtilsTests/ScriptureUtilsTests.csproj index 52af935f12..2f600419e0 100644 --- a/Src/Common/ScriptureUtils/ScriptureUtilsTests/ScriptureUtilsTests.csproj +++ b/Src/Common/ScriptureUtils/ScriptureUtilsTests/ScriptureUtilsTests.csproj @@ -38,7 +38,7 @@ 3.5 false - v4.6.1 + v4.6.2 publish\ true Disk diff --git a/Src/Common/SimpleRootSite/SimpleRootSite.csproj b/Src/Common/SimpleRootSite/SimpleRootSite.csproj index ccacc57084..afd8d25186 100644 --- a/Src/Common/SimpleRootSite/SimpleRootSite.csproj +++ b/Src/Common/SimpleRootSite/SimpleRootSite.csproj @@ -36,7 +36,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true Disk diff --git a/Src/Common/SimpleRootSite/SimpleRootSiteTests/SimpleRootSiteTests.csproj b/Src/Common/SimpleRootSite/SimpleRootSiteTests/SimpleRootSiteTests.csproj index a9b929ddb4..7833e6cd6a 100644 --- a/Src/Common/SimpleRootSite/SimpleRootSiteTests/SimpleRootSiteTests.csproj +++ b/Src/Common/SimpleRootSite/SimpleRootSiteTests/SimpleRootSiteTests.csproj @@ -29,7 +29,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true Disk diff --git a/Src/Common/UIAdapterInterfaces/UIAdapterInterfaces.csproj b/Src/Common/UIAdapterInterfaces/UIAdapterInterfaces.csproj index 55abd039b7..b501f2fe68 100644 --- a/Src/Common/UIAdapterInterfaces/UIAdapterInterfaces.csproj +++ b/Src/Common/UIAdapterInterfaces/UIAdapterInterfaces.csproj @@ -28,7 +28,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true diff --git a/Src/Common/ViewsInterfaces/ViewsInterfaces.csproj b/Src/Common/ViewsInterfaces/ViewsInterfaces.csproj index 4eb98c1fc5..08950c968c 100644 --- a/Src/Common/ViewsInterfaces/ViewsInterfaces.csproj +++ b/Src/Common/ViewsInterfaces/ViewsInterfaces.csproj @@ -25,7 +25,7 @@ 3.5 false - v4.6.1 + v4.6.2 publish\ true Disk diff --git a/Src/Common/ViewsInterfaces/ViewsInterfacesTests/ViewsInterfacesTests.csproj b/Src/Common/ViewsInterfaces/ViewsInterfacesTests/ViewsInterfacesTests.csproj index a24bb234f5..2ace425677 100644 --- a/Src/Common/ViewsInterfaces/ViewsInterfacesTests/ViewsInterfacesTests.csproj +++ b/Src/Common/ViewsInterfaces/ViewsInterfacesTests/ViewsInterfacesTests.csproj @@ -25,7 +25,7 @@ false - v4.6.1 + v4.6.2 publish\ true diff --git a/Src/Directory.Build.targets b/Src/Directory.Build.targets index e5818ac21a..e1e3ebdd37 100644 --- a/Src/Directory.Build.targets +++ b/Src/Directory.Build.targets @@ -1,7 +1,7 @@ - + \ No newline at end of file diff --git a/Src/FXT/FxtDll/FxtDll.csproj b/Src/FXT/FxtDll/FxtDll.csproj index 6e7607e40a..adb8e6ac5e 100644 --- a/Src/FXT/FxtDll/FxtDll.csproj +++ b/Src/FXT/FxtDll/FxtDll.csproj @@ -37,7 +37,7 @@ false false true - v4.6.1 + v4.6.2 diff --git a/Src/FXT/FxtDll/FxtDllTests/FxtDllTests.csproj b/Src/FXT/FxtDll/FxtDllTests/FxtDllTests.csproj index a3ee153730..53637268f0 100644 --- a/Src/FXT/FxtDll/FxtDllTests/FxtDllTests.csproj +++ b/Src/FXT/FxtDll/FxtDllTests/FxtDllTests.csproj @@ -31,7 +31,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true diff --git a/Src/FXT/FxtExe/FxtExe.csproj b/Src/FXT/FxtExe/FxtExe.csproj index 672148d3e0..4525b50fba 100644 --- a/Src/FXT/FxtExe/FxtExe.csproj +++ b/Src/FXT/FxtExe/FxtExe.csproj @@ -26,7 +26,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true diff --git a/Src/FdoUi/FdoUi.csproj b/Src/FdoUi/FdoUi.csproj index 1a79989466..c8002d3ca8 100644 --- a/Src/FdoUi/FdoUi.csproj +++ b/Src/FdoUi/FdoUi.csproj @@ -36,7 +36,7 @@ 3.5 - v4.6.1 + v4.6.2 false publish\ true diff --git a/Src/FdoUi/FdoUiTests/FdoUiTests.csproj b/Src/FdoUi/FdoUiTests/FdoUiTests.csproj index 3e2785512f..3ba46e98da 100644 --- a/Src/FdoUi/FdoUiTests/FdoUiTests.csproj +++ b/Src/FdoUi/FdoUiTests/FdoUiTests.csproj @@ -1,4 +1,4 @@ - + Debug @@ -16,7 +16,7 @@ 3.5 - v4.6.1 + v4.6.2 false publish\ true @@ -87,6 +87,7 @@ AnyCPU + False diff --git a/Src/FwCoreDlgs/FwCoreDlgControls/FwCoreDlgControls.csproj b/Src/FwCoreDlgs/FwCoreDlgControls/FwCoreDlgControls.csproj index 3dba682157..85fddc20fb 100644 --- a/Src/FwCoreDlgs/FwCoreDlgControls/FwCoreDlgControls.csproj +++ b/Src/FwCoreDlgs/FwCoreDlgControls/FwCoreDlgControls.csproj @@ -36,7 +36,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true Disk diff --git a/Src/FwCoreDlgs/FwCoreDlgControls/FwCoreDlgControlsTests/FwCoreDlgControlsTests.csproj b/Src/FwCoreDlgs/FwCoreDlgControls/FwCoreDlgControlsTests/FwCoreDlgControlsTests.csproj index 02d7f92c1d..67cd96c4e0 100644 --- a/Src/FwCoreDlgs/FwCoreDlgControls/FwCoreDlgControlsTests/FwCoreDlgControlsTests.csproj +++ b/Src/FwCoreDlgs/FwCoreDlgControls/FwCoreDlgControlsTests/FwCoreDlgControlsTests.csproj @@ -37,7 +37,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true diff --git a/Src/FwCoreDlgs/FwCoreDlgs.csproj b/Src/FwCoreDlgs/FwCoreDlgs.csproj index 55a4426a03..c6b6a9df28 100644 --- a/Src/FwCoreDlgs/FwCoreDlgs.csproj +++ b/Src/FwCoreDlgs/FwCoreDlgs.csproj @@ -1,4 +1,4 @@ - + Local @@ -22,7 +22,7 @@ SIL.FieldWorks.FwCoreDlgs OnBuildSuccess 3.5 - v4.6.1 + v4.6.2 publish\ true Disk @@ -135,6 +135,7 @@ AnyCPU + False ..\..\Output\Debug\SIL.Core.Desktop.dll @@ -148,9 +149,6 @@ ..\..\Output\Debug\SIL.Windows.Forms.WritingSystems.dll - - ..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll - ViewsInterfaces False @@ -813,8 +811,4 @@ ../../DistFiles - - - - \ No newline at end of file diff --git a/Src/FwCoreDlgs/FwCoreDlgsTests/FwCoreDlgsTests.csproj b/Src/FwCoreDlgs/FwCoreDlgsTests/FwCoreDlgsTests.csproj index e73f014a9f..45d2c1a2b2 100644 --- a/Src/FwCoreDlgs/FwCoreDlgsTests/FwCoreDlgsTests.csproj +++ b/Src/FwCoreDlgs/FwCoreDlgsTests/FwCoreDlgsTests.csproj @@ -30,7 +30,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true Disk @@ -165,9 +165,6 @@ ..\..\..\Output\Debug\SIL.WritingSystems.Tests.dll - - ..\..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll - ViewsInterfaces diff --git a/Src/FwParatextLexiconPlugin/FwParatextLexiconPlugin.csproj b/Src/FwParatextLexiconPlugin/FwParatextLexiconPlugin.csproj index c3993d0f24..29884605f6 100644 --- a/Src/FwParatextLexiconPlugin/FwParatextLexiconPlugin.csproj +++ b/Src/FwParatextLexiconPlugin/FwParatextLexiconPlugin.csproj @@ -10,7 +10,7 @@ Properties SIL.FieldWorks.ParatextLexiconPlugin FwParatextLexiconPlugin - v4.6.1 + v4.6.2 512 @@ -84,10 +84,7 @@ ..\..\Output\Debug\ParserCore.dll - - False - ..\..\packages\NETStandard.Library.NETFramework.2.0.0-preview2-25405-01\build\net461\lib\netstandard.dll - + False ..\..\Output\Debug\SIL.Core.dll @@ -95,10 +92,6 @@ ..\..\Lib\debug\SIL.Machine.dll - - False - ..\..\packages\NETStandard.Library.NETFramework.2.0.0-preview2-25405-01\build\net461\lib\netstandard.dll - False ..\..\Output\Debug\SIL.WritingSystems.dll @@ -111,9 +104,6 @@ - - ..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll - diff --git a/Src/FwParatextLexiconPlugin/FwParatextLexiconPluginTests/FwParatextLexiconPluginTests.csproj b/Src/FwParatextLexiconPlugin/FwParatextLexiconPluginTests/FwParatextLexiconPluginTests.csproj index dd85635d06..36c14c8a57 100644 --- a/Src/FwParatextLexiconPlugin/FwParatextLexiconPluginTests/FwParatextLexiconPluginTests.csproj +++ b/Src/FwParatextLexiconPlugin/FwParatextLexiconPluginTests/FwParatextLexiconPluginTests.csproj @@ -11,7 +11,7 @@ ..\..\AppForTests.config SIL.FieldWorks.ParatextLexiconPlugin FwParatextLexiconPluginTests - v4.6.1 + v4.6.2 512 diff --git a/Src/FwResources/FwResources.csproj b/Src/FwResources/FwResources.csproj index 2427704c03..11a06b4591 100644 --- a/Src/FwResources/FwResources.csproj +++ b/Src/FwResources/FwResources.csproj @@ -22,7 +22,7 @@ SIL.FieldWorks.Resources OnBuildSuccess 3.5 - v4.6.1 + v4.6.2 publish\ true Disk diff --git a/Src/GenerateHCConfig/GenerateHCConfig.csproj b/Src/GenerateHCConfig/GenerateHCConfig.csproj index af9671e403..1c911e3143 100644 --- a/Src/GenerateHCConfig/GenerateHCConfig.csproj +++ b/Src/GenerateHCConfig/GenerateHCConfig.csproj @@ -9,7 +9,7 @@ Properties GenerateHCConfig GenerateHCConfig - v4.6.1 + v4.6.2 512 @@ -84,10 +84,7 @@ ..\..\Output\Debug\SIL.Machine.dll - - False - ..\..\packages\NETStandard.Library.NETFramework.2.0.0-preview2-25405-01\build\net461\lib\netstandard.dll - + False ..\..\Output\Debug\SIL.WritingSystems.dll diff --git a/Src/InstallValidator/InstallValidator.csproj b/Src/InstallValidator/InstallValidator.csproj index 6f26252423..ab307c905b 100644 --- a/Src/InstallValidator/InstallValidator.csproj +++ b/Src/InstallValidator/InstallValidator.csproj @@ -8,7 +8,7 @@ Exe SIL.InstallValidator InstallValidator - v4.6.1 + v4.6.2 512 true publish\ diff --git a/Src/InstallValidator/InstallValidatorTests/InstallValidatorTests.csproj b/Src/InstallValidator/InstallValidatorTests/InstallValidatorTests.csproj index 381492a1d1..39f999c547 100644 --- a/Src/InstallValidator/InstallValidatorTests/InstallValidatorTests.csproj +++ b/Src/InstallValidator/InstallValidatorTests/InstallValidatorTests.csproj @@ -6,7 +6,7 @@ Library SIL.InstallValidator InstallValidatorTests - v4.6.1 + v4.6.2 3.5 diff --git a/Src/LCMBrowser/App.config b/Src/LCMBrowser/App.config index 1a03c9a711..beaf78bc09 100644 --- a/Src/LCMBrowser/App.config +++ b/Src/LCMBrowser/App.config @@ -2,6 +2,10 @@ + + + + diff --git a/Src/LCMBrowser/LCMBrowser.csproj b/Src/LCMBrowser/LCMBrowser.csproj index 113a5c521a..a78c941e1c 100644 --- a/Src/LCMBrowser/LCMBrowser.csproj +++ b/Src/LCMBrowser/LCMBrowser.csproj @@ -15,7 +15,7 @@ 3.5 - v4.6.1 + v4.6.2 false true publish\ diff --git a/Src/LexText/Discourse/Discourse.csproj b/Src/LexText/Discourse/Discourse.csproj index 38d622fa83..8987812951 100644 --- a/Src/LexText/Discourse/Discourse.csproj +++ b/Src/LexText/Discourse/Discourse.csproj @@ -13,7 +13,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ @@ -145,10 +145,7 @@ False - - False - ..\..\packages\NETStandard.Library.NETFramework.2.0.0-preview2-25405-01\build\net461\lib\netstandard.dll - + False ..\..\..\Output\Debug\RootSite.dll diff --git a/Src/LexText/Discourse/DiscourseTests/DiscourseTests.csproj b/Src/LexText/Discourse/DiscourseTests/DiscourseTests.csproj index a2bd5a459a..16ddccd96b 100644 --- a/Src/LexText/Discourse/DiscourseTests/DiscourseTests.csproj +++ b/Src/LexText/Discourse/DiscourseTests/DiscourseTests.csproj @@ -17,7 +17,7 @@ false - v4.6.1 + v4.6.2 publish\ true Disk @@ -83,6 +83,7 @@ AnyCPU + False ..\..\..\..\Output\Debug\FwCoreDlgControls.dll diff --git a/Src/LexText/FlexPathwayPlugin/FlexPathwayPlugin.csproj b/Src/LexText/FlexPathwayPlugin/FlexPathwayPlugin.csproj index a3f617f9b4..f019a1b8c8 100644 --- a/Src/LexText/FlexPathwayPlugin/FlexPathwayPlugin.csproj +++ b/Src/LexText/FlexPathwayPlugin/FlexPathwayPlugin.csproj @@ -15,7 +15,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true diff --git a/Src/LexText/FlexPathwayPlugin/FlexPathwayPluginTests/FlexPathwayPluginTests.csproj b/Src/LexText/FlexPathwayPlugin/FlexPathwayPluginTests/FlexPathwayPluginTests.csproj index b20c9fb36e..27343b8707 100644 --- a/Src/LexText/FlexPathwayPlugin/FlexPathwayPluginTests/FlexPathwayPluginTests.csproj +++ b/Src/LexText/FlexPathwayPlugin/FlexPathwayPluginTests/FlexPathwayPluginTests.csproj @@ -10,7 +10,7 @@ . FlexPathwayPluginTests FlexPathwayPluginTests - v4.6.1 + v4.6.2 ..\..\..\AppForTests.config 512 diff --git a/Src/LexText/Interlinear/ITextDll.csproj b/Src/LexText/Interlinear/ITextDll.csproj index 4419f3b7c2..ee00d22841 100644 --- a/Src/LexText/Interlinear/ITextDll.csproj +++ b/Src/LexText/Interlinear/ITextDll.csproj @@ -30,7 +30,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true @@ -212,10 +212,7 @@ False ..\..\..\Output\Debug\CommonServiceLocator.dll - - False - ..\..\packages\NETStandard.Library.NETFramework.2.0.0-preview2-25405-01\build\net461\lib\netstandard.dll - + False ..\..\..\Output\Debug\ParatextShared.dll @@ -239,10 +236,6 @@ False ..\..\..\Output\Debug\SIL.Machine.dll - - False - ..\..\..\packages\NETStandard.Library.NETFramework.2.0.0-preview2-25405-01\build\net461\lib\netstandard.dll - False ..\..\..\Output\Debug\SIL.WritingSystems.dll diff --git a/Src/LexText/Interlinear/ITextDllTests/ITextDllTests.csproj b/Src/LexText/Interlinear/ITextDllTests/ITextDllTests.csproj index aaf8b2f95c..a3c6544332 100644 --- a/Src/LexText/Interlinear/ITextDllTests/ITextDllTests.csproj +++ b/Src/LexText/Interlinear/ITextDllTests/ITextDllTests.csproj @@ -31,7 +31,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true diff --git a/Src/LexText/LexTextControls/LexTextControls.csproj b/Src/LexText/LexTextControls/LexTextControls.csproj index 91ff38a699..ea6c7ff23a 100644 --- a/Src/LexText/LexTextControls/LexTextControls.csproj +++ b/Src/LexText/LexTextControls/LexTextControls.csproj @@ -33,7 +33,7 @@ 3.5 false - v4.6.1 + v4.6.2 publish\ true Disk diff --git a/Src/LexText/LexTextControls/LexTextControlsTests/LexTextControlsTests.csproj b/Src/LexText/LexTextControls/LexTextControlsTests/LexTextControlsTests.csproj index 92f2e647d1..da7f71e2bb 100644 --- a/Src/LexText/LexTextControls/LexTextControlsTests/LexTextControlsTests.csproj +++ b/Src/LexText/LexTextControls/LexTextControlsTests/LexTextControlsTests.csproj @@ -29,7 +29,7 @@ 3.5 - v4.6.1 + v4.6.2 diff --git a/Src/LexText/LexTextDll/LexTextDll.csproj b/Src/LexText/LexTextDll/LexTextDll.csproj index cda4f12bf7..7ede07e36a 100644 --- a/Src/LexText/LexTextDll/LexTextDll.csproj +++ b/Src/LexText/LexTextDll/LexTextDll.csproj @@ -35,7 +35,7 @@ 3.5 - v4.6.1 + v4.6.2 diff --git a/Src/LexText/LexTextDll/LexTextDllTests/LexTextDllTests.csproj b/Src/LexText/LexTextDll/LexTextDllTests/LexTextDllTests.csproj index b75a7fc19a..78c0ef6b34 100644 --- a/Src/LexText/LexTextDll/LexTextDllTests/LexTextDllTests.csproj +++ b/Src/LexText/LexTextDll/LexTextDllTests/LexTextDllTests.csproj @@ -21,7 +21,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true diff --git a/Src/LexText/LexTextExe/LexTextExe.csproj b/Src/LexText/LexTextExe/LexTextExe.csproj index c289add89d..33576221ab 100644 --- a/Src/LexText/LexTextExe/LexTextExe.csproj +++ b/Src/LexText/LexTextExe/LexTextExe.csproj @@ -27,7 +27,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true Disk diff --git a/Src/LexText/Lexicon/LexEdDll.csproj b/Src/LexText/Lexicon/LexEdDll.csproj index 94e6004ec9..f21807b6e0 100644 --- a/Src/LexText/Lexicon/LexEdDll.csproj +++ b/Src/LexText/Lexicon/LexEdDll.csproj @@ -44,7 +44,7 @@ 1.0.0.%2a false true - v4.6.1 + v4.6.2 diff --git a/Src/LexText/Lexicon/LexEdDllTests/LexEdDllTests.csproj b/Src/LexText/Lexicon/LexEdDllTests/LexEdDllTests.csproj index b1f9c4c736..f2a36a47d5 100644 --- a/Src/LexText/Lexicon/LexEdDllTests/LexEdDllTests.csproj +++ b/Src/LexText/Lexicon/LexEdDllTests/LexEdDllTests.csproj @@ -11,7 +11,7 @@ ..\..\..\AppForTests.config LexEdDllTests LexEdDllTests - v4.6.1 + v4.6.2 512 diff --git a/Src/LexText/Morphology/MGA/MGA.csproj b/Src/LexText/Morphology/MGA/MGA.csproj index 7ff7d1a28e..c565a0314e 100644 --- a/Src/LexText/Morphology/MGA/MGA.csproj +++ b/Src/LexText/Morphology/MGA/MGA.csproj @@ -29,7 +29,7 @@ 3.5 false - v4.6.1 + v4.6.2 publish\ true diff --git a/Src/LexText/Morphology/MGA/MGATests/MGATests.csproj b/Src/LexText/Morphology/MGA/MGATests/MGATests.csproj index aa1a4c366b..8b84a2a542 100644 --- a/Src/LexText/Morphology/MGA/MGATests/MGATests.csproj +++ b/Src/LexText/Morphology/MGA/MGATests/MGATests.csproj @@ -29,7 +29,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true diff --git a/Src/LexText/Morphology/MorphologyEditorDll.csproj b/Src/LexText/Morphology/MorphologyEditorDll.csproj index 2e8566083b..06b61c9f28 100644 --- a/Src/LexText/Morphology/MorphologyEditorDll.csproj +++ b/Src/LexText/Morphology/MorphologyEditorDll.csproj @@ -36,7 +36,7 @@ 3.5 false - v4.6.1 + v4.6.2 publish\ true Disk diff --git a/Src/LexText/Morphology/MorphologyEditorDllTests/MorphologyEditorDllTests.csproj b/Src/LexText/Morphology/MorphologyEditorDllTests/MorphologyEditorDllTests.csproj index bb806dbaf1..e8fbcb52d2 100644 --- a/Src/LexText/Morphology/MorphologyEditorDllTests/MorphologyEditorDllTests.csproj +++ b/Src/LexText/Morphology/MorphologyEditorDllTests/MorphologyEditorDllTests.csproj @@ -16,7 +16,7 @@ 3.5 - v4.6.1 + v4.6.2 @@ -66,6 +66,7 @@ AnyCPU + False diff --git a/Src/LexText/ParserCore/ParserCore.csproj b/Src/LexText/ParserCore/ParserCore.csproj index 0b6e2ce709..1bc480b310 100644 --- a/Src/LexText/ParserCore/ParserCore.csproj +++ b/Src/LexText/ParserCore/ParserCore.csproj @@ -28,7 +28,7 @@ 3.5 - v4.6.1 + v4.6.2 @@ -206,14 +206,7 @@ False ..\..\..\Output\Debug\SIL.Machine.dll - - False - ..\..\..\packages\NETStandard.Library.NETFramework.2.0.0-preview2-25405-01\build\net461\lib\netstandard.dll - - - False - ..\..\..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll - + False ..\..\..\Output\Debug\SIL.WritingSystems.dll diff --git a/Src/LexText/ParserCore/ParserCoreTests/ParserCoreTests.csproj b/Src/LexText/ParserCore/ParserCoreTests/ParserCoreTests.csproj index 2a0aab15f3..b1176cc07d 100644 --- a/Src/LexText/ParserCore/ParserCoreTests/ParserCoreTests.csproj +++ b/Src/LexText/ParserCore/ParserCoreTests/ParserCoreTests.csproj @@ -29,7 +29,7 @@ 3.5 - v4.6.1 + v4.6.2 @@ -172,10 +172,7 @@ False ..\..\..\..\Output\Debug\SIL.Machine.dll - - False - ..\..\..\..\packages\NETStandard.Library.NETFramework.2.0.0-preview2-25405-01\build\net461\lib\netstandard.dll - + False ..\..\..\..\Output\Debug\SIL.TestUtilities.dll diff --git a/Src/LexText/ParserCore/XAmpleManagedWrapper/XAmpleManagedWrapper.csproj b/Src/LexText/ParserCore/XAmpleManagedWrapper/XAmpleManagedWrapper.csproj index feb6b547dd..156af0a47b 100644 --- a/Src/LexText/ParserCore/XAmpleManagedWrapper/XAmpleManagedWrapper.csproj +++ b/Src/LexText/ParserCore/XAmpleManagedWrapper/XAmpleManagedWrapper.csproj @@ -9,7 +9,7 @@ Library XAmpleManagedWrapper XAmpleManagedWrapper - v4.6.1 + v4.6.2 3.5 diff --git a/Src/LexText/ParserCore/XAmpleManagedWrapper/XAmpleManagedWrapperTests/XAmpleManagedWrapperTests.csproj b/Src/LexText/ParserCore/XAmpleManagedWrapper/XAmpleManagedWrapperTests/XAmpleManagedWrapperTests.csproj index 8b1f0e3bfe..51838d5af2 100644 --- a/Src/LexText/ParserCore/XAmpleManagedWrapper/XAmpleManagedWrapperTests/XAmpleManagedWrapperTests.csproj +++ b/Src/LexText/ParserCore/XAmpleManagedWrapper/XAmpleManagedWrapperTests/XAmpleManagedWrapperTests.csproj @@ -9,7 +9,7 @@ Library XAmpleManagedWrapperTests XAmpleManagedWrapperTests - v4.6.1 + v4.6.2 ..\..\..\..\AppForTests.config diff --git a/Src/LexText/ParserUI/ParserUI.csproj b/Src/LexText/ParserUI/ParserUI.csproj index d77a354945..a7d1392461 100644 --- a/Src/LexText/ParserUI/ParserUI.csproj +++ b/Src/LexText/ParserUI/ParserUI.csproj @@ -43,7 +43,7 @@ false false true - v4.6.1 + v4.6.2 diff --git a/Src/LexText/ParserUI/ParserUITests/ParserUITests.csproj b/Src/LexText/ParserUI/ParserUITests/ParserUITests.csproj index f15e93947f..b532561d38 100644 --- a/Src/LexText/ParserUI/ParserUITests/ParserUITests.csproj +++ b/Src/LexText/ParserUI/ParserUITests/ParserUITests.csproj @@ -29,7 +29,7 @@ 3.5 - v4.6.1 + v4.6.2 diff --git a/Src/ManagedLgIcuCollator/ManagedLgIcuCollator.csproj b/Src/ManagedLgIcuCollator/ManagedLgIcuCollator.csproj index 3e6dc04e63..e49cb361b1 100644 --- a/Src/ManagedLgIcuCollator/ManagedLgIcuCollator.csproj +++ b/Src/ManagedLgIcuCollator/ManagedLgIcuCollator.csproj @@ -9,7 +9,7 @@ Library ManagedLgIcuCollator ManagedLgIcuCollator - v4.6.1 + v4.6.2 3.5 diff --git a/Src/ManagedLgIcuCollator/ManagedLgIcuCollatorTests/ManagedLgIcuCollatorTests.csproj b/Src/ManagedLgIcuCollator/ManagedLgIcuCollatorTests/ManagedLgIcuCollatorTests.csproj index b26b4f2531..5ec3a863a1 100644 --- a/Src/ManagedLgIcuCollator/ManagedLgIcuCollatorTests/ManagedLgIcuCollatorTests.csproj +++ b/Src/ManagedLgIcuCollator/ManagedLgIcuCollatorTests/ManagedLgIcuCollatorTests.csproj @@ -9,7 +9,7 @@ Library SIL.FieldWorks.Language ManagedLgIcuCollatorTests - v4.6.1 + v4.6.2 ..\..\AppForTests.config diff --git a/Src/ManagedVwDrawRootBuffered/ManagedVwDrawRootBuffered.csproj b/Src/ManagedVwDrawRootBuffered/ManagedVwDrawRootBuffered.csproj index c6c6130af4..11ab04dd6a 100644 --- a/Src/ManagedVwDrawRootBuffered/ManagedVwDrawRootBuffered.csproj +++ b/Src/ManagedVwDrawRootBuffered/ManagedVwDrawRootBuffered.csproj @@ -14,7 +14,7 @@ false - v4.6.1 + v4.6.2 publish\ true diff --git a/Src/ManagedVwWindow/ManagedVwWindow.csproj b/Src/ManagedVwWindow/ManagedVwWindow.csproj index 8f26f67ca9..6d414a3fbd 100644 --- a/Src/ManagedVwWindow/ManagedVwWindow.csproj +++ b/Src/ManagedVwWindow/ManagedVwWindow.csproj @@ -14,7 +14,7 @@ false - v4.6.1 + v4.6.2 publish\ true diff --git a/Src/ManagedVwWindow/ManagedVwWindowTests/ManagedVwWindowTests.csproj b/Src/ManagedVwWindow/ManagedVwWindowTests/ManagedVwWindowTests.csproj index 6c5d28049e..7bfccfade0 100644 --- a/Src/ManagedVwWindow/ManagedVwWindowTests/ManagedVwWindowTests.csproj +++ b/Src/ManagedVwWindow/ManagedVwWindowTests/ManagedVwWindowTests.csproj @@ -9,7 +9,7 @@ Library SIL.FieldWorks.Language ManagedVwWindowTests - v4.6.1 + v4.6.2 ..\..\AppForTests.config diff --git a/Src/MigrateSqlDbs/MigrateSqlDbs.csproj b/Src/MigrateSqlDbs/MigrateSqlDbs.csproj index 9e907c8e45..2dfd1b0e8c 100644 --- a/Src/MigrateSqlDbs/MigrateSqlDbs.csproj +++ b/Src/MigrateSqlDbs/MigrateSqlDbs.csproj @@ -16,7 +16,7 @@ false - v4.6.1 + v4.6.2 publish\ diff --git a/Src/Paratext8Plugin/ParaText8PluginTests/App.config b/Src/Paratext8Plugin/ParaText8PluginTests/App.config index e2c18182de..2b0d93765b 100644 --- a/Src/Paratext8Plugin/ParaText8PluginTests/App.config +++ b/Src/Paratext8Plugin/ParaText8PluginTests/App.config @@ -22,19 +22,19 @@ Also, comment out separate items in mkall.targets and packages.config - + - + - + diff --git a/Src/Paratext8Plugin/ParaText8PluginTests/Paratext8PluginTests.csproj b/Src/Paratext8Plugin/ParaText8PluginTests/Paratext8PluginTests.csproj index 8ce18e1788..ff181c0a99 100644 --- a/Src/Paratext8Plugin/ParaText8PluginTests/Paratext8PluginTests.csproj +++ b/Src/Paratext8Plugin/ParaText8PluginTests/Paratext8PluginTests.csproj @@ -9,7 +9,7 @@ Properties Paratext8PluginTests Paratext8PluginTests - v4.6.1 + v4.6.2 512 @@ -88,16 +88,10 @@ False ..\..\..\Output\Debug\SIL.TestUtilities.dll - - False - ..\..\..\packages\NETStandard.Library.NETFramework.2.0.0-preview2-25405-01\build\net461\lib\netstandard.dll - + - - ..\..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll - diff --git a/Src/Paratext8Plugin/Paratext8Plugin.csproj b/Src/Paratext8Plugin/Paratext8Plugin.csproj index a5788bc339..bc8e0238e7 100644 --- a/Src/Paratext8Plugin/Paratext8Plugin.csproj +++ b/Src/Paratext8Plugin/Paratext8Plugin.csproj @@ -9,7 +9,7 @@ Properties Paratext8Plugin Paratext8Plugin - v4.6.1 + v4.6.2 512 @@ -60,10 +60,7 @@ true - - False - ..\..\packages\NETStandard.Library.NETFramework.2.0.0-preview2-25405-01\build\net461\lib\netstandard.dll - + False ..\..\Output\Debug\Paratext.LexicalContracts.dll diff --git a/Src/ParatextImport/ParatextImport.csproj b/Src/ParatextImport/ParatextImport.csproj index 9b9c49d114..9025759ba9 100644 --- a/Src/ParatextImport/ParatextImport.csproj +++ b/Src/ParatextImport/ParatextImport.csproj @@ -10,7 +10,7 @@ Properties ParatextImport ParatextImport - v4.6.1 + v4.6.2 512 diff --git a/Src/ParatextImport/ParatextImportTests/ParatextImportTests.csproj b/Src/ParatextImport/ParatextImportTests/ParatextImportTests.csproj index 98b24f0cc0..a547345e61 100644 --- a/Src/ParatextImport/ParatextImportTests/ParatextImportTests.csproj +++ b/Src/ParatextImport/ParatextImportTests/ParatextImportTests.csproj @@ -10,7 +10,7 @@ Properties ParatextImport ParatextImportTests - v4.6.1 + v4.6.2 ..\..\AppForTests.config 512 diff --git a/Src/ProjectUnpacker/ProjectUnpacker.csproj b/Src/ProjectUnpacker/ProjectUnpacker.csproj index f3cf6a8159..f2fc474a80 100644 --- a/Src/ProjectUnpacker/ProjectUnpacker.csproj +++ b/Src/ProjectUnpacker/ProjectUnpacker.csproj @@ -28,7 +28,7 @@ 3.5 - v4.6.1 + v4.6.2 false publish\ true @@ -153,10 +153,7 @@ ICSharpCode.SharpZipLib ..\..\Lib\debug\ICSharpCode.SharpZipLib.dll - - False - ..\..\packages\NETStandard.Library.NETFramework.2.0.0-preview2-25405-01\build\net461\lib\netstandard.dll - + False ..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll diff --git a/Src/UnicodeCharEditor/UnicodeCharEditor.csproj b/Src/UnicodeCharEditor/UnicodeCharEditor.csproj index a3f4d228b4..e87acc191f 100644 --- a/Src/UnicodeCharEditor/UnicodeCharEditor.csproj +++ b/Src/UnicodeCharEditor/UnicodeCharEditor.csproj @@ -12,7 +12,7 @@ UnicodeCharEditor 3.5 false - v4.6.1 + v4.6.2 publish\ true Disk diff --git a/Src/UnicodeCharEditor/UnicodeCharEditorTests/UnicodeCharEditorTests.csproj b/Src/UnicodeCharEditor/UnicodeCharEditorTests/UnicodeCharEditorTests.csproj index 1f08e0db52..3d58f73101 100644 --- a/Src/UnicodeCharEditor/UnicodeCharEditorTests/UnicodeCharEditorTests.csproj +++ b/Src/UnicodeCharEditor/UnicodeCharEditorTests/UnicodeCharEditorTests.csproj @@ -17,7 +17,7 @@ false - v4.6.1 + v4.6.2 publish\ true @@ -114,10 +114,7 @@ False ..\..\..\Lib\debug\ICSharpCode.SharpZipLib.dll - - False - ..\..\packages\NETStandard.Library.NETFramework.2.0.0-preview2-25405-01\build\net461\lib\netstandard.dll - + False ..\..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll diff --git a/Src/Utilities/FixFwData/FixFwData.csproj b/Src/Utilities/FixFwData/FixFwData.csproj index a10b9b614e..6b56139be2 100644 --- a/Src/Utilities/FixFwData/FixFwData.csproj +++ b/Src/Utilities/FixFwData/FixFwData.csproj @@ -10,7 +10,7 @@ Properties FixFwData FixFwData - v4.6.1 + v4.6.2 512 diff --git a/Src/Utilities/FixFwDataDll/FixFwDataDll.csproj b/Src/Utilities/FixFwDataDll/FixFwDataDll.csproj index d7a9bc403c..44eb7b88e8 100644 --- a/Src/Utilities/FixFwDataDll/FixFwDataDll.csproj +++ b/Src/Utilities/FixFwDataDll/FixFwDataDll.csproj @@ -10,7 +10,7 @@ Properties SIL.FieldWorks.FixData FixFwDataDll - v4.6.1 + v4.6.2 512 diff --git a/Src/Utilities/MessageBoxExLib/MessageBoxExLib.csproj b/Src/Utilities/MessageBoxExLib/MessageBoxExLib.csproj index b13b954fb2..484160fa9d 100644 --- a/Src/Utilities/MessageBoxExLib/MessageBoxExLib.csproj +++ b/Src/Utilities/MessageBoxExLib/MessageBoxExLib.csproj @@ -20,7 +20,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true diff --git a/Src/Utilities/MessageBoxExLib/MessageBoxExLibTests/MessageBoxExLibTests.csproj b/Src/Utilities/MessageBoxExLib/MessageBoxExLibTests/MessageBoxExLibTests.csproj index 66bb169e25..8b15b08dd0 100644 --- a/Src/Utilities/MessageBoxExLib/MessageBoxExLibTests/MessageBoxExLibTests.csproj +++ b/Src/Utilities/MessageBoxExLib/MessageBoxExLibTests/MessageBoxExLibTests.csproj @@ -31,7 +31,7 @@ 4.0 - v4.6.1 + v4.6.2 publish\ true diff --git a/Src/Utilities/Reporting/Reporting.csproj b/Src/Utilities/Reporting/Reporting.csproj index a1e90fde55..68b9f075a9 100644 --- a/Src/Utilities/Reporting/Reporting.csproj +++ b/Src/Utilities/Reporting/Reporting.csproj @@ -28,7 +28,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true diff --git a/Src/Utilities/SfmStats/SfmStats.csproj b/Src/Utilities/SfmStats/SfmStats.csproj index 8c2d8ca618..daa895c904 100644 --- a/Src/Utilities/SfmStats/SfmStats.csproj +++ b/Src/Utilities/SfmStats/SfmStats.csproj @@ -15,7 +15,7 @@ 3.5 - v4.6.1 + v4.6.2 false publish\ diff --git a/Src/Utilities/SfmToXml/ConvertSFM/ConvertSFM.csproj b/Src/Utilities/SfmToXml/ConvertSFM/ConvertSFM.csproj index 186982ec0e..9cd483c80e 100644 --- a/Src/Utilities/SfmToXml/ConvertSFM/ConvertSFM.csproj +++ b/Src/Utilities/SfmToXml/ConvertSFM/ConvertSFM.csproj @@ -27,7 +27,7 @@ 3.5 - v4.6.1 + v4.6.2 false publish\ diff --git a/Src/Utilities/SfmToXml/Sfm2Xml.csproj b/Src/Utilities/SfmToXml/Sfm2Xml.csproj index 975f1cab97..2d25be3399 100644 --- a/Src/Utilities/SfmToXml/Sfm2Xml.csproj +++ b/Src/Utilities/SfmToXml/Sfm2Xml.csproj @@ -27,7 +27,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true diff --git a/Src/Utilities/SfmToXml/Sfm2XmlTests/Sfm2XmlTests.csproj b/Src/Utilities/SfmToXml/Sfm2XmlTests/Sfm2XmlTests.csproj index 50f1bd44e5..0ceaae7feb 100644 --- a/Src/Utilities/SfmToXml/Sfm2XmlTests/Sfm2XmlTests.csproj +++ b/Src/Utilities/SfmToXml/Sfm2XmlTests/Sfm2XmlTests.csproj @@ -8,7 +8,7 @@ Properties Sfm2XmlTests Sfm2XmlTests - v4.6.1 + v4.6.2 ..\..\..\AppForTests.config 512 diff --git a/Src/Utilities/XMLUtils/XMLUtils.csproj b/Src/Utilities/XMLUtils/XMLUtils.csproj index 42a3022233..ea27f64a00 100644 --- a/Src/Utilities/XMLUtils/XMLUtils.csproj +++ b/Src/Utilities/XMLUtils/XMLUtils.csproj @@ -35,7 +35,7 @@ false false true - v4.6.1 + v4.6.2 diff --git a/Src/Utilities/XMLUtils/XMLUtilsTests/XMLUtilsTests.csproj b/Src/Utilities/XMLUtils/XMLUtilsTests/XMLUtilsTests.csproj index 4543dc8839..f59f4962df 100644 --- a/Src/Utilities/XMLUtils/XMLUtilsTests/XMLUtilsTests.csproj +++ b/Src/Utilities/XMLUtils/XMLUtilsTests/XMLUtilsTests.csproj @@ -31,7 +31,7 @@ 3.5 - v4.6.1 + v4.6.2 publish\ true diff --git a/Src/XCore/FlexUIAdapter/FlexUIAdapter.csproj b/Src/XCore/FlexUIAdapter/FlexUIAdapter.csproj index 3aae65067b..dd86f4acf3 100644 --- a/Src/XCore/FlexUIAdapter/FlexUIAdapter.csproj +++ b/Src/XCore/FlexUIAdapter/FlexUIAdapter.csproj @@ -29,7 +29,7 @@ 3.5 false - v4.6.1 + v4.6.2 publish\ true diff --git a/Src/XCore/SilSidePane/SilSidePane.csproj b/Src/XCore/SilSidePane/SilSidePane.csproj index cb7f8efb33..3c02fbc70b 100644 --- a/Src/XCore/SilSidePane/SilSidePane.csproj +++ b/Src/XCore/SilSidePane/SilSidePane.csproj @@ -8,7 +8,7 @@ Properties SIL.SilSidePane SilSidePane - v4.6.1 + v4.6.2 512 diff --git a/Src/XCore/SilSidePane/SilSidePaneTests/SilSidePaneTests.csproj b/Src/XCore/SilSidePane/SilSidePaneTests/SilSidePaneTests.csproj index 9238e04ff3..5774121553 100644 --- a/Src/XCore/SilSidePane/SilSidePaneTests/SilSidePaneTests.csproj +++ b/Src/XCore/SilSidePane/SilSidePaneTests/SilSidePaneTests.csproj @@ -22,7 +22,7 @@ 3.5 - v4.6.1 + v4.6.2 ..\..\..\AppForTests.config publish\ diff --git a/Src/XCore/xCore.csproj b/Src/XCore/xCore.csproj index dfa465e773..132e90bedd 100644 --- a/Src/XCore/xCore.csproj +++ b/Src/XCore/xCore.csproj @@ -15,7 +15,7 @@ Library XCore Always - v4.6.1 + v4.6.2 3.5 false publish\ diff --git a/Src/XCore/xCoreInterfaces/xCoreInterfaces.csproj b/Src/XCore/xCoreInterfaces/xCoreInterfaces.csproj index 186b20a51c..31b3ff3383 100644 --- a/Src/XCore/xCoreInterfaces/xCoreInterfaces.csproj +++ b/Src/XCore/xCoreInterfaces/xCoreInterfaces.csproj @@ -33,7 +33,7 @@ - v4.6.1 + v4.6.2 3.5 diff --git a/Src/XCore/xCoreInterfaces/xCoreInterfacesTests/xCoreInterfacesTests.csproj b/Src/XCore/xCoreInterfaces/xCoreInterfacesTests/xCoreInterfacesTests.csproj index cec74dbe7c..d3aa033912 100644 --- a/Src/XCore/xCoreInterfaces/xCoreInterfacesTests/xCoreInterfacesTests.csproj +++ b/Src/XCore/xCoreInterfaces/xCoreInterfacesTests/xCoreInterfacesTests.csproj @@ -16,7 +16,7 @@ 3.5 - v4.6.1 + v4.6.2 false publish\ diff --git a/Src/XCore/xCoreTests/xCoreTests.csproj b/Src/XCore/xCoreTests/xCoreTests.csproj index e12b7213b7..96d02e2bf8 100644 --- a/Src/XCore/xCoreTests/xCoreTests.csproj +++ b/Src/XCore/xCoreTests/xCoreTests.csproj @@ -34,7 +34,7 @@ - v4.6.1 + v4.6.2 3.5 diff --git a/Src/views/lib/VwGraphicsReplayer/VwGraphicsReplayer.csproj b/Src/views/lib/VwGraphicsReplayer/VwGraphicsReplayer.csproj index 5c8db5dafd..1aa0e0d3c1 100644 --- a/Src/views/lib/VwGraphicsReplayer/VwGraphicsReplayer.csproj +++ b/Src/views/lib/VwGraphicsReplayer/VwGraphicsReplayer.csproj @@ -9,7 +9,7 @@ Exe VwGraphicsReplayer VwGraphicsReplayer - v4.6.1 + v4.6.2 3.5 diff --git a/Src/xWorks/Archiving/ReapRamp.cs b/Src/xWorks/Archiving/ReapRamp.cs index e3f6c60cf4..8bf3bff299 100644 --- a/Src/xWorks/Archiving/ReapRamp.cs +++ b/Src/xWorks/Archiving/ReapRamp.cs @@ -13,9 +13,11 @@ using SIL.FieldWorks.Common.Framework; using System.Collections.Generic; using System; +using System.Threading; using SIL.LCModel; using SIL.FieldWorks.Resources; using SIL.Reporting; +using SIL.Windows.Forms.Archiving; using SIL.Windows.Forms.PortableSettingsProvider; using XCore; using SIL.LCModel.Core.WritingSystems; @@ -36,6 +38,8 @@ class ReapRamp private DateTime m_earliest = DateTime.MaxValue; private DateTime m_latest = DateTime.MinValue; + private IEnumerable m_filesToArchive; + static ReapRamp() { var exePath = RampArchivingDlgViewModel.GetExeFileLocation(); @@ -66,8 +70,9 @@ public bool ArchiveNow(Form owner, Font dialogFont, Icon localizationDialogIcon, var title = cache.LanguageProject.ShortName; var uiLocale = wsMgr.Get(cache.DefaultUserWs).IcuLocale; var projectId = cache.LanguageProject.ShortName; + m_filesToArchive = filesToArchive; - var model = new RampArchivingDlgViewModel(Application.ProductName, title, projectId, /*appSpecificArchivalProcessInfo:*/ string.Empty, SetFilesToArchive(filesToArchive), GetFileDescription); + var model = new RampArchivingDlgViewModel(Application.ProductName, title, projectId, SetFilesToArchive, GetFileDescription); // image files should be labeled as Graphic rather than Photograph (the default). model.ImagesArePhotographs = false; @@ -91,7 +96,7 @@ public bool ArchiveNow(Form owner, Font dialogFont, Icon localizationDialogIcon, AddMetsPairs(model, viProvider.ShortNumericAppVersion, cache); // create the dialog - using (var dlg = new ArchivingDlg(model, "Palaso", dialogFont, new FormSettings())) + using (var dlg = new ArchivingDlg(model, string.Empty, "Palaso", dialogFont, new FormSettings())) using (var reportingAdapter = new SilErrorReportingAdapter(dlg, propertyTable)) { ErrorReport.SetErrorReporter(reportingAdapter); @@ -262,9 +267,9 @@ internal static bool DoesWritingSystemUseKeyman(CoreWritingSystemDefinition ws) /// /// The files to include /// ------------------------------------------------------------------------------------ - private static Action SetFilesToArchive(IEnumerable filesToArchive) + private void SetFilesToArchive(ArchivingDlgViewModel advModel, CancellationToken token) { - return advModel => advModel.AddFileGroup(string.Empty, filesToArchive, ResourceHelper.GetResourceString("kstidAddingFwProject")); + advModel.AddFileGroup(string.Empty, m_filesToArchive, ResourceHelper.GetResourceString("kstidAddingFwProject")); } private void GetCreateDateRange(LcmCache cache) diff --git a/Src/xWorks/xWorks.csproj b/Src/xWorks/xWorks.csproj index 2c825f1080..779dd55620 100644 --- a/Src/xWorks/xWorks.csproj +++ b/Src/xWorks/xWorks.csproj @@ -27,7 +27,7 @@ - v4.6.1 + v4.6.2 3.5 @@ -173,6 +173,10 @@ False ..\..\Output\Debug\SIL.Core.Desktop.dll + + False + ..\..\Output\Debug\SIL.Windows.Forms.Archiving.dll + diff --git a/Src/xWorks/xWorksTests/xWorksTests.csproj b/Src/xWorks/xWorksTests/xWorksTests.csproj index 04c4b0183a..eb647de82b 100644 --- a/Src/xWorks/xWorksTests/xWorksTests.csproj +++ b/Src/xWorks/xWorksTests/xWorksTests.csproj @@ -27,7 +27,7 @@ - v4.6.1 + v4.6.2 3.5