From 420b7529c6c8dd054f41fa18d1a2399c36a70ea4 Mon Sep 17 00:00:00 2001
From: Robert McRackan <rmcracka@itron.com>
Date: Tue, 14 Sep 2021 09:05:56 -0400
Subject: [PATCH] Bug fix: issues #113 , #114 Forcing a new build order. Seems
 to fix the issue. Since the issue was already intermittent (race condition?)
 it's difficult to be sure

---
 AppScaffolding/AppScaffolding.csproj     |  2 +-
 Libation.sln                             |  3 +++
 LibationCli/LibationCli.csproj           |  8 ++++++++
 LibationWinForms/LibationWinForms.csproj | 10 ++++++++++
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/AppScaffolding/AppScaffolding.csproj b/AppScaffolding/AppScaffolding.csproj
index 4cba4ef4..9ab44620 100644
--- a/AppScaffolding/AppScaffolding.csproj
+++ b/AppScaffolding/AppScaffolding.csproj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>5.7.3.1</Version>
+    <Version>5.7.4.2</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Libation.sln b/Libation.sln
index f7b23ffe..69052fd2 100644
--- a/Libation.sln
+++ b/Libation.sln
@@ -36,6 +36,9 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationSearchEngine", "LibationSearchEngine\LibationSearchEngine.csproj", "{2E1F5DB4-40CC-4804-A893-5DCE0193E598}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibationWinForms", "LibationWinForms\LibationWinForms.csproj", "{635F00E1-AAD1-45F7-BEB7-D909AD33B9F6}"
+	ProjectSection(ProjectDependencies) = postProject
+		{428163C3-D558-4914-B570-A92069521877} = {428163C3-D558-4914-B570-A92069521877}
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DtoImporterService", "DtoImporterService\DtoImporterService.csproj", "{401865F5-1942-4713-B230-04544C0A97B0}"
 EndProject
diff --git a/LibationCli/LibationCli.csproj b/LibationCli/LibationCli.csproj
index ce0975b5..6ed64511 100644
--- a/LibationCli/LibationCli.csproj
+++ b/LibationCli/LibationCli.csproj
@@ -12,6 +12,14 @@
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>
 
+  <!--
+  When LibationWinForms and LibationCli output to the same dir, LibationCli must build before LibationWinForms
+  
+  VS > rt-clik solution > Project Build Order...
+  Dependencies [tab]
+  Projects: LibationWinForms
+  manually check LibationCli
+  -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <OutputPath>..\LibationWinForms\bin\Debug</OutputPath>
   </PropertyGroup>
diff --git a/LibationWinForms/LibationWinForms.csproj b/LibationWinForms/LibationWinForms.csproj
index c5271389..4cfac15a 100644
--- a/LibationWinForms/LibationWinForms.csproj
+++ b/LibationWinForms/LibationWinForms.csproj
@@ -18,6 +18,16 @@
     <!-- Version is now in AppScaffolding.csproj -->
   </PropertyGroup>
 
+  <PropertyGroup>
+    <!--
+    HACK FOR COMPILER BUG  2021-09-14. Hopefully will be fixed in future versions
+    - Not using SatelliteResourceLanguages will load all language packs: works
+    - Specifying 'en' semicolon 1 more should load 1 language pack: works
+    - Specifying only 'en' should load no language packs: broken, still loads all
+    -->
+    <SatelliteResourceLanguages>en;es</SatelliteResourceLanguages>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Dinah.Core.WindowsDesktop" Version="1.1.0.2" />
   </ItemGroup>