Merge pull request #1311 from HicServices/develop

Prepare release v7.0.16
HicServices · Jul 26, 2022 · c2d63e0 · c2d63e0
2 parents 0f9bb68 + 46d74c3
commit c2d63e0
Show file tree

Hide file tree

Showing 19 changed files with 363 additions and 89 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,6 +26,10 @@ jobs:
         run: npm install -g lcov-result-merger
       - name: Checkout code
         uses: actions/checkout@v3
+      - name: Determine RDMP build version
+        id: version
+        shell: cmd
+        run: perl -ne "print \"::set-output name=rdmpversion::$1\" if /AssemblyVersion\(\"([0-9.]+)\"\)/;" SharedAssemblyInfo.cs
       - uses: actions/cache@v3
         with:
           path: ~/.nuget/packages
@@ -126,14 +130,8 @@ jobs:
           echo "dir /s/b *.cs *.xml > srcbitsa.txt" | cmd
           perl -pe '$_=reverse' < srcbitsa.txt | sort -t'\' -k1,1 -u | perl -pe '$_=reverse' > srcbits.txt
           echo 7z a -mx=9 Tools/BundleUpSourceIntoZip/output/SourceCodeForSelfAwareness.zip @srcbits.txt | cmd
-      - name: Get the version
-        id: get_version
-        # Get the tag name e.g. v5.0.0 but skip the 'v'
-        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\/v/}
-        shell: bash
 
       - name: Sign
-        if: contains(github.ref, 'refs/tags/v')
         shell: bash
         run: |
           signtool=(/c/Program\ Files\ \(x86\)/Windows\ Kits/10/bin/*/x64/signtool.exe)
@@ -142,7 +140,7 @@ jobs:
           echo ${{ secrets.DIGICERT_PFX }} | base64 --decode > GitHubActionsWorkflow.pfx
           echo '"'$signtool'"' 'Sign  /f GitHubActionsWorkflow.pfx /fd sha256 /tr http://timestamp.digicert.com /td sha256 /p ${{ secrets.DIGICERT_PASSWORD }} PublishWindows/*.exe PublishLinux/rdmp PublishWinForms/*.exe PublishWinForms/Hunspell*.dll' | cmd
           mkdir -p dist
-          cmd /c wix\\build.cmd ${{ steps.get_version.outputs.VERSION }}
+          cmd /c wix\\build.cmd ${{ steps.version.outputs.rdmpversion }}
           echo '"'$signtool'"' 'Sign  /f GitHubActionsWorkflow.pfx /fd sha256 /tr http://timestamp.digicert.com /td sha256 /p ${{ secrets.DIGICERT_PASSWORD }} dist/rdmp.msi' | cmd
           (cd PublishWindows ; echo 7z a -mx=9 ../dist/rdmp-cli-win-x64.zip . | cmd)
           (cd PublishLinux ; echo 7z a -mx=9 ../dist/rdmp-cli-linux-x64.zip . | cmd)
@@ -152,17 +150,19 @@ jobs:
           rm dist/rdmp-cli-linux-x64.tar
           (cd PublishWinForms ; echo 7z a -mx=9 ../dist/rdmp-client.zip . | cmd)
 
-      - name: Nuget packages
-        if: contains(github.ref, 'refs/tags/v')
+      - name: Build Nuget packages
         run: |
-          nuget pack Plugins/Plugin/Plugin.nuspec -Properties Configuration=Release -IncludeReferencedProjects -Symbols -Version ${{ steps.get_version.outputs.VERSION }}
-          nuget pack Plugins/Plugin.UI/Plugin.UI.nuspec -Properties Configuration=Release -IncludeReferencedProjects -Symbols -Version ${{ steps.get_version.outputs.VERSION }}
-          nuget pack Plugins/Plugin.Test/Plugin.Test.nuspec -Properties Configuration=Release -IncludeReferencedProjects -Symbols -Version ${{ steps.get_version.outputs.VERSION }}
-          nuget pack Application/ResearchDataManagementPlatform/RDMP.nuspec -Properties Configuration=Release -Version ${{ steps.get_version.outputs.VERSION }}
+          nuget pack Plugins/Plugin/Plugin.nuspec -Properties Configuration=Release -IncludeReferencedProjects -Symbols -Version ${{ steps.version.outputs.rdmpversion }}
+          nuget pack Plugins/Plugin.UI/Plugin.UI.nuspec -Properties Configuration=Release -IncludeReferencedProjects -Symbols -Version ${{ steps.version.outputs.rdmpversion }}
+          nuget pack Plugins/Plugin.Test/Plugin.Test.nuspec -Properties Configuration=Release -IncludeReferencedProjects -Symbols -Version ${{ steps.version.outputs.rdmpversion }}
+          nuget pack Application/ResearchDataManagementPlatform/RDMP.nuspec -Properties Configuration=Release -Version ${{ steps.version.outputs.rdmpversion }}
 
-          nuget push HIC.RDMP.Plugin.${{ steps.get_version.outputs.VERSION }}.nupkg -skipDuplicate -Source https://api.nuget.org/v3/index.json -ApiKey ${{ secrets.NUGET_KEY }}
-          nuget push HIC.RDMP.Plugin.UI.${{ steps.get_version.outputs.VERSION }}.nupkg -skipDuplicate -Source https://api.nuget.org/v3/index.json -ApiKey ${{ secrets.NUGET_KEY }}
-          nuget push HIC.RDMP.Plugin.Test.${{ steps.get_version.outputs.VERSION }}.nupkg -skipDuplicate -Source https://api.nuget.org/v3/index.json -ApiKey ${{ secrets.NUGET_KEY }}
+      - name: Push Nuget packages
+        if: contains(github.ref, 'refs/tags/v')
+        run: |
+          nuget push HIC.RDMP.Plugin.${{ steps.version.outputs.rdmpversion }}.nupkg -skipDuplicate -Source https://api.nuget.org/v3/index.json -ApiKey ${{ secrets.NUGET_KEY }}
+          nuget push HIC.RDMP.Plugin.UI.${{ steps.version.outputs.rdmpversion }}.nupkg -skipDuplicate -Source https://api.nuget.org/v3/index.json -ApiKey ${{ secrets.NUGET_KEY }}
+          nuget push HIC.RDMP.Plugin.Test.${{ steps.version.outputs.rdmpversion }}.nupkg -skipDuplicate -Source https://api.nuget.org/v3/index.json -ApiKey ${{ secrets.NUGET_KEY }}
           
       - name: Archive production artifacts
         uses: actions/upload-artifact@v3

diff --git a/Application/ResearchDataManagementPlatform/RDMP.nuspec b/Application/ResearchDataManagementPlatform/RDMP.nuspec
@@ -7,9 +7,9 @@
 		<description>Research Data Management Platform</description>
     </metadata>
   <files>
-    <file src="bin\$configuration$\net6.0-windows\win-x64\*" target="lib\net6.0-windows" />
-	<file src="bin\$configuration$\net6.0-windows\win-x64\Curation\**\*" target="lib\net6.0-windows" />
-	<file src="bin\$configuration$\net6.0-windows\win-x64\Icon\**\*" target="lib\net6.0-windows" />
-	<file src="bin\$configuration$\net6.0-windows\win-x64\WindowManagement\**\*" target="lib\net6.0-windows" />
+    <file src="bin\$configuration$\net6.0-windows\win-x64\*" target="lib\net6.0-windows7.0" />
+	<file src="bin\$configuration$\net6.0-windows\win-x64\Curation\**\*" target="lib\net6.0-windows7.0" />
+	<file src="bin\$configuration$\net6.0-windows\win-x64\Icon\**\*" target="lib\net6.0-windows7.0" />
+	<file src="bin\$configuration$\net6.0-windows\win-x64\WindowManagement\**\*" target="lib\net6.0-windows7.0" />
   </files>
 </package>
diff --git a/Application/ResearchDataManagementPlatform/ResearchDataManagementPlatform.csproj b/Application/ResearchDataManagementPlatform/ResearchDataManagementPlatform.csproj
@@ -11,7 +11,7 @@
 	<NoWarn>1701;1702;CS1591;NU1701</NoWarn>
     <DebugType>embedded</DebugType>
     <DebugSymbols>true</DebugSymbols>
-    <PublishSingleFile>true</PublishSingleFile>
+    <PublishSingleFile>false</PublishSingleFile>
   </PropertyGroup>
   <PropertyGroup>
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ...
 
+## [7.0.16] - 2022-07-25
+
+- Bugfix release due to build issues in releasing 7.0.15
+- Bump YamlDotNet from 11.2.1 to 12.0.0
+
 ## [7.0.15] - 2022-07-22
 
 ### Added

diff --git a/Documentation/CodeTutorials/Packages.md b/Documentation/CodeTutorials/Packages.md
@@ -29,7 +29,7 @@
 | Microsoft.NET.Test.Sdk | [GitHub](https://github.com/microsoft/vstest/) | [17.2.0](https://www.nuget.org/packages/Microsoft.NET.Test.Sdk/17.2.0) | [MIT](https://opensource.org/licenses/MIT) | Required for running tests| |
 | NUnit3TestAdapter | [GitHub](https://github.com/nunit/nunit3-vs-adapter)| [3.13.3](https://www.nuget.org/packages/NUnit3TestAdapter/3.13.3) | [MIT](https://opensource.org/licenses/MIT) | Run unit tests from within Visual Studio |
 | [Newtonsoft.Json](https://www.newtonsoft.com/json) | [GitHub](https://github.com/JamesNK/Newtonsoft.Json) | [13.0.1](https://www.nuget.org/packages/Newtonsoft.Json/13.0.1) | [MIT](https://opensource.org/licenses/MIT) | Serialization of objects for sharing/transmission |
-| YamlDotNet | [GitHub](https://github.com/aaubry/YamlDotNet)  | [11.2.1](https://www.nuget.org/packages/YamlDotNet/11.2.1) | [MIT](https://opensource.org/licenses/MIT) |Loading configuration files|
+| YamlDotNet | [GitHub](https://github.com/aaubry/YamlDotNet)  | [12.0.0](https://www.nuget.org/packages/YamlDotNet/12.0.0) | [MIT](https://opensource.org/licenses/MIT) |Loading configuration files|
 | [SecurityCodeScan.VS2019](https://security-code-scan.github.io/) | [GitHub](https://github.com/security-code-scan/security-code-scan) | [5.6.3](https://www.nuget.org/packages/SecurityCodeScan.VS2019/5.6.3) | [GPL 3.0](https://www.gnu.org/licenses/gpl-3.0.html)| Performs static build time analysis for vulnerabilities in the codebase (e.g. Sql injection)| |
 | System.Runtime.Loader | [GitHub](https://github.com/dotnet/corefx) | [4.3.0](https://www.nuget.org/packages/System.Runtime.Loader/4.3.0) |[MIT](https://opensource.org/licenses/MIT)  | Allows loading assemblies in dot net core| |
 | System.Diagnostics.Debug | [GitHub](https://github.com/dotnet/corefx)  | [4.3.0](https://www.nuget.org/packages/System.Diagnostics.Debug/4.3.0) |[MIT](https://opensource.org/licenses/MIT) | Interact with Processes / Debug / Console |  |

diff --git a/Plugins/Plugin.Test/Plugin.Test.nuspec b/Plugins/Plugin.Test/Plugin.Test.nuspec
@@ -22,7 +22,7 @@
             <dependency id="NUnit" version="3.13.3" />
             <dependency id="Moq" version="4.18.1" />
             <dependency id="NLog" version="5.0.1" />
-            <dependency id="YamlDotNet" version="11.2.1" />
+            <dependency id="YamlDotNet" version="12.0.0" />
             <dependency id="Microsoft.NET.Test.Sdk" version="17.2.0" />
             <dependency id="ExcelNumberFormat" version="1.1.0" />
             <dependency id="NPOI" version="2.5.5" />
@@ -44,16 +44,12 @@
     </metadata>
     <files>
 		<file src="bin\$configuration$\net6.0\MapsDirectlyToDatabaseTable.dll" target="lib\net6.0"/>
-		<file src="bin\$configuration$\net6.0\MapsDirectlyToDatabaseTable.pdb" target="lib\net6.0"/>
 		<file src="bin\$configuration$\net6.0\MapsDirectlyToDatabaseTable.xml" target="lib\net6.0"/>
 		<file src="bin\$configuration$\net6.0\Rdmp.Core.dll" target="lib\net6.0"/>
-		<file src="bin\$configuration$\net6.0\Rdmp.Core.pdb" target="lib\net6.0"/>
 		<file src="bin\$configuration$\net6.0\Rdmp.Core.xml" target="lib\net6.0"/>
 		<file src="bin\$configuration$\net6.0\ReusableLibraryCode.dll" target="lib\net6.0"/>
-		<file src="bin\$configuration$\net6.0\ReusableLibraryCode.pdb" target="lib\net6.0"/>
 		<file src="bin\$configuration$\net6.0\ReusableLibraryCode.xml" target="lib\net6.0"/>
 		<file src="bin\$configuration$\net6.0\Tests.Common.dll" target="lib\net6.0"/>
-		<file src="bin\$configuration$\net6.0\Tests.Common.pdb" target="lib\net6.0"/>
 		<file src="bin\$configuration$\net6.0\Tests.Common.xml" target="lib\net6.0"/>
 		<file src="bin\$configuration$\net6.0\TestDatabases.txt" target="content"/>
     </files>

diff --git a/Plugins/Plugin.UI/Plugin.UI.nuspec b/Plugins/Plugin.UI/Plugin.UI.nuspec
@@ -43,21 +43,17 @@
             <dependency id="HIC.System.Windows.Forms.DataVisualization" version="1.0.1" />
             <dependency id="ReadLine" version="2.0.1" />
             <dependency id="System.DirectoryServices.Protocols" version="6.0.1" />
-            <dependency id="YamlDotNet" version="11.2.1" />
+            <dependency id="YamlDotNet" version="12.0.0" />
         </dependencies>
     </metadata>
   <files>
     <file src="bin\$configuration$\net6.0-windows7.0\MapsDirectlyToDatabaseTable.dll" target="lib\net6.0-windows7.0"/>
-    <file src="bin\$configuration$\net6.0-windows7.0\MapsDirectlyToDatabaseTable.pdb" target="lib\net6.0-windows7.0"/>
     <file src="bin\$configuration$\net6.0-windows7.0\MapsDirectlyToDatabaseTable.xml" target="lib\net6.0-windows7.0"/>
     <file src="bin\$configuration$\net6.0-windows7.0\Rdmp.Core.dll" target="lib\net6.0-windows7.0"/>
-    <file src="bin\$configuration$\net6.0-windows7.0\Rdmp.Core.pdb" target="lib\net6.0-windows7.0"/>
     <file src="bin\$configuration$\net6.0-windows7.0\Rdmp.Core.xml" target="lib\net6.0-windows7.0"/>
     <file src="bin\$configuration$\net6.0-windows7.0\Rdmp.UI.dll" target="lib\net6.0-windows7.0"/>
-    <file src="bin\$configuration$\net6.0-windows7.0\Rdmp.UI.pdb" target="lib\net6.0-windows7.0"/>
     <file src="bin\$configuration$\net6.0-windows7.0\Rdmp.UI.xml" target="lib\net6.0-windows7.0"/>
     <file src="bin\$configuration$\net6.0-windows7.0\ReusableLibraryCode.dll" target="lib\net6.0-windows7.0"/>
-    <file src="bin\$configuration$\net6.0-windows7.0\ReusableLibraryCode.pdb" target="lib\net6.0-windows7.0"/>
     <file src="bin\$configuration$\net6.0-windows7.0\ReusableLibraryCode.xml" target="lib\net6.0-windows7.0"/>
   </files>
 </package>
diff --git a/Plugins/Plugin/Plugin.nuspec b/Plugins/Plugin/Plugin.nuspec
@@ -36,7 +36,7 @@
             <dependency id="System.Resources.Extensions" version="4.6.0" />
             <dependency id="ReadLine" version="2.0.1" />
             <dependency id="System.DirectoryServices.Protocols" version="6.0.1" />
-            <dependency id="YamlDotNet" version="11.2.1" />
+            <dependency id="YamlDotNet" version="12.0.0" />
         </dependencies>
     </metadata>
   <files>

diff --git a/Rdmp.Core/CommandLine/DatabaseCreation/ExampleDatasetsCreation.cs b/Rdmp.Core/CommandLine/DatabaseCreation/ExampleDatasetsCreation.cs
@@ -217,29 +217,11 @@ WHERE Operation <> 'NULL' AND Operation <> 'Nul'
 
             if (options.Nightmare)
             {
-                //Lots of datasets
-                for (int i = 0; i < 1000; i++)
+                var nightmare = new NightmareDatasets(_repos, db)
                 {
-                    var cata = new Catalogue(_repos.CatalogueRepository, $"Catalogue {i}");
-                    var eds = new ExtractableDataSet(_repos.DataExportRepository, cata);
-                    var ti = new TableInfo(_repos.CatalogueRepository, $"[MyDb].[Table{i}]");
-
-                    for (int j = 0; j < 40; j++)
-                    {
-                        var col = new ColumnInfo(_repos.CatalogueRepository, $"MyCol{j}", "varchar(10)", ti);
-                        var ci = new CatalogueItem(_repos.CatalogueRepository, cata, col.Name);
-                        new ExtractionInformation(_repos.CatalogueRepository, ci, col, col.Name);
-                    }
-
-                    Project p = new Project(_repos.DataExportRepository,$"Project {i}");
-
-                    for (int j = 0; j < 20; j++)
-                    {
-                        var config = new ExtractionConfiguration(_repos.DataExportRepository, p);
-                        new SelectedDataSets(_repos.DataExportRepository,config, eds,null);
-                    }
-                }
-
+                    Factor = options.NightmareFactor
+                };
+                nightmare.Create(externalCohortTable);
             }
         }