diff --git a/tests/manifest.xml b/.assets/assets/manifest.xml similarity index 76% rename from tests/manifest.xml rename to .assets/assets/manifest.xml index 965238cb..856be5f1 100644 --- a/tests/manifest.xml +++ b/.assets/assets/manifest.xml @@ -1,13 +1,13 @@ - + 5d6f5462-3401-48ec-9406-d12882e9ad83 - 1.0.0.0 + 0.3.0 Computational Systems Biology en-US - - - - + + + + bio.uni-kl.de @@ -30,8 +30,8 @@ - - \ No newline at end of file + diff --git a/.assets/assets/swate.cmd b/.assets/assets/swate.cmd new file mode 100644 index 00000000..7eb5d841 --- /dev/null +++ b/.assets/assets/swate.cmd @@ -0,0 +1,4 @@ +@ECHO OFF +echo "Starting Excel instance with the SWATE manifest ..." + +npx office-addin-debugging start manifest.xml desktop --debug-method web \ No newline at end of file diff --git a/.assets/assets/swate.sh b/.assets/assets/swate.sh new file mode 100644 index 00000000..be647d24 --- /dev/null +++ b/.assets/assets/swate.sh @@ -0,0 +1,3 @@ +echo "Starting Excel instance with the SWATE manifest ..." + +npx office-addin-debugging start manifest.xml desktop --debug-method web \ No newline at end of file diff --git a/.assets/swate.zip b/.assets/swate.zip index e19102f4..bcd12b5f 100644 Binary files a/.assets/swate.zip and b/.assets/swate.zip differ diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index e08dfdab..416e6f93 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,26 @@ +### 0.3.0+0d31c43 (Released 2021-2-11) +* Additions: + * latest commit #0d31c43 + * [[#4bf33cb](https://github.com/nfdi4plants/Swate/commit/4bf33cb478861250a3f1794140821460115e3173)] Add ontology accession number as tag in ref columns (Issue #100). + * [[#262dae3](https://github.com/nfdi4plants/Swate/commit/262dae32acef085d3bfff46c1194f80698278387)] Add option to write process.json to Swate annotation table (Issue #84). :sparkles: + * [[#09467d9](https://github.com/nfdi4plants/Swate/commit/09467d97813b708ce8bee58935b0b5830aea15f7)] Visually group building blocks to protocols (Issues 101#, #103, #104) :sparkles: + * [[#0516353](https://github.com/nfdi4plants/Swate/commit/05163533c6832023301e588ccc59b34af5b18f88)] Add Logos and visually update Swate (Issue #59). + * [[#5c2e56a](https://github.com/nfdi4plants/Swate/commit/5c2e56a46b57fa627c5b37b7e8307ab633a4e12b)] Add option to add unit cols to existing building block (Issue #94). + * [[#9987184](https://github.com/nfdi4plants/Swate/commit/99871849bc83cfa4bd4fe7760c2f43dae524d76b)] Add sorensen dice sorting to advanced term search (Issue #95). + * [[#9158bb7](https://github.com/nfdi4plants/Swate/commit/9158bb75696399492050109ebb0d04be59eeb9b6)] Update unit search to only search UO ontology (Issue #93). + * [[#4e0d0c9](https://github.com/nfdi4plants/Swate/commit/4e0d0c9e32c5be606542f9ca0f05b74be6626e1d)] Add easy to access navigation option to advanced search (Issue #91). + * [[#374e326](https://github.com/nfdi4plants/Swate/commit/374e326f2123a2f61825f281bc4886b109d5261d)] Add features from #68 to Update Reference Columns (Issue 87#). +* Deletions: + * [[#9da9c55](https://github.com/nfdi4plants/Swate/commit/9da9c55a23d737aa05ff7c12759446ce5387902f)] Remove event handlers (input assist, #87). +* Bugfixes: + * [[#0d31c43](https://github.com/nfdi4plants/Swate/commit/0d31c43ff55961b7eed6d91183c4c91c85356c59)] Fix bug not opening "File Picker" upload window on click. + * [[#8606b12](https://github.com/nfdi4plants/Swate/commit/8606b12fe5497c2fbea2659cafd123c9a22dfe34)] Add Protocol Xml logic and fix ISADotNet dependency. + * [[#51928c0](https://github.com/nfdi4plants/Swate/commit/51928c0af9b5d5a39dbc54abbadc3aa81e8580f8)] Fix minor routing icon mismatch. + * [[#fdcb58c](https://github.com/nfdi4plants/Swate/commit/fdcb58c71ce624879448c4e86e2119b72bc877ae)] Fix minor white/lightgrey mix ups in filepicker view. + * [[#cc26e81](https://github.com/nfdi4plants/Swate/commit/cc26e81e895d7ec7fc7abef885e5d7afb4c0a7c2)] Fix bug overloading computers when creating an annotation table for whole rows (Issue #63). + * [[#1e5eb3d](https://github.com/nfdi4plants/Swate/commit/1e5eb3d6c2b0f2f0527d4843c8bc0addabdb0b04)] Fix reset of unit search input when unchecking (Issue #92). + * [[#474cf73](https://github.com/nfdi4plants/Swate/commit/474cf73cb48227d58e88d239e6e9e50e8676c78a)] Fix bug creating wrong TAN with insertTerm. + ### 0.2.0+899b535 (Released 2021-1-11) * Additions: * latest commit #899b535 diff --git a/SAFEOfficeAddInn.sln b/Swate.sln similarity index 94% rename from SAFEOfficeAddInn.sln rename to Swate.sln index 915d6a36..939ac4bc 100644 --- a/SAFEOfficeAddInn.sln +++ b/Swate.sln @@ -25,10 +25,6 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{A21844B3-2816-4F6F-B275-308DA4EC2B3E}" ProjectSection(SolutionItems) = preProject src\Client\public\favicon.png = src\Client\public\favicon.png - src\Client\public\assets\icon-16.png = src\Client\public\assets\icon-16.png - src\Client\public\assets\icon-32.png = src\Client\public\assets\icon-32.png - src\Client\public\assets\icon-80.png = src\Client\public\assets\icon-80.png - src\Client\public\assets\logo-filled.png = src\Client\public\assets\logo-filled.png EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{DB2C5A73-BF7F-45D5-AEC8-D36539C5C019}" @@ -63,7 +59,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{494903F3 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A7CCC606-3646-4F94-9F59-79C75E413344}" ProjectSection(SolutionItems) = preProject - tests\manifest.xml = tests\manifest.xml tests\test.cmd = tests\test.cmd tests\test.sh = tests\test.sh EndProjectSection diff --git a/build.fsx b/build.fsx index a1408273..dc9cb566 100644 --- a/build.fsx +++ b/build.fsx @@ -1,17 +1,35 @@ -#r "paket: groupref build //" +#r "paket: +nuget BlackFox.Fake.BuildTask +nuget Fake.Core.Target +nuget Fake.Core.Process +nuget Fake.Core.ReleaseNotes +nuget Fake.IO.FileSystem +nuget Fake.DotNet.Cli +nuget Fake.DotNet.MSBuild +nuget Fake.DotNet.AssemblyInfoFile +nuget Fake.DotNet.Paket +nuget Fake.DotNet.FSFormatting +nuget Fake.DotNet.Fsi +nuget Fake.DotNet.NuGet +nuget Fake.Api.Github +nuget Fake.DotNet.Testing.Expecto +nuget Fake.Extensions.Release +nuget Fake.Tools.Git // +" + +#if !FAKE #load "./.fake/build.fsx/intellisense.fsx" -#r "netstandard" - +#r "netstandard" // Temp fix for https://github.com/dotnet/fsharp/issues/5216 +#endif open System +open System.Text open Fake open Fake.Core open Fake.DotNet open Fake.IO open Fake.Api open Fake.Tools.Git -open Farmer -open Farmer.Builders Target.initEnvironment () @@ -354,18 +372,19 @@ Target.create "Release" (fun config -> let semVer = let opt = config.Context.Arguments + |> List.map (fun x -> x.ToLower()) |> List.tryFind (fun x -> x.StartsWith "semver:") match opt with - | Some "semver:major"| Some "semver:Major" -> + | Some "semver:major"-> Trace.trace "Increase major for next release notes." Major - | Some "semver:minor"| Some "semver:Minor" -> + | Some "semver:minor" -> Trace.trace "Increase minor for next release notes." Minor - | Some "semver:Patch"| Some "semver:patch" -> + | Some "semver:patch" -> Trace.trace "Increase patch for next release notes." Patch - | Some "semver:wip"| Some "semver:WIP" -> + | Some "semver:wip" -> Trace.trace "Add new commits to current release." WIP | Some x -> @@ -503,8 +522,6 @@ Target.create "Release" (fun config -> "RELEASE_NOTES.md" newNotes - writeNewReleaseNotes - Trace.trace "Update RELEASE_NOTES.md done!" Trace.trace "Update Version.fs" @@ -521,6 +538,35 @@ Target.create "Release" (fun config -> ] Trace.trace "Update Version.fs done!" + + /// Update maniefest.xmls + + Trace.trace "Update manifest.xml" + + let _ = + let newVer = sprintf "%i.%i.%i" newRelease.SemVer.Major newRelease.SemVer.Minor newRelease.SemVer.Patch + Shell.regexReplaceInFilesWithEncoding + "[0-9]+.[0-9]+.[0-9]+" + newVer + Encoding.UTF8 + [ + (Path.combine __SOURCE_DIRECTORY__ @".assets\assets\manifest.xml") + (Path.combine __SOURCE_DIRECTORY__ "manifest.xml") + ] + + Trace.trace "Update manifest.xml done!" +) + +Target.create "ZipAssets" (fun _ -> + + let assetPath = System.IO.Path.Combine(__SOURCE_DIRECTORY__,@".assets\assets") + let assetDir = Fake.IO.DirectoryInfo.ofPath assetPath + + let files = + let assetsPaths = Fake.IO.DirectoryInfo.getFiles assetDir + assetsPaths |> Array.map (fun x -> x.FullName) + + Zip.zip assetDir.FullName ".assets\swate.zip" files ) Target.create "GithubDraft" (fun config -> @@ -576,7 +622,6 @@ Target.create "GithubDraft" (fun config -> let release = ReleaseNotes.load "RELEASE_NOTES.md" let semVer = (sprintf "v%i.%i.%i" release.SemVer.Major release.SemVer.Minor release.SemVer.Patch) - let token = match Environment.environVarOrDefault "github_token" "", tokenOpt with | s, None when System.String.IsNullOrWhiteSpace s |> not -> s @@ -591,6 +636,7 @@ Target.create "GithubDraft" (fun config -> let files = let assetPath = System.IO.Path.Combine(__SOURCE_DIRECTORY__,@".assets") let assetDir = Fake.IO.DirectoryInfo.ofPath assetPath + /// This only accesses files and not folders. So in this case it will only access the .zip file created by "ZipAssets" let assetsPaths = Fake.IO.DirectoryInfo.getFiles assetDir assetsPaths |> Array.map (fun x -> x.FullName) @@ -605,40 +651,9 @@ Target.create "GithubDraft" (fun config -> |> Async.RunSynchronously Trace.trace "Draft successfully created!" - //let responseCreate = - // FSharp.Data.Http.RequestString - // ( "https://api.github.com/repos/nfdi4plants/Swate/releases", - // headers = [ - // "accept", "application/vnd.github.v3+json"; - // "User-Agent", "Swate"; - // "Authorization", sprintf "token 5da68a1d1bdd09413f47b4ecdfd6911d641d7a93" - // ], - // body = FSharp.Data.HttpRequestBody.TextRequest textRequestBody - // ) - //Trace.trace "Draft successfully created!" - - //let upLink = - // let pattern = "\"upload_url\":\"[a-z]+://[a-zA-Z./0-9]+" - // System.Text.RegularExpressions.Regex.Match(responseCreate,pattern) - // |> fun x -> x.Value.Replace("\"upload_url\":","").Replace("\"","") - - //let uploadResponse = - // let readInZipAsBinary = - // let path = System.IO.Path.Combine(__SOURCE_DIRECTORY__,@".assets\swate.zip") - // System.IO.File.ReadAllBytes(path) - // FSharp.Data.Http.RequestString - // ( upLink, - // query = ["name","swate.zip"; "label","Swate"], - // headers = [ - // "accept", "application/vnd.github.v3+json"; - // "User-Agent", "Swate"; - // "Authorization", sprintf "token 5da68a1d1bdd09413f47b4ecdfd6911d641d7a93" - // "Content-Type", "application\zip" - // ], - // body = FSharp.Data.HttpRequestBody.BinaryUpload readInZipAsBinary - // ) ) + Target.create "Bundle" (fun _ -> runDotNet (sprintf "publish -c Release -o \"%s\"" deployDir) serverPath npm "run build" "." @@ -691,6 +706,9 @@ open Fake.Core.TargetOperators "IsExistingReleaseNotes" ==> "Release" +"ZipAssets" + ==> "GithubDraft" + "InstallOfficeAddinTooling" ==> "WebpackConfigSetup" ==> "LocalConnectionStringSetup" diff --git a/build.fsx.lock b/build.fsx.lock index 087f2999..95f2765b 100644 --- a/build.fsx.lock +++ b/build.fsx.lock @@ -8,7 +8,7 @@ NUGET BlackFox.VsWhere (1.1) FSharp.Core (>= 4.2.3) Microsoft.Win32.Registry (>= 4.7) - Fake.Api.Github (5.20.3) + Fake.Api.GitHub (5.20.3) FSharp.Core (>= 4.7.2) Octokit (>= 0.48) Fake.Core.CommandLineParsing (5.20.3) @@ -125,9 +125,22 @@ NUGET Fake.IO.FileSystem (>= 5.20.3) Fake.Testing.Common (>= 5.20.3) FSharp.Core (>= 4.7.2) + Fake.Extensions.Release (0.2) + Fake.Api.GitHub (>= 5.20.3) + Fake.Core.ReleaseNotes (>= 5.20.3) + Fake.Core.Target (>= 5.20.3) + Fake.DotNet.AssemblyInfoFile (>= 5.20.3) + Fake.IO.FileSystem (>= 5.20.3) + Fake.IO.Zip (>= 5.20.3) + Fake.Tools.Git (>= 5.20.3) + FSharp.Core (>= 5.0) Fake.IO.FileSystem (5.20.3) Fake.Core.String (>= 5.20.3) FSharp.Core (>= 4.7.2) + Fake.IO.Zip (5.20.3) + Fake.Core.String (>= 5.20.3) + Fake.IO.FileSystem (>= 5.20.3) + FSharp.Core (>= 4.7.2) Fake.Net.Http (5.20.3) Fake.Core.Trace (>= 5.20.3) FSharp.Core (>= 4.7.2) @@ -142,106 +155,164 @@ NUGET Fake.Core.Trace (>= 5.20.3) Fake.IO.FileSystem (>= 5.20.3) FSharp.Core (>= 4.7.2) - Farmer (1.1.1) - FSharp.Core (>= 4.7.1) - Newtonsoft.Json (>= 12.0.2) FParsec (1.1.1) FSharp.Core (>= 4.3.4) - FSharp.Compiler.Service (37.0) - FSharp.Core (>= 4.6.2) + FSharp.Compiler.Service (38.0.2) + FSharp.Core (5.0) Microsoft.Build.Framework (>= 16.6) Microsoft.Build.Tasks.Core (>= 16.6) Microsoft.Build.Utilities.Core (>= 16.6) - System.Buffers (>= 4.5) + System.Buffers (>= 4.5.1) System.Collections.Immutable (>= 1.5) - System.Memory (>= 4.5.3) + System.Diagnostics.Process (>= 4.3) + System.Diagnostics.TraceSource (>= 4.3) + System.Linq.Expressions (>= 4.3) + System.Linq.Queryable (>= 4.3) + System.Memory (>= 4.5.4) + System.Net.Requests (>= 4.3) + System.Net.Security (>= 4.3) System.Reflection.Emit (>= 4.3) System.Reflection.Metadata (>= 1.6) System.Reflection.TypeExtensions (>= 4.3) - System.Runtime.Loader (>= 4.0) - FSharp.Control.Reactive (4.4.2) + System.Runtime (>= 4.3) + System.Runtime.InteropServices (>= 4.3) + System.Runtime.Loader (>= 4.3) + System.Security.Claims (>= 4.3) + System.Security.Cryptography.Algorithms (>= 4.3) + System.Security.Principal (>= 4.3) + System.Threading.Tasks.Parallel (>= 4.3) + System.Threading.Thread (>= 4.3) + System.Threading.ThreadPool (>= 4.3) + FSharp.Control.Reactive (4.5) FSharp.Core (>= 4.7.2) System.Reactive (>= 4.4.1) - FSharp.Core (4.7.2) - Microsoft.Build (16.7) - Microsoft.Build.Framework (16.7) + FSharp.Core (5.0) + Microsoft.Build (16.8) + Microsoft.Build.Framework (16.8) System.Security.Permissions (>= 4.7) - Microsoft.Build.Tasks.Core (16.7) - Microsoft.Build.Framework (>= 16.7) - Microsoft.Build.Utilities.Core (>= 16.7) + Microsoft.Build.Tasks.Core (16.8) + Microsoft.Build.Framework (>= 16.8) + Microsoft.Build.Utilities.Core (>= 16.8) Microsoft.Win32.Registry (>= 4.3) System.CodeDom (>= 4.4) System.Collections.Immutable (>= 1.5) System.Reflection.Metadata (>= 1.6) System.Reflection.TypeExtensions (>= 4.1) System.Resources.Extensions (>= 4.6) + System.Runtime.InteropServices (>= 4.3) + System.Security.Cryptography.Pkcs (>= 4.7) + System.Security.Cryptography.Xml (>= 4.7) System.Security.Permissions (>= 4.7) System.Threading.Tasks.Dataflow (>= 4.9) - Microsoft.Build.Tasks.Git (1.0) - Microsoft.Build.Utilities.Core (16.7) - Microsoft.Build.Framework (>= 16.7) + Microsoft.Build.Utilities.Core (16.8) + Microsoft.Build.Framework (>= 16.8) Microsoft.Win32.Registry (>= 4.3) System.Collections.Immutable (>= 1.5) System.Security.Permissions (>= 4.7) System.Text.Encoding.CodePages (>= 4.0.1) - Microsoft.NETCore.Platforms (3.1.3) - Microsoft.NETCore.Targets (3.1) - Microsoft.SourceLink.Common (1.0) - Microsoft.SourceLink.GitHub (1.0) - Microsoft.Build.Tasks.Git (>= 1.0) - Microsoft.SourceLink.Common (>= 1.0) + Microsoft.NETCore.Platforms (5.0) + Microsoft.NETCore.Targets (5.0) Microsoft.Win32.Primitives (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) - Microsoft.Win32.Registry (4.7) - System.Buffers (>= 4.5) - System.Memory (>= 4.5.3) - System.Security.AccessControl (>= 4.7) - System.Security.Principal.Windows (>= 4.7) + Microsoft.Win32.Registry (5.0) + System.Buffers (>= 4.5.1) + System.Memory (>= 4.5.4) + System.Security.AccessControl (>= 5.0) + System.Security.Principal.Windows (>= 5.0) Mono.Posix.NETStandard (1.0) - MSBuild.StructuredLogger (2.1.176) + MSBuild.StructuredLogger (2.1.303) Microsoft.Build (>= 16.4) Microsoft.Build.Framework (>= 16.4) Microsoft.Build.Tasks.Core (>= 16.4) Microsoft.Build.Utilities.Core (>= 16.4) - Microsoft.SourceLink.GitHub (>= 1.0) Newtonsoft.Json (12.0.3) - NuGet.Common (5.7) - NuGet.Frameworks (>= 5.7) - System.Diagnostics.Process (>= 4.3) - System.Threading.Thread (>= 4.3) - NuGet.Configuration (5.7) - NuGet.Common (>= 5.7) - System.Security.Cryptography.ProtectedData (>= 4.3) - NuGet.Frameworks (5.7) - NuGet.Packaging (5.7) + NuGet.Common (5.8.1) + NuGet.Frameworks (>= 5.8.1) + NuGet.Configuration (5.8.1) + NuGet.Common (>= 5.8.1) + System.Security.Cryptography.ProtectedData (>= 4.4) + NuGet.Frameworks (5.8.1) + NuGet.Packaging (5.8.1) Newtonsoft.Json (>= 9.0.1) - NuGet.Configuration (>= 5.7) - NuGet.Versioning (>= 5.7) - System.Dynamic.Runtime (>= 4.3) - System.Security.Cryptography.Cng (>= 5.0.0-preview.3.20214.6) - System.Security.Cryptography.Pkcs (>= 5.0.0-preview.3.20214.6) - NuGet.Protocol (5.7) - NuGet.Packaging (>= 5.7) - System.Dynamic.Runtime (>= 4.3) - NuGet.Versioning (5.7) + NuGet.Configuration (>= 5.8.1) + NuGet.Versioning (>= 5.8.1) + System.Security.Cryptography.Cng (>= 5.0) + System.Security.Cryptography.Pkcs (>= 5.0) + NuGet.Protocol (5.8.1) + NuGet.Packaging (>= 5.8.1) + NuGet.Versioning (5.8.1) Octokit (0.48) + runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) + runtime.debian.9-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) + runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) + runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) + runtime.fedora.27-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) + runtime.fedora.28-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) runtime.native.System (4.3.1) Microsoft.NETCore.Platforms (>= 1.1.1) Microsoft.NETCore.Targets (>= 1.1.3) + runtime.native.System.Net.Http (4.3.1) + Microsoft.NETCore.Platforms (>= 1.1.1) + Microsoft.NETCore.Targets (>= 1.1.3) + runtime.native.System.Net.Security (4.3.1) + Microsoft.NETCore.Platforms (>= 1.1.1) + Microsoft.NETCore.Targets (>= 1.1.3) + runtime.native.System.Security.Cryptography.Apple (4.3.1) + runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple (>= 4.3.1) + runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) + runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) + runtime.debian.9-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) + runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) + runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) + runtime.fedora.27-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) + runtime.fedora.28-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) + runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) + runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) + runtime.opensuse.42.3-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) + runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) + runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) + runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) + runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) + runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) + runtime.ubuntu.18.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.3) + runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) + runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) + runtime.opensuse.42.3-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) + runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple (4.3.1) + runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) + runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) + runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) + runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) + runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) + runtime.ubuntu.18.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3) System.Buffers (4.5.1) - System.CodeDom (4.7) + System.CodeDom (5.0) System.Collections (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) - System.Collections.Immutable (1.7.1) + System.Collections.Concurrent (4.3) + System.Collections (>= 4.3) + System.Diagnostics.Debug (>= 4.3) + System.Diagnostics.Tracing (>= 4.3) + System.Globalization (>= 4.3) + System.Reflection (>= 4.3) + System.Resources.ResourceManager (>= 4.3) + System.Runtime (>= 4.3) + System.Runtime.Extensions (>= 4.3) + System.Threading (>= 4.3) + System.Threading.Tasks (>= 4.3) + System.Collections.Immutable (5.0) System.Memory (>= 4.5.4) System.Diagnostics.Debug (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) + System.Diagnostics.DiagnosticSource (5.0.1) + System.Memory (>= 4.5.4) + System.Runtime.CompilerServices.Unsafe (>= 5.0) System.Diagnostics.Process (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.Win32.Primitives (>= 4.3) @@ -264,28 +335,39 @@ NUGET System.Threading.Tasks (>= 4.3) System.Threading.Thread (>= 4.3) System.Threading.ThreadPool (>= 4.3) - System.Dynamic.Runtime (4.3) + System.Diagnostics.TraceSource (4.3) + Microsoft.NETCore.Platforms (>= 1.1) + runtime.native.System (>= 4.3) System.Collections (>= 4.3) System.Diagnostics.Debug (>= 4.3) - System.Linq (>= 4.3) - System.Linq.Expressions (>= 4.3) - System.ObjectModel (>= 4.3) - System.Reflection (>= 4.3) - System.Reflection.Emit (>= 4.3) - System.Reflection.Emit.ILGeneration (>= 4.3) - System.Reflection.Primitives (>= 4.3) - System.Reflection.TypeExtensions (>= 4.3) + System.Globalization (>= 4.3) System.Resources.ResourceManager (>= 4.3) System.Runtime (>= 4.3) System.Runtime.Extensions (>= 4.3) System.Threading (>= 4.3) - System.Formats.Asn1 (5.0.0-preview.8.20407.11) + System.Diagnostics.Tracing (4.3) + Microsoft.NETCore.Platforms (>= 1.1) + Microsoft.NETCore.Targets (>= 1.1) + System.Runtime (>= 4.3) + System.Formats.Asn1 (5.0) System.Buffers (>= 4.5.1) System.Memory (>= 4.5.4) System.Globalization (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) + System.Globalization.Calendars (4.3) + Microsoft.NETCore.Platforms (>= 1.1) + Microsoft.NETCore.Targets (>= 1.1) + System.Globalization (>= 4.3) + System.Runtime (>= 4.3) + System.Globalization.Extensions (4.3) + Microsoft.NETCore.Platforms (>= 1.1) + System.Globalization (>= 4.3) + System.Resources.ResourceManager (>= 4.3) + System.Runtime (>= 4.3) + System.Runtime.Extensions (>= 4.3) + System.Runtime.InteropServices (>= 4.3) System.IO (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) @@ -327,10 +409,99 @@ NUGET System.Runtime (>= 4.3) System.Runtime.Extensions (>= 4.3) System.Threading (>= 4.3) + System.Linq.Queryable (4.3) + System.Collections (>= 4.3) + System.Diagnostics.Debug (>= 4.3) + System.Linq (>= 4.3) + System.Linq.Expressions (>= 4.3) + System.Reflection (>= 4.3) + System.Reflection.Extensions (>= 4.3) + System.Resources.ResourceManager (>= 4.3) + System.Runtime (>= 4.3) System.Memory (4.5.4) System.Buffers (>= 4.5.1) System.Numerics.Vectors (>= 4.4) System.Runtime.CompilerServices.Unsafe (>= 4.5.3) + System.Net.Http (4.3.4) + Microsoft.NETCore.Platforms (>= 1.1.1) + runtime.native.System (>= 4.3) + runtime.native.System.Net.Http (>= 4.3) + runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.2) + System.Collections (>= 4.3) + System.Diagnostics.Debug (>= 4.3) + System.Diagnostics.DiagnosticSource (>= 4.3) + System.Diagnostics.Tracing (>= 4.3) + System.Globalization (>= 4.3) + System.Globalization.Extensions (>= 4.3) + System.IO (>= 4.3) + System.IO.FileSystem (>= 4.3) + System.Net.Primitives (>= 4.3) + System.Resources.ResourceManager (>= 4.3) + System.Runtime (>= 4.3) + System.Runtime.Extensions (>= 4.3) + System.Runtime.Handles (>= 4.3) + System.Runtime.InteropServices (>= 4.3) + System.Security.Cryptography.Algorithms (>= 4.3) + System.Security.Cryptography.Encoding (>= 4.3) + System.Security.Cryptography.OpenSsl (>= 4.3) + System.Security.Cryptography.Primitives (>= 4.3) + System.Security.Cryptography.X509Certificates (>= 4.3) + System.Text.Encoding (>= 4.3) + System.Threading (>= 4.3) + System.Threading.Tasks (>= 4.3) + System.Net.Primitives (4.3.1) + Microsoft.NETCore.Platforms (>= 1.1.1) + Microsoft.NETCore.Targets (>= 1.1.3) + System.Runtime (>= 4.3.1) + System.Runtime.Handles (>= 4.3) + System.Net.Requests (4.3) + Microsoft.NETCore.Platforms (>= 1.1) + System.Collections (>= 4.3) + System.Diagnostics.Debug (>= 4.3) + System.Diagnostics.Tracing (>= 4.3) + System.Globalization (>= 4.3) + System.IO (>= 4.3) + System.Net.Http (>= 4.3) + System.Net.Primitives (>= 4.3) + System.Net.WebHeaderCollection (>= 4.3) + System.Resources.ResourceManager (>= 4.3) + System.Runtime (>= 4.3) + System.Threading (>= 4.3) + System.Threading.Tasks (>= 4.3) + System.Net.Security (4.3.2) + Microsoft.NETCore.Platforms (>= 1.1) + Microsoft.Win32.Primitives (>= 4.3) + runtime.native.System (>= 4.3) + runtime.native.System.Net.Security (>= 4.3) + runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.2) + System.Collections (>= 4.3) + System.Collections.Concurrent (>= 4.3) + System.Diagnostics.Tracing (>= 4.3) + System.Globalization (>= 4.3) + System.Globalization.Extensions (>= 4.3) + System.IO (>= 4.3) + System.Net.Primitives (>= 4.3) + System.Resources.ResourceManager (>= 4.3) + System.Runtime (>= 4.3) + System.Runtime.Extensions (>= 4.3) + System.Runtime.Handles (>= 4.3) + System.Runtime.InteropServices (>= 4.3) + System.Security.Claims (>= 4.3) + System.Security.Cryptography.Algorithms (>= 4.3) + System.Security.Cryptography.Encoding (>= 4.3) + System.Security.Cryptography.OpenSsl (>= 4.3) + System.Security.Cryptography.Primitives (>= 4.3) + System.Security.Cryptography.X509Certificates (>= 4.3) + System.Security.Principal (>= 4.3) + System.Text.Encoding (>= 4.3) + System.Threading (>= 4.3) + System.Threading.Tasks (>= 4.3) + System.Threading.ThreadPool (>= 4.3) + System.Net.WebHeaderCollection (4.3) + System.Collections (>= 4.3) + System.Resources.ResourceManager (>= 4.3) + System.Runtime (>= 4.3) + System.Runtime.Extensions (>= 4.3) System.Numerics.Vectors (4.5) System.ObjectModel (4.3) System.Collections (>= 4.3) @@ -338,7 +509,7 @@ NUGET System.Resources.ResourceManager (>= 4.3) System.Runtime (>= 4.3) System.Threading (>= 4.3) - System.Reactive (4.4.1) + System.Reactive (5.0) System.Runtime.InteropServices.WindowsRuntime (>= 4.3) System.Threading.Tasks.Extensions (>= 4.5.4) System.Reflection (4.3) @@ -357,14 +528,14 @@ NUGET Microsoft.NETCore.Targets (>= 1.1) System.Reflection (>= 4.3) System.Runtime (>= 4.3) - System.Reflection.Metadata (1.8.1) - System.Collections.Immutable (>= 1.7.1) + System.Reflection.Metadata (5.0) + System.Collections.Immutable (>= 5.0) System.Reflection.Primitives (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) System.Reflection.TypeExtensions (4.7) - System.Resources.Extensions (4.7.1) + System.Resources.Extensions (5.0) System.Memory (>= 4.5.4) System.Resources.ResourceManager (4.3) Microsoft.NETCore.Platforms (>= 1.1) @@ -375,7 +546,7 @@ NUGET System.Runtime (4.3.1) Microsoft.NETCore.Platforms (>= 1.1.1) Microsoft.NETCore.Targets (>= 1.1.3) - System.Runtime.CompilerServices.Unsafe (4.7.1) + System.Runtime.CompilerServices.Unsafe (5.0) System.Runtime.Extensions (4.3.1) Microsoft.NETCore.Platforms (>= 1.1.1) Microsoft.NETCore.Targets (>= 1.1.3) @@ -397,25 +568,121 @@ NUGET System.IO (>= 4.3) System.Reflection (>= 4.3) System.Runtime (>= 4.3) - System.Security.AccessControl (4.7) - System.Security.Principal.Windows (>= 4.7) - System.Security.Cryptography.Cng (5.0.0-preview.8.20407.11) - System.Security.Cryptography.Pkcs (5.0.0-preview.8.20407.11) + System.Runtime.Numerics (4.3) + System.Globalization (>= 4.3) + System.Resources.ResourceManager (>= 4.3) + System.Runtime (>= 4.3) + System.Runtime.Extensions (>= 4.3) + System.Security.AccessControl (5.0) + System.Security.Principal.Windows (>= 5.0) + System.Security.Claims (4.3) + System.Collections (>= 4.3) + System.Globalization (>= 4.3) + System.IO (>= 4.3) + System.Resources.ResourceManager (>= 4.3) + System.Runtime (>= 4.3) + System.Runtime.Extensions (>= 4.3) + System.Security.Principal (>= 4.3) + System.Security.Cryptography.Algorithms (4.3.1) + Microsoft.NETCore.Platforms (>= 1.1) + runtime.native.System.Security.Cryptography.Apple (>= 4.3.1) + runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.2) + System.Collections (>= 4.3) + System.IO (>= 4.3) + System.Resources.ResourceManager (>= 4.3) + System.Runtime (>= 4.3) + System.Runtime.Extensions (>= 4.3) + System.Runtime.Handles (>= 4.3) + System.Runtime.InteropServices (>= 4.3) + System.Runtime.Numerics (>= 4.3) + System.Security.Cryptography.Encoding (>= 4.3) + System.Security.Cryptography.Primitives (>= 4.3) + System.Text.Encoding (>= 4.3) + System.Security.Cryptography.Cng (5.0) + System.Security.Cryptography.Csp (4.3) + Microsoft.NETCore.Platforms (>= 1.1) + System.IO (>= 4.3) + System.Reflection (>= 4.3) + System.Resources.ResourceManager (>= 4.3) + System.Runtime (>= 4.3) + System.Runtime.Extensions (>= 4.3) + System.Runtime.Handles (>= 4.3) + System.Runtime.InteropServices (>= 4.3) + System.Security.Cryptography.Algorithms (>= 4.3) + System.Security.Cryptography.Encoding (>= 4.3) + System.Security.Cryptography.Primitives (>= 4.3) + System.Text.Encoding (>= 4.3) + System.Threading (>= 4.3) + System.Security.Cryptography.Encoding (4.3) + Microsoft.NETCore.Platforms (>= 1.1) + runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3) + System.Collections (>= 4.3) + System.Collections.Concurrent (>= 4.3) + System.Linq (>= 4.3) + System.Resources.ResourceManager (>= 4.3) + System.Runtime (>= 4.3) + System.Runtime.Extensions (>= 4.3) + System.Runtime.Handles (>= 4.3) + System.Runtime.InteropServices (>= 4.3) + System.Security.Cryptography.Primitives (>= 4.3) + System.Text.Encoding (>= 4.3) + System.Security.Cryptography.OpenSsl (5.0) + System.Security.Cryptography.Pkcs (5.0.1) System.Buffers (>= 4.5.1) - System.Formats.Asn1 (>= 5.0.0-preview.8.20407.11) + System.Formats.Asn1 (>= 5.0) System.Memory (>= 4.5.4) - System.Security.Cryptography.Cng (>= 5.0.0-preview.8.20407.11) - System.Security.Cryptography.ProtectedData (4.7) - System.Memory (>= 4.5.3) - System.Security.Permissions (4.7) - System.Security.AccessControl (>= 4.7) - System.Security.Principal.Windows (4.7) + System.Security.Cryptography.Cng (>= 5.0) + System.Security.Cryptography.Primitives (4.3) + System.Diagnostics.Debug (>= 4.3) + System.Globalization (>= 4.3) + System.IO (>= 4.3) + System.Resources.ResourceManager (>= 4.3) + System.Runtime (>= 4.3) + System.Threading (>= 4.3) + System.Threading.Tasks (>= 4.3) + System.Security.Cryptography.ProtectedData (5.0) + System.Memory (>= 4.5.4) + System.Security.Cryptography.X509Certificates (4.3.2) + Microsoft.NETCore.Platforms (>= 1.1) + runtime.native.System (>= 4.3) + runtime.native.System.Net.Http (>= 4.3) + runtime.native.System.Security.Cryptography.OpenSsl (>= 4.3.2) + System.Collections (>= 4.3) + System.Diagnostics.Debug (>= 4.3) + System.Globalization (>= 4.3) + System.Globalization.Calendars (>= 4.3) + System.IO (>= 4.3) + System.IO.FileSystem (>= 4.3) + System.IO.FileSystem.Primitives (>= 4.3) + System.Resources.ResourceManager (>= 4.3) + System.Runtime (>= 4.3) + System.Runtime.Extensions (>= 4.3) + System.Runtime.Handles (>= 4.3) + System.Runtime.InteropServices (>= 4.3) + System.Runtime.Numerics (>= 4.3) + System.Security.Cryptography.Algorithms (>= 4.3) + System.Security.Cryptography.Cng (>= 4.3) + System.Security.Cryptography.Csp (>= 4.3) + System.Security.Cryptography.Encoding (>= 4.3) + System.Security.Cryptography.OpenSsl (>= 4.3) + System.Security.Cryptography.Primitives (>= 4.3) + System.Text.Encoding (>= 4.3) + System.Threading (>= 4.3) + System.Security.Cryptography.Xml (5.0) + System.Memory (>= 4.5.4) + System.Security.Cryptography.Pkcs (>= 5.0) + System.Security.Permissions (>= 5.0) + System.Security.Permissions (5.0) + System.Security.AccessControl (>= 5.0) + System.Security.Principal (4.3) + System.Runtime (>= 4.3) + System.Security.Principal.Windows (5.0) System.Text.Encoding (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) - System.Text.Encoding.CodePages (4.7.1) - System.Runtime.CompilerServices.Unsafe (>= 4.7.1) + System.Text.Encoding.CodePages (5.0) + System.Runtime.CompilerServices.Unsafe (>= 5.0) System.Text.Encoding.Extensions (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) @@ -428,9 +695,18 @@ NUGET Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) System.Runtime (>= 4.3) - System.Threading.Tasks.Dataflow (4.11.1) + System.Threading.Tasks.Dataflow (5.0) System.Threading.Tasks.Extensions (4.5.4) System.Runtime.CompilerServices.Unsafe (>= 4.5.3) + System.Threading.Tasks.Parallel (4.3) + System.Collections.Concurrent (>= 4.3) + System.Diagnostics.Debug (>= 4.3) + System.Diagnostics.Tracing (>= 4.3) + System.Resources.ResourceManager (>= 4.3) + System.Runtime (>= 4.3) + System.Runtime.Extensions (>= 4.3) + System.Threading (>= 4.3) + System.Threading.Tasks (>= 4.3) System.Threading.Thread (4.3) System.Runtime (>= 4.3) System.Threading.ThreadPool (4.3) diff --git a/manifest.xml b/manifest.xml index dd819e94..5e559a98 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,13 +1,13 @@ - + 5d6f5462-3401-48ec-9406-d12882e9ad83 - 1.0.0.0 + 0.3.0 Computational Systems Biology en-US - - - - + + + + bio.uni-kl.de @@ -30,8 +30,8 @@ - -