From 307fe1af79d3808c0f05454faf702efd0340b641 Mon Sep 17 00:00:00 2001
From: jamaa <90166+jamaa@users.noreply.github.com>
Date: Sun, 11 Feb 2024 18:47:51 +0100
Subject: [PATCH] clean up build output regarding BlueM.Wave: * do not copy
 Wave references to output (Private=False) * copy Wave .NET assemblies to
 output in post-build event * move Wave native assemblies to subdir in
 post-build event requires probing privatePath to be set accordingly in
 app.config

---
 BlueM.Opt/Algos/SensiPlot/SensiPlot.vbproj |  1 +
 BlueM.Opt/Apps/BlueM.Opt.Apps.vbproj       |  1 +
 BlueM.Opt/Common/BlueM.Opt.Common.vbproj   |  1 +
 BlueM.Opt/Main/BlueM.Opt.vbproj            | 35 ++++++++++++++++++++--
 4 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/BlueM.Opt/Algos/SensiPlot/SensiPlot.vbproj b/BlueM.Opt/Algos/SensiPlot/SensiPlot.vbproj
index 947289b3..d85f3e9e 100644
--- a/BlueM.Opt/Algos/SensiPlot/SensiPlot.vbproj
+++ b/BlueM.Opt/Algos/SensiPlot/SensiPlot.vbproj
@@ -126,6 +126,7 @@
     <ProjectReference Include="..\..\..\BlueM.Wave\source\Wave.vbproj">
       <Project>{ce4132a2-2e2f-4f54-b66d-1baa928d499e}</Project>
       <Name>Wave</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\Apps\BlueM.Opt.Apps.vbproj">
       <Project>{2DCFE99E-CBFE-4CCC-93E7-A6D628B16DEC}</Project>
diff --git a/BlueM.Opt/Apps/BlueM.Opt.Apps.vbproj b/BlueM.Opt/Apps/BlueM.Opt.Apps.vbproj
index f0260f2d..dca74993 100644
--- a/BlueM.Opt/Apps/BlueM.Opt.Apps.vbproj
+++ b/BlueM.Opt/Apps/BlueM.Opt.Apps.vbproj
@@ -176,6 +176,7 @@
     <ProjectReference Include="..\..\BlueM.Wave\source\Wave.vbproj">
       <Project>{ce4132a2-2e2f-4f54-b66d-1baa928d499e}</Project>
       <Name>Wave</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Common\BlueM.Opt.Common.vbproj">
       <Project>{CAA1CE91-0973-4BE7-9BD8-16B5D40BC93C}</Project>
diff --git a/BlueM.Opt/Common/BlueM.Opt.Common.vbproj b/BlueM.Opt/Common/BlueM.Opt.Common.vbproj
index 3b734d1b..c8d0fabe 100644
--- a/BlueM.Opt/Common/BlueM.Opt.Common.vbproj
+++ b/BlueM.Opt/Common/BlueM.Opt.Common.vbproj
@@ -145,6 +145,7 @@
     <ProjectReference Include="..\..\BlueM.Wave\source\Wave.vbproj">
       <Project>{ce4132a2-2e2f-4f54-b66d-1baa928d499e}</Project>
       <Name>Wave</Name>
+      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
diff --git a/BlueM.Opt/Main/BlueM.Opt.vbproj b/BlueM.Opt/Main/BlueM.Opt.vbproj
index e518e910..14e433ca 100644
--- a/BlueM.Opt/Main/BlueM.Opt.vbproj
+++ b/BlueM.Opt/Main/BlueM.Opt.vbproj
@@ -120,6 +120,7 @@
     <ProjectReference Include="..\..\BlueM.Wave\source\Wave.vbproj">
       <Project>{ce4132a2-2e2f-4f54-b66d-1baa928d499e}</Project>
       <Name>Wave</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\Algos\DDS\DDS.csproj">
       <Project>{9FA5A4C7-3AA9-420C-9F01-9F1683E36A79}</Project>
@@ -325,8 +326,38 @@
   <PropertyGroup>
     <PreBuildEvent>
     </PreBuildEvent>
-    <PostBuildEvent>XCOPY $(SolutionDir)BlueM.Wave\source\bin\$(PlatformName)\$(ConfigurationName)\* $(TargetDir)BlueM.Wave /Y /S /I
+    <PostBuildEvent>:: copy license file to output
+COPY /Y $(SolutionDir)COPYING $(TargetDir)COPYING
+:: copy BlueM.Sim assemblies to output
 XCOPY $(SolutionDir)BlueM.Opt\Apps\BlueM\$(PlatformName)\* $(TargetDir)BlueM /Y /S /I
-COPY /Y $(SolutionDir)COPYING $(TargetDir)COPYING</PostBuildEvent>
+:: copy BlueM.Wave .NET assemblies to output
+XCOPY $(SolutionDir)BlueM.Wave\source\bin\$(PlatformName)\$(ConfigurationName)\* $(TargetDir)BlueM.Wave /Y /S /I
+:: move BlueM.Wave native assemblies to subdir
+move /Y $(TargetDir)de $(TargetDir)BlueM.Wave
+move /Y $(TargetDir)ams2004.dll $(TargetDir)BlueM.Wave
+move /Y $(TargetDir)amsT2004.dll $(TargetDir)BlueM.Wave
+move /Y $(TargetDir)DHI.Generic.MikeZero.DFS.dll $(TargetDir)BlueM.Wave
+move /Y $(TargetDir)DHI.Generic.MikeZero.EUM.dll $(TargetDir)BlueM.Wave
+move /Y $(TargetDir)DHI.PFS.dll $(TargetDir)BlueM.Wave
+move /Y $(TargetDir)DHI.Projections.dll $(TargetDir)BlueM.Wave
+move /Y $(TargetDir)DHIfl.dll $(TargetDir)BlueM.Wave
+move /Y $(TargetDir)DotNetZip.dll $(TargetDir)BlueM.Wave
+move /Y $(TargetDir)DotNetZip.pdb $(TargetDir)BlueM.Wave
+move /Y $(TargetDir)ellipsoid.pfs $(TargetDir)BlueM.Wave
+move /Y $(TargetDir)eum.dll $(TargetDir)BlueM.Wave
+move /Y $(TargetDir)EUM.ubg $(TargetDir)BlueM.Wave
+move /Y $(TargetDir)EUM.xml $(TargetDir)BlueM.Wave
+move /Y $(TargetDir)EUM_Default_Units.ubg $(TargetDir)BlueM.Wave
+move /Y $(TargetDir)EUM_US_Units.ubg $(TargetDir)BlueM.Wave
+move /Y $(TargetDir)map_projection.pfs $(TargetDir)BlueM.Wave
+move /Y $(TargetDir)MathNet.Numerics.dll $(TargetDir)BlueM.Wave
+move /Y $(TargetDir)MzCart.dll $(TargetDir)BlueM.Wave
+move /Y $(TargetDir)Newtonsoft.Json.dll $(TargetDir)BlueM.Wave
+move /Y $(TargetDir)PdfSharp.Charting.dll $(TargetDir)BlueM.Wave
+move /Y $(TargetDir)PdfSharp.dll $(TargetDir)BlueM.Wave
+move /Y $(TargetDir)pfs2004.dll $(TargetDir)BlueM.Wave
+move /Y $(TargetDir)state_plane_nad27.pfs $(TargetDir)BlueM.Wave
+move /Y $(TargetDir)state_plane_nad83.pfs $(TargetDir)BlueM.Wave
+move /Y $(TargetDir)ufs.dll $(TargetDir)BlueM.Wave</PostBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file