Use NuGet to get ChorusMergeModule

Change-Id: I8b38df5857b5d187a9574a6327202190797b7d83
sillsdev · Dec 8, 2022 · 1eba6bb · 1eba6bb
1 parent 88a8adc
commit 1eba6bb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -49,6 +49,7 @@ vcs_version
 .idea/
 build/MarkdownDeep.NET/
 *.old
+*.orig
 *.swp
 icu4c.readme.txt
 gitversion.properties

diff --git a/lib/Release/ChorusMergeModule.msm b/lib/Release/ChorusMergeModule.msm
diff --git a/src/FLExBridge/FLExBridge.csproj b/src/FLExBridge/FLExBridge.csproj
@@ -11,13 +11,18 @@
     <PackageReference Include="Geckofx60.64.Linux" Version="60.0.51.0" />
     <PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="all" />
     <PackageReference Include="SIL.Chorus.ChorusMerge" Version="$(ChorusVersion)" />
+    <PackageReference Include="SIL.Chorus.ChorusMergeModule" Version="$(ChorusVersion)" GeneratePathProperty="true" PrivateAssets="all" />
     <PackageReference Include="SIL.ReleaseTasks" Version="2.5.0" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\TriboroughBridge-ChorusPlugin\TriboroughBridge-ChorusPlugin.csproj" />
   </ItemGroup>
 
+  <Target Name="CopyChorusMergeModuleToLib" AfterTargets="CopyFilesToOutputDirectory" Condition="'$(Configuration)'=='Release'">
+    <Copy SourceFiles="$(PkgSIL_Chorus_ChorusMergeModule)/content/ChorusMergeModule.msm" DestinationFolder="../../lib/Release" SkipUnchangedFiles="true" />
+  </Target>
+
   <Target Name="MakeChorusMergeExeConfig" AfterTargets="CopyFilesToOutputDirectory">
     <PropertyGroup>
       <FLExBridgeExeConfig>$(OutputPath)/$(AssemblyTitle).exe.config</FLExBridgeExeConfig>
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,6 +49,7 @@ vcs_version @@
     .idea/
     build/MarkdownDeep.NET/
     *.old
+    *.orig
     *.swp
     icu4c.readme.txt
     gitversion.properties
@@ Expand Down @@