Skip to content

Commit 894232e

Browse files
committed
Merge branch 'main' into develop
Signed-off-by: Victor Chang <[email protected]>
2 parents 1557f2d + 13bb998 commit 894232e

File tree

16 files changed

+290
-77
lines changed

16 files changed

+290
-77
lines changed

.github/workflows/build.yml

+15
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,21 @@ jobs:
227227
separator: "/"
228228
msg: ${{ github.repository }}
229229

230+
- name: Unzip docs
231+
if: ${{ contains(github.ref, 'refs/heads/main') }}
232+
run: |
233+
mkdir userguide
234+
unzip artifacts/mwm-docs-${{ env.SEMVER }}.zip -d userguide/
235+
ls -lR userguide/
236+
237+
- name: Deploy Docs
238+
uses: peaceiris/actions-gh-pages@v4
239+
if: ${{ contains(github.ref, 'refs/heads/main') }}
240+
with:
241+
github_token: ${{ secrets.GITHUB_TOKEN }}
242+
publish_dir: userguide/
243+
publish_branch: docs
244+
230245
- name: Install GitReleaseManager
231246
uses: gittools/actions/gitreleasemanager/[email protected]
232247
with:

docs/compliance/third-party-licenses.md

+219-21
Original file line numberDiff line numberDiff line change
@@ -3755,6 +3755,8 @@ specific language governing permissions and limitations under the License.
37553755

37563756

37573757
```
3758+
The MIT License (MIT)
3759+
37583760
Copyright (c) .NET Foundation and Contributors
37593761

37603762
All rights reserved.
@@ -5340,7 +5342,7 @@ SOFTWARE.
53405342
<details>
53415343
<summary>Microsoft.Extensions.DependencyModel 8.0.2</summary>
53425344

5343-
## Microsoft.Extensions.DependencyModel
5345+
## Microsoft.Extensions.Diagnostics
53445346

53455347
- Version: 8.0.2
53465348
- Authors: Microsoft
@@ -7100,7 +7102,7 @@ SOFTWARE.
71007102
<details>
71017103
<summary>Microsoft.Extensions.Primitives 8.0.0</summary>
71027104

7103-
## Microsoft.Extensions.Primitives
7105+
## Microsoft.Extensions.Options.ConfigurationExtensions
71047106

71057107
- Version: 8.0.0
71067108
- Authors: Microsoft
@@ -12318,7 +12320,7 @@ Contact
1231812320

1231912321
## Microsoft.OpenApi
1232012322

12321-
- Version: 1.2.3
12323+
- Version: 1.6.14
1232212324
- Authors: Microsoft
1232312325
- Project URL: https://github.com/Microsoft/OpenAPI.NET
1232412326
- Source: [NuGet](https://www.nuget.org/packages/Microsoft.OpenApi/1.2.3)
@@ -17195,8 +17197,9 @@ Apache License
1719517197
limitations under the License.
1719617198
```
1719717199

17198-
</details>
17200+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1719917201

17202+
1. Definitions.
1720017203

1720117204
<details>
1720217205
<summary>MongoDB.Bson 2.30.0</summary>
@@ -17209,6 +17212,8 @@ Apache License
1720917212
- Source: [NuGet](https://www.nuget.org/packages/MongoDB.Bson/2.30.0)
1721017213
- License: [Apache-2.0](https://raw.githubusercontent.com/mongodb/mongo-csharp-driver/master/LICENSE.md)
1721117214

17215+
"You" (or "Your") shall mean an individual or Legal Entity
17216+
exercising permissions granted by this License.
1721217217

1721317218
```
1721417219
Apache License
@@ -24710,15 +24715,15 @@ SOFTWARE.
2471024715

2471124716

2471224717
<details>
24713-
<summary>Swashbuckle.AspNetCore 6.5.0</summary>
24718+
<summary>Swashbuckle.AspNetCore 6.6.2</summary>
2471424719

2471524720
## Swashbuckle.AspNetCore
2471624721

24717-
- Version: 6.5.0
24718-
- Authors: Swashbuckle.AspNetCore
24719-
- Owners: Swashbuckle.AspNetCore
24722+
- Version: 6.6.2
24723+
- Authors: domaindrivendev
24724+
- Owners: domaindrivendev
2472024725
- Project URL: https://github.com/domaindrivendev/Swashbuckle.AspNetCore
24721-
- Source: [NuGet](https://www.nuget.org/packages/Swashbuckle.AspNetCore/6.5.0)
24726+
- Source: [NuGet](https://www.nuget.org/packages/Swashbuckle.AspNetCore/6.6.2)
2472224727
- License: [MIT](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/raw/master/LICENSE)
2472324728

2472424729

@@ -24794,10 +24799,10 @@ SOFTWARE.
2479424799

2479524800
## Swashbuckle.AspNetCore.Swagger
2479624801

24797-
- Version: 6.5.0
24798-
- Authors: Swashbuckle.AspNetCore.Swagger
24802+
- Version: 6.6.2
24803+
- Authors: domaindrivendev
2479924804
- Project URL: https://github.com/domaindrivendev/Swashbuckle.AspNetCore
24800-
- Source: [NuGet](https://www.nuget.org/packages/Swashbuckle.AspNetCore.Swagger/6.5.0)
24805+
- Source: [NuGet](https://www.nuget.org/packages/Swashbuckle.AspNetCore.Swagger/6.6.2)
2480124806
- License: [MIT](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/raw/master/LICENSE)
2480224807

2480324808

@@ -24872,10 +24877,10 @@ SOFTWARE.
2487224877

2487324878
## Swashbuckle.AspNetCore.SwaggerGen
2487424879

24875-
- Version: 6.5.0
24876-
- Authors: Swashbuckle.AspNetCore.SwaggerGen
24880+
- Version: 6.6.2
24881+
- Authors: domaindrivendev
2487724882
- Project URL: https://github.com/domaindrivendev/Swashbuckle.AspNetCore
24878-
- Source: [NuGet](https://www.nuget.org/packages/Swashbuckle.AspNetCore.SwaggerGen/6.5.0)
24883+
- Source: [NuGet](https://www.nuget.org/packages/Swashbuckle.AspNetCore.SwaggerGen/6.6.2)
2487924884
- License: [MIT](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/raw/master/LICENSE)
2488024885

2488124886

@@ -24950,10 +24955,10 @@ SOFTWARE.
2495024955

2495124956
## Swashbuckle.AspNetCore.SwaggerUI
2495224957

24953-
- Version: 6.5.0
24954-
- Authors: Swashbuckle.AspNetCore.SwaggerUI
24958+
- Version: 6.6.2
24959+
- Authors: domaindrivendev
2495524960
- Project URL: https://github.com/domaindrivendev/Swashbuckle.AspNetCore
24956-
- Source: [NuGet](https://www.nuget.org/packages/Swashbuckle.AspNetCore.SwaggerUI/6.5.0)
24961+
- Source: [NuGet](https://www.nuget.org/packages/Swashbuckle.AspNetCore.SwaggerUI/6.6.2)
2495724962
- License: [MIT](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/raw/master/LICENSE)
2495824963

2495924964

@@ -36417,14 +36422,14 @@ SOFTWARE.
3641736422

3641836423

3641936424
<details>
36420-
<summary>System.Diagnostics.DiagnosticSource 6.0.0</summary>
36425+
<summary>System.Diagnostics.DiagnosticSource 8.0.0</summary>
3642136426

3642236427
## System.Diagnostics.DiagnosticSource
3642336428

36424-
- Version: 6.0.0
36429+
- Version: 8.0.0
3642536430
- Authors: Microsoft
3642636431
- Project URL: https://dot.net/
36427-
- Source: [NuGet](https://www.nuget.org/packages/System.Diagnostics.DiagnosticSource/6.0.0)
36432+
- Source: [NuGet](https://www.nuget.org/packages/System.Diagnostics.DiagnosticSource/8.0.0)
3642836433
- License: [MIT](https://github.com/dotnet/runtime/raw/main/LICENSE.TXT)
3642936434

3643036435

@@ -106401,6 +106406,199 @@ SOFTWARE.
106401106406

106402106407

106403106408
```
106409+
Fellow Oak DICOM
106410+
106411+
Copyright (c) 2012-2021 fo-dicom contributors
106412+
106413+
This software is licensed under the Microsoft Public License (MS-PL)
106414+
106415+
Microsoft Public License (MS-PL)
106416+
106417+
This license governs use of the accompanying software. If you use the software, you
106418+
accept this license. If you do not accept the license, do not use the software.
106419+
106420+
1. Definitions
106421+
The terms "reproduce," "reproduction," "derivative works," and "distribution" have the
106422+
same meaning here as under U.S. copyright law.
106423+
A "contribution" is the original software, or any additions or changes to the software.
106424+
A "contributor" is any person that distributes its contribution under this license.
106425+
"Licensed patents" are a contributor's patent claims that read directly on its contribution.
106426+
106427+
2. Grant of Rights
106428+
(A) Copyright Grant- Subject to the terms of this license, including the license conditions
106429+
and limitations in section 3, each contributor grants you a non-exclusive, worldwide,
106430+
royalty-free copyright license to reproduce its contribution, prepare derivative works
106431+
of its contribution, and distribute its contribution or any derivative works that you create.
106432+
(B) Patent Grant- Subject to the terms of this license, including the license conditions and
106433+
limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free
106434+
license under its licensed patents to make, have made, use, sell, offer for sale, import,
106435+
and/or otherwise dispose of its contribution in the software or derivative works of the
106436+
contribution in the software.
106437+
106438+
3. Conditions and Limitations
106439+
(A) No Trademark License- This license does not grant you rights to use any contributors' name,
106440+
logo, or trademarks.
106441+
(B) If you bring a patent claim against any contributor over patents that you claim are infringed
106442+
by the software, your patent license from such contributor to the software ends automatically.
106443+
(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark,
106444+
and attribution notices that are present in the software.
106445+
(D) If you distribute any portion of the software in source code form, you may do so only under this
106446+
license by including a complete copy of this license with your distribution. If you distribute
106447+
any portion of the software in compiled or object code form, you may only do so under a license
106448+
that complies with this license.
106449+
(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express
106450+
warranties, guarantees or conditions. You may have additional consumer rights under your local
106451+
laws which this license cannot change. To the extent permitted under your local laws, the
106452+
contributors exclude the implied warranties of merchantability, fitness for a particular purpose
106453+
and non-infringement.
106454+
106455+
106456+
106457+
---- libijg (from DCMTK 3.5.4 COPYRIGHT) ----
106458+
106459+
Unless otherwise specified, the DCMTK software package has the
106460+
following copyright:
106461+
106462+
/*
106463+
* Copyright (C) 1994-2004, OFFIS
106464+
*
106465+
* This software and supporting documentation were developed by
106466+
*
106467+
* Kuratorium OFFIS e.V.
106468+
* Healthcare Information and Communication Systems
106469+
* Escherweg 2
106470+
* D-26121 Oldenburg, Germany
106471+
*
106472+
* THIS SOFTWARE IS MADE AVAILABLE, AS IS, AND OFFIS MAKES NO WARRANTY
106473+
* REGARDING THE SOFTWARE, ITS PERFORMANCE, ITS MERCHANTABILITY OR
106474+
* FITNESS FOR ANY PARTICULAR USE, FREEDOM FROM ANY COMPUTER DISEASES OR
106475+
* ITS CONFORMITY TO ANY SPECIFICATION. THE ENTIRE RISK AS TO QUALITY AND
106476+
* PERFORMANCE OF THE SOFTWARE IS WITH THE USER.
106477+
*
106478+
* Copyright of the software and supporting documentation is, unless
106479+
* otherwise stated, owned by OFFIS, and free access is hereby granted as
106480+
* a license to use this software, copy this software and prepare
106481+
* derivative works based upon this software. However, any distribution
106482+
* of this software source code or supporting documentation or derivative
106483+
* works (source code and supporting documentation) must include the
106484+
* three paragraphs of this copyright notice.
106485+
*
106486+
*/
106487+
106488+
The dcmjpeg sub-package includes an adapted version of the Independent JPEG
106489+
Group Toolkit Version 6b, which is contained in dcmjpeg/libijg8,
106490+
dcmjpeg/libijg12 and dcmjpeg/libijg16. This toolkit is covered by the
106491+
following copyright. The original README file for the Independent JPEG
106492+
Group Toolkit is located in dcmjpeg/docs/ijg_readme.txt.
106493+
106494+
/*
106495+
* The authors make NO WARRANTY or representation, either express or implied,
106496+
* with respect to this software, its quality, accuracy, merchantability, or
106497+
* fitness for a particular purpose. This software is provided "AS IS", and you,
106498+
* its user, assume the entire risk as to its quality and accuracy.
106499+
*
106500+
* This software is copyright (C) 1991-1998, Thomas G. Lane.
106501+
* All Rights Reserved except as specified below.
106502+
*
106503+
* Permission is hereby granted to use, copy, modify, and distribute this
106504+
* software (or portions thereof) for any purpose, without fee, subject to these
106505+
* conditions:
106506+
* (1) If any part of the source code for this software is distributed, then this
106507+
* README file must be included, with this copyright and no-warranty notice
106508+
* unaltered; and any additions, deletions, or changes to the original files
106509+
* must be clearly indicated in accompanying documentation.
106510+
* (2) If only executable code is distributed, then the accompanying
106511+
* documentation must state that "this software is based in part on the work of
106512+
* the Independent JPEG Group".
106513+
* (3) Permission for use of this software is granted only if the user accepts
106514+
* full responsibility for any undesirable consequences; the authors accept
106515+
* NO LIABILITY for damages of any kind.
106516+
*
106517+
* These conditions apply to any software derived from or based on the IJG code,
106518+
* not just to the unmodified library. If you use our work, you ought to
106519+
* acknowledge us.
106520+
*
106521+
* Permission is NOT granted for the use of any IJG author's name or company name
106522+
* in advertising or publicity relating to this software or products derived from
106523+
* it. This software may be referred to only as "the Independent JPEG Group's
106524+
* software".
106525+
*
106526+
* We specifically permit and encourage the use of this software as the basis of
106527+
* commercial products, provided that all warranty or liability claims are
106528+
* assumed by the product vendor.
106529+
*/
106530+
106531+
106532+
106533+
---- OpenJPEG JPEG 2000 codec (from license.txt) ----
106534+
106535+
/*
106536+
* Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
106537+
* Copyright (c) 2002-2007, Professor Benoit Macq
106538+
* Copyright (c) 2001-2003, David Janssens
106539+
* Copyright (c) 2002-2003, Yannick Verschueren
106540+
* Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
106541+
* Copyright (c) 2005, Herve Drolon, FreeImage Team
106542+
* All rights reserved.
106543+
*
106544+
* Redistribution and use in source and binary forms, with or without
106545+
* modification, are permitted provided that the following conditions
106546+
* are met:
106547+
* 1. Redistributions of source code must retain the above copyright
106548+
* notice, this list of conditions and the following disclaimer.
106549+
* 2. Redistributions in binary form must reproduce the above copyright
106550+
* notice, this list of conditions and the following disclaimer in the
106551+
* documentation and/or other materials provided with the distribution.
106552+
*
106553+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
106554+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
106555+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
106556+
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
106557+
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
106558+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
106559+
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
106560+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
106561+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
106562+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
106563+
* POSSIBILITY OF SUCH DAMAGE.
106564+
*/
106565+
106566+
106567+
106568+
---- CharLS JPEG-LS codec (from License.txt) ----
106569+
106570+
Copyright (c) 2007-2009, Jan de Vaan
106571+
All rights reserved.
106572+
106573+
Redistribution and use in source and binary forms, with or without
106574+
modification, are permitted provided that the following conditions are met:
106575+
106576+
* Redistributions of source code must retain the above copyright notice, this
106577+
list of conditions and the following disclaimer.
106578+
106579+
* Redistributions in binary form must reproduce the above copyright notice,
106580+
this list of conditions and the following disclaimer in the documentation
106581+
and/or other materials provided with the distribution.
106582+
106583+
* Neither the name of my employer, nor the names of its contributors may be
106584+
used to endorse or promote products derived from this software without
106585+
specific prior written permission.
106586+
106587+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
106588+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
106589+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
106590+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
106591+
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
106592+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
106593+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
106594+
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
106595+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
106596+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
106597+
106598+
106599+
106600+
---- Unity.IO.Compression (from LICENSE.TXT and PATENTS.TXT) ----
106601+
106404106602
The MIT License (MIT)
106405106603

106406106604
Copyright (c) 2018 Toni Solarin-Sodara

src/Common/Configuration/packages.lock.json

+5
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,11 @@
138138
"resolved": "13.0.3",
139139
"contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
140140
},
141+
"System.Diagnostics.DiagnosticSource": {
142+
"type": "Transitive",
143+
"resolved": "8.0.0",
144+
"contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ=="
145+
},
141146
"System.IO.Abstractions": {
142147
"type": "Transitive",
143148
"resolved": "21.3.1",

src/Common/Miscellaneous/packages.lock.json

+2-5
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,8 @@
198198
},
199199
"System.Diagnostics.DiagnosticSource": {
200200
"type": "Transitive",
201-
"resolved": "6.0.0",
202-
"contentHash": "frQDfv0rl209cKm1lnwTgFPzNigy2EKk1BS3uAvHvlBVKe5cymGyHO+Sj+NLv5VF/AhHsqPIUUwya5oV4CHMUw==",
203-
"dependencies": {
204-
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
205-
}
201+
"resolved": "8.0.0",
202+
"contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ=="
206203
},
207204
"System.IO.Abstractions": {
208205
"type": "Transitive",

src/TaskManager/API/packages.lock.json

+5
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,11 @@
437437
"System.Runtime": "4.3.0"
438438
}
439439
},
440+
"System.Diagnostics.DiagnosticSource": {
441+
"type": "Transitive",
442+
"resolved": "8.0.0",
443+
"contentHash": "c9xLpVz6PL9lp/djOWtk5KPDZq3cSYpmXoJQY524EOtuFl5z9ZtsotpsyrDW40U1DRnQSYvcPKEUV0X//u6gkQ=="
444+
},
440445
"System.Diagnostics.Tracing": {
441446
"type": "Transitive",
442447
"resolved": "4.1.0",

0 commit comments

Comments
 (0)