diff --git a/Build/Manage-LocalLibraries.ps1 b/Build/Manage-LocalLibraries.ps1 index 09b6b8fa68..a06f78c36d 100644 --- a/Build/Manage-LocalLibraries.ps1 +++ b/Build/Manage-LocalLibraries.ps1 @@ -51,9 +51,16 @@ Path to a local machine checkout. Overrides SILMACHINE_PATH env var. Only used when -Machine is specified. +.PARAMETER L10nSharp + Switch: include L10NSharp in the pack operation. + +.PARAMETER L10nSharpPath + Path to a local L10NSharp checkout. Overrides L10NSHARP_PATH env var. + Only used when -L10nSharp is specified. + .PARAMETER Library Which library to set a version for (SetVersion mode only): - liblcm, libpalaso, chorus, or machine. + liblcm, libpalaso, chorus, machine, or l10nsharp. .PARAMETER Version Sets the version in SilVersions.props (SetVersion mode). Use to revert @@ -85,7 +92,10 @@ param( [switch]$Machine, [string]$MachinePath, - [ValidateSet('liblcm', 'libpalaso', 'chorus', 'machine')] + [switch]$L10nSharp, + [string]$L10nSharpPath, + + [ValidateSet('liblcm', 'libpalaso', 'chorus', 'machine', 'l10nsharp')] [string]$Library, [string]$Version @@ -131,10 +141,16 @@ $LibraryConfig = @{ 'src/SIL.Machine.Morphology.HermitCrab/SIL.Machine.Morphology.HermitCrab.csproj' ) } + l10nsharp = @{ + VersionProperty = 'L10NSharpVersion' + PdbRelativeDir = 'output/Debug/net462' + CachePrefixes = @('l10nsharp') + EnvVar = 'L10NSHARP_PATH' + } } # Pack order: libpalaso first (other libraries may depend on it) -$PackOrder = @('libpalaso', 'liblcm', 'chorus', 'machine') +$PackOrder = @('libpalaso', 'l10nsharp', 'liblcm', 'chorus', 'machine') # --------------------------------------------------------------------------- # Read SilVersions.props @@ -333,6 +349,7 @@ $switchMap = @{ liblcm = @{ Enabled = [bool]$Lcm; ExplicitPath = $LcmPath } chorus = @{ Enabled = [bool]$Chorus; ExplicitPath = $ChorusPath } machine = @{ Enabled = [bool]$Machine; ExplicitPath = $MachinePath } + l10nsharp = @{ Enabled = [bool]$L10nSharp; ExplicitPath = $L10nSharpPath } } # Resolve source paths: explicit path > env var (only when switch is set) @@ -419,5 +436,5 @@ elseif ($Library -and $Version) { Write-Host "Run .\build.ps1 to restore and build with the new version." -ForegroundColor Cyan } else { - throw "Nothing to do. Use -Palaso/-Lcm/-Chorus/-Machine switches to pack, or -Library and -Version to set a version.`nExamples:`n .\Build\Manage-LocalLibraries.ps1 -Palaso -PalasoPath C:\Repos\libpalaso`n .\Build\Manage-LocalLibraries.ps1 -Palaso -Chorus`n .\Build\Manage-LocalLibraries.ps1 -Machine -MachinePath C:\Repos\machine`n .\Build\Manage-LocalLibraries.ps1 -Library libpalaso -Version 17.0.0" + throw "Nothing to do. Use -Palaso/-Lcm/-Chorus/-Machine/-L10nSharp switches to pack, or -Library and -Version to set a version.`nExamples:`n .\Build\Manage-LocalLibraries.ps1 -Palaso -PalasoPath C:\Repos\libpalaso`n .\Build\Manage-LocalLibraries.ps1 -Palaso -Chorus`n .\Build\Manage-LocalLibraries.ps1 -Machine -MachinePath C:\Repos\machine`n .\Build\Manage-LocalLibraries.ps1 -Library l10nsharp -Version 10.0.0`n .\Build\Manage-LocalLibraries.ps1 -Library libpalaso -Version 17.0.0" } diff --git a/Build/SilVersions.props b/Build/SilVersions.props index 1bfdfefeb1..c5e1a69292 100644 --- a/Build/SilVersions.props +++ b/Build/SilVersions.props @@ -1,5 +1,5 @@ - 11.0.0-beta0160 - 17.0.0 + 18.0.0-beta0008 + 18.0.0-beta0001 6.0.0-beta0063 3.0.1 3.8.2 1.1.1-beta0001 + 10.0.0-beta0001 70.1.152 60.0.56 - + \ No newline at end of file diff --git a/Directory.Packages.props b/Directory.Packages.props index b1cd3e2da9..b9eea54405 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -87,9 +87,9 @@ ============================================================= --> - + - + + + + + + diff --git a/Src/Common/FieldWorks/App.config b/Src/Common/FieldWorks/App.config index abe37b7ccb..15fbb6b478 100644 --- a/Src/Common/FieldWorks/App.config +++ b/Src/Common/FieldWorks/App.config @@ -23,6 +23,12 @@ Only entries that auto-gen cannot produce are kept below. + + + + + diff --git a/Src/Common/FieldWorks/FieldWorks.cs b/Src/Common/FieldWorks/FieldWorks.cs index 2ff8466621..9e01e6df2c 100644 --- a/Src/Common/FieldWorks/FieldWorks.cs +++ b/Src/Common/FieldWorks/FieldWorks.cs @@ -3665,7 +3665,7 @@ internal static void InitializeLocalizationManager() var version = $"{versionObj.Major}.{versionObj.Minor}.{versionObj.Build}"; // First create localization manager for Chorus with english LocalizationManagerWinforms.Create("en", - "Chorus", "Chorus", version, installedL10nBaseDir, userL10nBaseDir, null, "flex_localization@sil.org", new [] { "Chorus", "LibChorus" }); + "Chorus", "Chorus", version, installedL10nBaseDir, userL10nBaseDir, null, 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; @@ -3678,7 +3678,7 @@ internal static void InitializeLocalizationManager() versionObj = Assembly.GetAssembly(typeof(ErrorReport)).GetName().Version; version = $"{versionObj.Major}.{versionObj.Minor}.{versionObj.Build}"; LocalizationManagerWinforms.Create(LocalizationManager.UILanguageId, "Palaso", "Palaso", version, installedL10nBaseDir, - userL10nBaseDir, null, "flex_localization@sil.org", new [] { "SIL.Windows.Forms" }); + userL10nBaseDir, null, new[] { "SIL.Windows.Forms" }); } catch (Exception e) {