MSS-100 Adjusted plugin to exclude dlls that are part of RDMP core (r…

…educing size). Added linux binaries to plugin
SMI · Oct 18, 2019 · 4149e48 · 4149e48
1 parent ce11ea5
commit 4149e48
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ...
 
+## [1.3.1] 2019-10-18
+
+### Added
+
+- Added linux x64 binaries to enable plugin to work from CLI engines running in linux hosts (e.g. data load engine)
+
+## Removed
+
+- Removed dlls that are already part of RDMP core application (e.g. Rdmp.Core.dll) from plugin archive
+
 ## [1.3.0] 2019-09-13
 
 ## Changed
@@ -36,7 +46,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Initial commit from private repo
 
 
-[Unreleased]: https://github.com/HicServices/RdmpDicom/compare/v1.3.0...develop
+[Unreleased]: https://github.com/HicServices/RdmpDicom/compare/v1.3.1...develop
+[1.3.1]: https://github.com/HicServices/RdmpDicom/compare/v1.3.0...v1.3.1
 [1.3.0]: https://github.com/HicServices/RdmpDicom/compare/v1.1.0...v1.3.0
 [1.1.0]: https://github.com/HicServices/RdmpDicom/compare/v1.0.2...v1.1.0
 [1.0.2]: https://github.com/HicServices/RdmpDicom/compare/1581c5ae3a12db1873f4cf1a930215750ad2ae14...v1.0.2

diff --git a/Rdmp.Dicom.nuspec b/Rdmp.Dicom.nuspec
@@ -10,7 +10,14 @@
 		</dependencies>
     </metadata>
   <files>
-    <file src="Plugin\net461\bin\$configuration$\net461\*" exclude="**/net461.dll" target="lib\net461" />
-	<file src="Plugin\netcoreapp2.2\bin\$configuration$\netcoreapp2.2\win-x64\publish\*" exclude="**/netcoreapp2.2.dll" target="lib\netcoreapp2.2\win\" />
+    <file src="Plugin\net461\bin\$configuration$\net461\win-x64\publish\*"
+          exclude="**/net461.dll;**\BadMedicine.Core.dll;**\FAnsi.*;**\MapsDirectlyToDatabaseTable.dll;**\MySql.Data.dll;**\Oracle.ManagedDataAccess.dll;**\Rdmp.Core.dll;**\NPOI.*;**\Renci.*;**\MathNet.Numerics.dll*;**\Rdmp.UI.dll;**\ScintillaNET.dll;**\ReusableUIComponents.dll;**\ObjectListView.dll;**\WeifenLuo.WinFormsUI.Docking*"
+          target="lib\net461" />
+	<file src="Plugin\netcoreapp2.2\bin\$configuration$\netcoreapp2.2\win-x64\publish\*" 
+        exclude="**\Plugin.dll;**\BadMedicine.Core.dll;**\FAnsi.*;**\MapsDirectlyToDatabaseTable.dll;**\MySql.Data.dll;**\Oracle.ManagedDataAccess.dll;**\Rdmp.Core.dll;**\NPOI.*;**\Renci.*;**\MathNet.Numerics.dll*"  
+        target="lib\netcoreapp2.2\win\" />
+    <file src="Plugin\netcoreapp2.2\bin\$configuration$\netcoreapp2.2\linux-x64\publish\*" 
+          exclude="**\Plugin.dll;**\BadMedicine.Core.dll;**\FAnsi.*;**\MapsDirectlyToDatabaseTable.dll;**\MySql.Data.dll;**\Oracle.ManagedDataAccess.dll;**\Rdmp.Core.dll;**\NPOI.*;**\Renci.*;**\MathNet.Numerics.dll*"  
+          target="lib\netcoreapp2.2\linux\" />
   </files>
 </package>
diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs
@@ -7,6 +7,6 @@
 [assembly: AssemblyCulture("")]
 
 // These should be replaced with correct values by the release process
-[assembly: AssemblyVersion("1.3.0")]
-[assembly: AssemblyFileVersion("1.3.0")]
-[assembly: AssemblyInformationalVersion("1.3.0")]
+[assembly: AssemblyVersion("1.3.1")]
+[assembly: AssemblyFileVersion("1.3.1")]
+[assembly: AssemblyInformationalVersion("1.3.1")]
diff --git a/rakefile.rb b/rakefile.rb
@@ -89,9 +89,13 @@
 	version = File.open('version') {|f| f.readline}
     puts "version: #{version}"
 
+	Dir.chdir('Plugin/net461/') do
+		sh "dotnet publish --runtime win-x64 -c #{args.config} --self-contained false"
+	end
 
 	Dir.chdir('Plugin/netcoreapp2.2/') do
-		sh "dotnet publish --runtime win-x64 -c #{args.config}"
+		sh "dotnet publish --runtime win-x64 -c #{args.config} --self-contained false"
+		sh "dotnet publish --runtime linux-x64 -c #{args.config} --self-contained false"
 	end
 
 	#Packages the plugin which will be loaded into RDMP