From 697c7fcd784af7c306a62fdb3706b82a25e22392 Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Tue, 8 Nov 2022 10:50:47 -0800 Subject: [PATCH] Refactor database projects to support multiple database types (#237) * gh-235 Refactor sqlite support to new projects * Set DB type for integration test Signed-off-by: Victor Chang --- .licenserc.yaml | 2 +- docs/compliance/third-party-licenses.md | 2562 ++++++++--------- .../InformaticsGatewayConfiguration.cs | 5 - .../Api/IDatabaseMigrationManager.cs} | 12 +- .../Api}/IInformaticsGatewayRepository.cs | 7 +- ...loy.InformaticsGateway.Database.Api.csproj | 40 + .../{ => Api}/StorageMetadataWrapper.cs | 4 +- ...formaticsGateway.Database.Api.Test.csproj} | 4 +- .../Test/StorageMetadataWrapperTest.cs | 4 +- src/Database/{ => Api}/Test/Usings.cs | 0 src/Database/DatabaseManager.cs | 52 + src/Database/DatabaseMigrationManager.cs | 35 + ...stinationApplicationEntityConfiguration.cs | 2 +- .../InferenceRequestConfiguration.cs | 2 +- .../MonaiApplicationEntityConfiguration.cs | 2 +- .../Configuration}/PayloadConfiguration.cs | 2 +- .../EntityFramework/Configuration/SR.cs | 28 + .../SourceApplicationEntityConfiguration.cs | 2 +- ...orageMetadataWrapperEntityConfiguration.cs | 3 +- .../EfDatabaseMigrationManager.cs | 48 + .../InformaticsGatewayContext.cs | 3 +- .../InformaticsGatewayContextFactory.cs | 7 +- .../InformaticsGatewayRepository.cs | 15 +- .../20220203222116_R1_Initialize.Designer.cs | 2 +- .../20220203222116_R1_Initialize.cs | 0 .../20220211175051_R1_Patch.Designer.cs | 2 +- .../Migrations/20220211175051_R1_Patch.cs | 0 .../20220613235333_R2_0.2.0.Designer.cs | 2 +- .../Migrations/20220613235333_R2_0.2.0.cs | 0 .../20220802200605_R3_0.3.0.Designer.cs | 2 +- .../Migrations/20220802200605_R3_0.3.0.cs | 0 .../20221010184458_R3_0.3.2.Designer.cs | 2 +- .../Migrations/20221010184458_R3_0.3.2.cs | 0 .../InformaticsGatewayContextModelSnapshot.cs | 2 +- ...icsGateway.Database.EntityFramework.csproj | 55 + ....Deploy.InformaticsGateway.Database.csproj | 25 +- .../Common/PayloadExtensions.cs | 3 +- .../Monai.Deploy.InformaticsGateway.csproj | 1 + src/InformaticsGateway/Program.cs | 18 +- .../IInferenceRequestRepository.cs | 4 +- .../InferenceRequestRepository.cs | 1 + .../StorageMetadataWrapperRepository.cs | 2 +- .../Connectors/DataRetrievalService.cs | 1 + .../Services/Connectors/PayloadAssembler.cs | 2 +- .../Connectors/PayloadMoveActionHandler.cs | 2 +- .../PayloadNotificationActionHandler.cs | 3 +- .../Connectors/PayloadNotificationService.cs | 2 +- .../Services/Export/ScuExportService.cs | 2 +- .../Http/DestinationAeTitleController.cs | 2 +- .../Services/Http/MonaiAeTitleController.cs | 2 +- .../Services/Http/SourceAeTitleController.cs | 2 +- .../Services/Http/Startup.cs | 2 +- .../Services/Scp/ApplicationEntityManager.cs | 2 +- .../Services/Scu/ScuService.cs | 3 +- ...onai.Deploy.InformaticsGateway.Test.csproj | 1 + src/InformaticsGateway/Test/ProgramTest.cs | 2 - .../InferenceRequestRepositoryTest.cs | 1 + .../InformaticsGatewayRepositoryTest.cs | 3 +- .../StorageInfoWrapperRepositoryTest.cs | 2 +- .../Connectors/DataRetrievalServiceTest.cs | 1 + .../Connectors/PayloadAssemblerTest.cs | 14 +- .../PayloadMoveActionHandlerTest.cs | 10 +- .../PayloadNotificationActionHandlerTest.cs | 2 +- .../PayloadNotificationServiceTest.cs | 12 +- .../Services/Export/ScuExportServiceTest.cs | 2 +- .../Http/DestinationAeTitleControllerTest.cs | 2 +- .../Http/MonaiAeTitleControllerTest.cs | 2 +- .../Http/SourceAeTitleControllerTest.cs | 2 +- .../Scp/ApplicationEntityManagerTest.cs | 2 +- .../Test/Services/Scu/ScuServiceTest.cs | 1 - src/InformaticsGateway/Test/appsettings.json | 1 + src/InformaticsGateway/appsettings.json | 1 + src/Monai.Deploy.InformaticsGateway.sln | 56 +- tests/Integration.Test/Hooks/SqlHooks.cs | 2 +- ...InformaticsGateway.Integration.Test.csproj | 4 +- .../configs/informatics-gateway.json | 3 +- 76 files changed, 1698 insertions(+), 1415 deletions(-) rename src/{InformaticsGateway/Repositories/StorageObjectsinferenceRequest.cs => Database/Api/IDatabaseMigrationManager.cs} (73%) rename src/{InformaticsGateway/Repositories => Database/Api}/IInformaticsGatewayRepository.cs (88%) create mode 100644 src/Database/Api/Monai.Deploy.InformaticsGateway.Database.Api.csproj rename src/Database/{ => Api}/StorageMetadataWrapper.cs (94%) rename src/Database/{Test/Monai.Deploy.InformaticsGateway.Database.Test.csproj => Api/Test/Monai.Deploy.InformaticsGateway.Database.Api.Test.csproj} (93%) rename src/Database/{ => Api}/Test/StorageMetadataWrapperTest.cs (97%) rename src/Database/{ => Api}/Test/Usings.cs (100%) create mode 100644 src/Database/DatabaseManager.cs create mode 100644 src/Database/DatabaseMigrationManager.cs rename src/Database/{ => EntityFramework/Configuration}/DestinationApplicationEntityConfiguration.cs (94%) rename src/Database/{ => EntityFramework/Configuration}/InferenceRequestConfiguration.cs (97%) rename src/Database/{ => EntityFramework/Configuration}/MonaiApplicationEntityConfiguration.cs (97%) rename src/Database/{ => EntityFramework/Configuration}/PayloadConfiguration.cs (97%) create mode 100644 src/Database/EntityFramework/Configuration/SR.cs rename src/Database/{ => EntityFramework/Configuration}/SourceApplicationEntityConfiguration.cs (94%) rename src/Database/{ => EntityFramework/Configuration}/StorageMetadataWrapperEntityConfiguration.cs (91%) create mode 100644 src/Database/EntityFramework/EfDatabaseMigrationManager.cs rename src/Database/{ => EntityFramework}/InformaticsGatewayContext.cs (96%) rename src/Database/{ => EntityFramework}/InformaticsGatewayContextFactory.cs (85%) rename src/{InformaticsGateway/Repositories => Database/EntityFramework}/InformaticsGatewayRepository.cs (90%) rename src/Database/{ => EntityFramework}/Migrations/20220203222116_R1_Initialize.Designer.cs (98%) rename src/Database/{ => EntityFramework}/Migrations/20220203222116_R1_Initialize.cs (100%) rename src/Database/{ => EntityFramework}/Migrations/20220211175051_R1_Patch.Designer.cs (98%) rename src/Database/{ => EntityFramework}/Migrations/20220211175051_R1_Patch.cs (100%) rename src/Database/{ => EntityFramework}/Migrations/20220613235333_R2_0.2.0.Designer.cs (98%) rename src/Database/{ => EntityFramework}/Migrations/20220613235333_R2_0.2.0.cs (100%) rename src/Database/{ => EntityFramework}/Migrations/20220802200605_R3_0.3.0.Designer.cs (99%) rename src/Database/{ => EntityFramework}/Migrations/20220802200605_R3_0.3.0.cs (100%) rename src/Database/{ => EntityFramework}/Migrations/20221010184458_R3_0.3.2.Designer.cs (99%) rename src/Database/{ => EntityFramework}/Migrations/20221010184458_R3_0.3.2.cs (100%) rename src/Database/{ => EntityFramework}/Migrations/InformaticsGatewayContextModelSnapshot.cs (99%) create mode 100644 src/Database/EntityFramework/Monai.Deploy.InformaticsGateway.Database.EntityFramework.csproj diff --git a/.licenserc.yaml b/.licenserc.yaml index 6808aeebe..f7d23c3d8 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -30,7 +30,7 @@ header: - 'src/.sonarlint/**' - 'src/coverlet.runsettings' - 'src/Monai.Deploy.InformaticsGateway.sln' - - 'src/Database/Migrations/**' + - 'src/Database/EntityFramework/Migrations/**' - 'demos/**/.env/**' - 'demos/**/*.txt' - 'doc/dependency_decisions.yml' diff --git a/docs/compliance/third-party-licenses.md b/docs/compliance/third-party-licenses.md index 9b6bd58d0..b627aabec 100644 --- a/docs/compliance/third-party-licenses.md +++ b/docs/compliance/third-party-licenses.md @@ -1351,16 +1351,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -1395,9 +1395,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -1410,7 +1410,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -1443,7 +1443,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -1453,7 +1453,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -2448,16 +2448,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -2492,9 +2492,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -2507,7 +2507,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -2540,7 +2540,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -2550,7 +2550,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -2648,16 +2648,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -2692,9 +2692,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -2707,7 +2707,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -2740,7 +2740,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -2750,7 +2750,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -5216,16 +5216,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -5260,9 +5260,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -5275,7 +5275,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -5308,7 +5308,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -5318,7 +5318,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -5458,16 +5458,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -5502,9 +5502,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -5517,7 +5517,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -5550,7 +5550,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -5560,7 +5560,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -5658,16 +5658,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -5702,9 +5702,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -5717,7 +5717,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -5750,7 +5750,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -5760,7 +5760,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -6220,16 +6220,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -6264,9 +6264,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -6279,7 +6279,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -6312,7 +6312,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -6322,7 +6322,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -8134,16 +8134,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -8178,9 +8178,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -8193,7 +8193,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -8226,7 +8226,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -8236,7 +8236,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -8946,7 +8946,7 @@ resources legal and licencing contributors - +  Please note: our license is an adaptation of the MIT X11 License and should be read as such. @@ -8958,10 +8958,10 @@ Copyright (c) 2000 - 2022 The Legion of the Bouncy Castle Inc. (http://www.bounc THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +  - - +  Site hosted by Tau Ceti Co-operative Ltd. @@ -10517,16 +10517,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -10561,9 +10561,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -10576,7 +10576,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -10609,7 +10609,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -10619,7 +10619,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -10717,16 +10717,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -10761,9 +10761,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -10776,7 +10776,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -10809,7 +10809,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -10819,7 +10819,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -10959,16 +10959,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -11003,9 +11003,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -11018,7 +11018,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -11051,7 +11051,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -11061,7 +11061,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -11159,16 +11159,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -11203,9 +11203,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -11218,7 +11218,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -11251,7 +11251,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -11261,7 +11261,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -11400,16 +11400,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -11444,9 +11444,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -11459,7 +11459,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -11492,7 +11492,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -11502,7 +11502,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -11600,16 +11600,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -11644,9 +11644,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -11659,7 +11659,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -11692,7 +11692,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -11702,7 +11702,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -11964,16 +11964,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -12008,9 +12008,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -12023,7 +12023,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -12056,7 +12056,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -12066,7 +12066,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -12248,16 +12248,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -12292,9 +12292,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -12307,7 +12307,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -12340,7 +12340,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -12350,7 +12350,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -12448,16 +12448,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -12492,9 +12492,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -12507,7 +12507,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -12540,7 +12540,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -12550,7 +12550,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -12690,16 +12690,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -12734,9 +12734,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -12749,7 +12749,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -12782,7 +12782,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -12792,7 +12792,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -12890,16 +12890,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -12934,9 +12934,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -12949,7 +12949,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -12982,7 +12982,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -12992,7 +12992,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -13090,16 +13090,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -13134,9 +13134,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -13149,7 +13149,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -13182,7 +13182,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -13192,7 +13192,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -13372,16 +13372,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -13416,9 +13416,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -13431,7 +13431,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -13464,7 +13464,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -13474,7 +13474,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -13572,16 +13572,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -13616,9 +13616,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -13631,7 +13631,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -13664,7 +13664,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -13674,7 +13674,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -13814,16 +13814,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -13858,9 +13858,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -13873,7 +13873,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -13906,7 +13906,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -13916,7 +13916,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -14014,16 +14014,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -14058,9 +14058,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -14073,7 +14073,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -14106,7 +14106,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -14116,7 +14116,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -14214,16 +14214,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -14258,9 +14258,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -14273,7 +14273,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -14306,7 +14306,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -14316,7 +14316,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -14414,16 +14414,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -14458,9 +14458,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -14473,7 +14473,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -14506,7 +14506,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -14516,7 +14516,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -14614,16 +14614,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -14658,9 +14658,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -14673,7 +14673,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -14706,7 +14706,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -14716,7 +14716,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -14814,16 +14814,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -14858,9 +14858,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -14873,7 +14873,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -14906,7 +14906,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -14916,7 +14916,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -15178,16 +15178,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -15222,9 +15222,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -15237,7 +15237,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -15270,7 +15270,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -15280,7 +15280,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -15378,16 +15378,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -15422,9 +15422,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -15437,7 +15437,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -15470,7 +15470,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -15480,7 +15480,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -15578,16 +15578,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -15622,9 +15622,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -15637,7 +15637,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -15670,7 +15670,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -15680,7 +15680,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -15778,16 +15778,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -15822,9 +15822,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -15837,7 +15837,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -15870,7 +15870,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -15880,7 +15880,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -15978,16 +15978,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -16022,9 +16022,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -16037,7 +16037,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -16070,7 +16070,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -16080,7 +16080,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -16219,16 +16219,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -16263,9 +16263,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -16278,7 +16278,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -16311,7 +16311,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -16321,7 +16321,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -16503,16 +16503,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -16547,9 +16547,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -16562,7 +16562,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -16595,7 +16595,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -16605,7 +16605,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -16703,16 +16703,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -16747,9 +16747,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -16762,7 +16762,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -16795,7 +16795,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -16805,7 +16805,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -16903,16 +16903,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -16947,9 +16947,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -16962,7 +16962,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -16995,7 +16995,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -17005,7 +17005,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -17103,16 +17103,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -17147,9 +17147,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -17162,7 +17162,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -17195,7 +17195,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -17205,7 +17205,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -17303,16 +17303,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -17347,9 +17347,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -17362,7 +17362,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -17395,7 +17395,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -17405,7 +17405,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -17503,16 +17503,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -17547,9 +17547,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -17562,7 +17562,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -17595,7 +17595,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -17605,7 +17605,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -17703,16 +17703,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -17747,9 +17747,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -17762,7 +17762,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -17795,7 +17795,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -17805,7 +17805,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -17903,16 +17903,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -17947,9 +17947,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -17962,7 +17962,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -17995,7 +17995,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -18005,7 +18005,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -18185,16 +18185,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -18229,9 +18229,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -18244,7 +18244,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -18277,7 +18277,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -18287,7 +18287,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -18385,16 +18385,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -18429,9 +18429,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -18444,7 +18444,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -18477,7 +18477,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -18487,7 +18487,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -18585,16 +18585,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -18629,9 +18629,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -18644,7 +18644,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -18677,7 +18677,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -18687,7 +18687,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -18785,16 +18785,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -18829,9 +18829,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -18844,7 +18844,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -18877,7 +18877,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -18887,7 +18887,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -18985,16 +18985,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -19029,9 +19029,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -19044,7 +19044,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -19077,7 +19077,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -19087,7 +19087,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -19227,16 +19227,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -19271,9 +19271,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -19286,7 +19286,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -19319,7 +19319,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -19329,7 +19329,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -19427,16 +19427,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -19471,9 +19471,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -19486,7 +19486,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -19519,7 +19519,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -19529,7 +19529,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -19627,16 +19627,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -19671,9 +19671,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -19686,7 +19686,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -19719,7 +19719,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -19729,7 +19729,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -19827,16 +19827,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -19871,9 +19871,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -19886,7 +19886,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -19919,7 +19919,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -19929,7 +19929,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -20027,16 +20027,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -20071,9 +20071,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -20086,7 +20086,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -20119,7 +20119,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -20129,7 +20129,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -20310,16 +20310,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -20354,9 +20354,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -20369,7 +20369,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -20402,7 +20402,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -20412,7 +20412,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -20510,16 +20510,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -20554,9 +20554,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -20569,7 +20569,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -20602,7 +20602,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -20612,7 +20612,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -20710,16 +20710,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -20754,9 +20754,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -20769,7 +20769,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -20802,7 +20802,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -20812,7 +20812,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -20910,16 +20910,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -20954,9 +20954,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -20969,7 +20969,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -21002,7 +21002,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -21012,7 +21012,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -21110,16 +21110,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -21154,9 +21154,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -21169,7 +21169,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -21202,7 +21202,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -21212,7 +21212,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -21310,16 +21310,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -21354,9 +21354,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -21369,7 +21369,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -21402,7 +21402,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -21412,7 +21412,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -21510,16 +21510,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -21554,9 +21554,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -21569,7 +21569,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -21602,7 +21602,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -21612,7 +21612,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -21710,16 +21710,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -21754,9 +21754,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -21769,7 +21769,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -21802,7 +21802,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -21812,7 +21812,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -21910,16 +21910,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -21954,9 +21954,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -21969,7 +21969,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -22002,7 +22002,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -22012,7 +22012,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -22152,16 +22152,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -22196,9 +22196,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -22211,7 +22211,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -22244,7 +22244,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -22254,7 +22254,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -22352,16 +22352,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -22396,9 +22396,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -22411,7 +22411,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -22444,7 +22444,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -22454,7 +22454,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -22552,16 +22552,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -22596,9 +22596,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -22611,7 +22611,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -22644,7 +22644,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -22654,7 +22654,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -22752,16 +22752,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -22796,9 +22796,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -22811,7 +22811,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -22844,7 +22844,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -22854,7 +22854,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -22952,16 +22952,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -22996,9 +22996,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -23011,7 +23011,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -23044,7 +23044,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -23054,7 +23054,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -23152,16 +23152,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -23196,9 +23196,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -23211,7 +23211,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -23244,7 +23244,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -23254,7 +23254,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -23352,16 +23352,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -23396,9 +23396,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -23411,7 +23411,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -23444,7 +23444,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -23454,7 +23454,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -23594,16 +23594,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -23638,9 +23638,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -23653,7 +23653,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -23686,7 +23686,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -23696,7 +23696,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -23836,16 +23836,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -23880,9 +23880,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -23895,7 +23895,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -23928,7 +23928,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -23938,7 +23938,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -24036,16 +24036,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -24080,9 +24080,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -24095,7 +24095,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -24128,7 +24128,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -24138,7 +24138,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -24278,16 +24278,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -24322,9 +24322,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -24337,7 +24337,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -24370,7 +24370,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -24380,7 +24380,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -24520,16 +24520,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -24564,9 +24564,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -24579,7 +24579,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -24612,7 +24612,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -24622,7 +24622,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -24968,16 +24968,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -25012,9 +25012,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -25027,7 +25027,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -25060,7 +25060,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -25070,7 +25070,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -25168,16 +25168,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -25212,9 +25212,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -25227,7 +25227,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -25260,7 +25260,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -25270,7 +25270,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -25451,16 +25451,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -25495,9 +25495,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -25510,7 +25510,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -25543,7 +25543,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -25553,7 +25553,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -25651,16 +25651,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -25695,9 +25695,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -25710,7 +25710,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -25743,7 +25743,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -25753,7 +25753,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -25892,16 +25892,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -25936,9 +25936,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -25951,7 +25951,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -25984,7 +25984,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -25994,7 +25994,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -26134,16 +26134,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -26178,9 +26178,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -26193,7 +26193,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -26226,7 +26226,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -26236,7 +26236,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -26334,16 +26334,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -26378,9 +26378,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -26393,7 +26393,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -26426,7 +26426,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -26436,7 +26436,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -26576,16 +26576,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -26620,9 +26620,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -26635,7 +26635,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -26668,7 +26668,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -26678,7 +26678,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -26776,16 +26776,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -26820,9 +26820,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -26835,7 +26835,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -26868,7 +26868,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -26878,7 +26878,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -26976,16 +26976,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -27020,9 +27020,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -27035,7 +27035,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -27068,7 +27068,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -27078,7 +27078,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -28212,16 +28212,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -28256,9 +28256,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -28271,7 +28271,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -28304,7 +28304,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -28314,7 +28314,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -28412,16 +28412,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -28456,9 +28456,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -28471,7 +28471,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -28504,7 +28504,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -28514,7 +28514,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -28612,16 +28612,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -28656,9 +28656,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -28671,7 +28671,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -28704,7 +28704,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -28714,7 +28714,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -28812,16 +28812,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -28856,9 +28856,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -28871,7 +28871,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -28904,7 +28904,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -28914,7 +28914,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -29012,16 +29012,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -29056,9 +29056,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -29071,7 +29071,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -29104,7 +29104,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -29114,7 +29114,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -29212,16 +29212,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -29256,9 +29256,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -29271,7 +29271,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -29304,7 +29304,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -29314,7 +29314,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -29412,16 +29412,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -29456,9 +29456,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -29471,7 +29471,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -29504,7 +29504,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -29514,7 +29514,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -29612,16 +29612,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -29656,9 +29656,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -29671,7 +29671,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -29704,7 +29704,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -29714,7 +29714,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -29812,16 +29812,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -29856,9 +29856,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -29871,7 +29871,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -29904,7 +29904,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -29914,7 +29914,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -30012,16 +30012,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -30056,9 +30056,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -30071,7 +30071,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -30104,7 +30104,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -30114,7 +30114,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -30212,16 +30212,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -30256,9 +30256,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -30271,7 +30271,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -30304,7 +30304,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -30314,7 +30314,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -30412,16 +30412,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -30456,9 +30456,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -30471,7 +30471,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -30504,7 +30504,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -30514,7 +30514,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -30612,16 +30612,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -30656,9 +30656,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -30671,7 +30671,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -30704,7 +30704,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -30714,7 +30714,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -30812,16 +30812,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -30856,9 +30856,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -30871,7 +30871,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -30904,7 +30904,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -30914,7 +30914,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -31012,16 +31012,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -31056,9 +31056,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -31071,7 +31071,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -31104,7 +31104,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -31114,7 +31114,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -31212,16 +31212,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -31256,9 +31256,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -31271,7 +31271,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -31304,7 +31304,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -31314,7 +31314,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -31412,16 +31412,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -31456,9 +31456,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -31471,7 +31471,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -31504,7 +31504,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -31514,7 +31514,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -31612,16 +31612,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -31656,9 +31656,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -31671,7 +31671,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -31704,7 +31704,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -31714,7 +31714,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -31812,16 +31812,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -31856,9 +31856,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -31871,7 +31871,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -31904,7 +31904,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -31914,7 +31914,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -32012,16 +32012,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -32056,9 +32056,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -32071,7 +32071,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -32104,7 +32104,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -32114,7 +32114,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -32212,16 +32212,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -32256,9 +32256,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -32271,7 +32271,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -32304,7 +32304,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -32314,7 +32314,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -32412,16 +32412,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -32456,9 +32456,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -32471,7 +32471,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -32504,7 +32504,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -32514,7 +32514,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -32612,16 +32612,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -32656,9 +32656,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -32671,7 +32671,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -32704,7 +32704,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -32714,7 +32714,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -32812,16 +32812,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -32856,9 +32856,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -32871,7 +32871,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -32904,7 +32904,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -32914,7 +32914,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -33012,16 +33012,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -33056,9 +33056,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -33071,7 +33071,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -33104,7 +33104,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -33114,7 +33114,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -33212,16 +33212,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -33256,9 +33256,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -33271,7 +33271,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -33304,7 +33304,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -33314,7 +33314,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -33412,16 +33412,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -33456,9 +33456,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -33471,7 +33471,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -33504,7 +33504,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -33514,7 +33514,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -33612,16 +33612,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -33656,9 +33656,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -33671,7 +33671,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -33704,7 +33704,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -33714,7 +33714,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -33812,16 +33812,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -33856,9 +33856,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -33871,7 +33871,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -33904,7 +33904,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -33914,7 +33914,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -34012,16 +34012,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -34056,9 +34056,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -34071,7 +34071,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -34104,7 +34104,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -34114,7 +34114,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -34212,16 +34212,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -34256,9 +34256,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -34271,7 +34271,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -34304,7 +34304,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -34314,7 +34314,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -34412,16 +34412,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -34456,9 +34456,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -34471,7 +34471,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -34504,7 +34504,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -34514,7 +34514,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -34612,16 +34612,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -34656,9 +34656,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -34671,7 +34671,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -34704,7 +34704,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -34714,7 +34714,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -34812,16 +34812,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -34856,9 +34856,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -34871,7 +34871,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -34904,7 +34904,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -34914,7 +34914,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -35012,16 +35012,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -35056,9 +35056,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -35071,7 +35071,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -35104,7 +35104,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -35114,7 +35114,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -35212,16 +35212,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -35256,9 +35256,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -35271,7 +35271,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -35304,7 +35304,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -35314,7 +35314,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -35412,16 +35412,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -35456,9 +35456,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -35471,7 +35471,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -35504,7 +35504,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -35514,7 +35514,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -35612,16 +35612,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -35656,9 +35656,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -35671,7 +35671,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -35704,7 +35704,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -35714,7 +35714,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -35812,16 +35812,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -35856,9 +35856,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -35871,7 +35871,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -35904,7 +35904,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -35914,7 +35914,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -36012,16 +36012,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -36056,9 +36056,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -36071,7 +36071,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -36104,7 +36104,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -36114,7 +36114,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -36212,16 +36212,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -36256,9 +36256,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -36271,7 +36271,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -36304,7 +36304,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -36314,7 +36314,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -36412,16 +36412,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -36456,9 +36456,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -36471,7 +36471,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -36504,7 +36504,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -36514,7 +36514,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -36612,16 +36612,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -36656,9 +36656,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -36671,7 +36671,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -36704,7 +36704,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -36714,7 +36714,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -36812,16 +36812,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -36856,9 +36856,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -36871,7 +36871,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -36904,7 +36904,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -36914,7 +36914,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -37012,16 +37012,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -37056,9 +37056,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -37071,7 +37071,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -37104,7 +37104,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -37114,7 +37114,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -37212,16 +37212,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -37256,9 +37256,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -37271,7 +37271,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -37304,7 +37304,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -37314,7 +37314,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -37412,16 +37412,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -37456,9 +37456,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -37471,7 +37471,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -37504,7 +37504,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -37514,7 +37514,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -37612,16 +37612,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -37656,9 +37656,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -37671,7 +37671,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -37704,7 +37704,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -37714,7 +37714,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -37812,16 +37812,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -37856,9 +37856,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -37871,7 +37871,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -37904,7 +37904,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -37914,7 +37914,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -38012,16 +38012,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -38056,9 +38056,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -38071,7 +38071,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -38104,7 +38104,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -38114,7 +38114,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -38212,16 +38212,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -38256,9 +38256,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -38271,7 +38271,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -38304,7 +38304,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -38314,7 +38314,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -38412,16 +38412,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -38456,9 +38456,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -38471,7 +38471,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -38504,7 +38504,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -38514,7 +38514,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -38612,16 +38612,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -38656,9 +38656,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -38671,7 +38671,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -38704,7 +38704,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -38714,7 +38714,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -38812,16 +38812,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -38856,9 +38856,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -38871,7 +38871,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -38904,7 +38904,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -38914,7 +38914,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -39012,16 +39012,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -39056,9 +39056,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -39071,7 +39071,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -39104,7 +39104,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -39114,7 +39114,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -39212,16 +39212,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -39256,9 +39256,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -39271,7 +39271,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -39304,7 +39304,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -39314,7 +39314,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -39412,16 +39412,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -39456,9 +39456,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -39471,7 +39471,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -39504,7 +39504,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -39514,7 +39514,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -39612,16 +39612,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -39656,9 +39656,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -39671,7 +39671,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -39704,7 +39704,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -39714,7 +39714,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and @@ -39812,16 +39812,16 @@ you comply with these license terms, you have the rights below. 1.    INSTALLATION AND USE RIGHTS. You may -install and use any number of copies of the software to develop and test your applications. +install and use any number of copies of the software to develop and test your applications.  -2. +2.    THIRD PARTY COMPONENTS. The software may include third party components with separate legal notices or governed by other agreements, as may be described in the ThirdPartyNotices file(s) accompanying the software. -3. +3.    ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. -a. +a.     DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. �Distributable Code� is code that you are @@ -39856,9 +39856,9 @@ that any part of it becomes subject to an Excluded License. An �Excluded License� is one that requires, as a condition of use, modification or distribution of code, that (i) it be disclosed or distributed in source code form; or (ii) others have the right to modify it. -4. +4.    DATA. -a. +a.     Data Collection. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to provide services and improve our products @@ -39871,7 +39871,7 @@ privacy statement. Our privacy statement is located at https://go.microsoft.com/ collection and its use from the software documentation and our privacy statement. Your use of the software operates as your consent to these practices. -b. +b.    Processing of Personal Data. To the extent Microsoft is a processor or subprocessor of personal data in connection with the software, Microsoft makes the commitments in the European Union General Data Protection @@ -39904,7 +39904,7 @@ is against the law; or share, publish, rent or lease the software, provide the software as a stand-alone offering for others to use, or transfer the software or this agreement to any third party. -6. +6.    Export Restrictions. You must comply with all domestic and international export laws and regulations that apply to the software, which include @@ -39914,7 +39914,7 @@ on export restrictions, visit www.microsoft.com/exporting. � SUPPORT SERVICES. Because this software is �as is,� we may not provide support services for it. -8. +8.    Entire Agreement. This agreement, and the terms for supplements, updates, Internet-based services and diff --git a/src/Configuration/InformaticsGatewayConfiguration.cs b/src/Configuration/InformaticsGatewayConfiguration.cs index 2194bd984..f2a466087 100644 --- a/src/Configuration/InformaticsGatewayConfiguration.cs +++ b/src/Configuration/InformaticsGatewayConfiguration.cs @@ -24,11 +24,6 @@ namespace Monai.Deploy.InformaticsGateway.Configuration /// public class InformaticsGatewayConfiguration { - /// - /// Name of the key for retrieve database connection string. - /// - public const string DatabaseConnectionStringKey = "InformaticsGatewayDatabase"; - /// /// Represents the dicom section of the configuration file. /// diff --git a/src/InformaticsGateway/Repositories/StorageObjectsinferenceRequest.cs b/src/Database/Api/IDatabaseMigrationManager.cs similarity index 73% rename from src/InformaticsGateway/Repositories/StorageObjectsinferenceRequest.cs rename to src/Database/Api/IDatabaseMigrationManager.cs index df5854769..3de2f9abf 100644 --- a/src/InformaticsGateway/Repositories/StorageObjectsinferenceRequest.cs +++ b/src/Database/Api/IDatabaseMigrationManager.cs @@ -1,6 +1,5 @@ /* - * Copyright 2021-2022 MONAI Consortium - * Copyright 2019-2021 NVIDIA Corporation + * Copyright 2022 MONAI Consortium * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,9 +14,12 @@ * limitations under the License. */ -namespace Monai.Deploy.InformaticsGateway.Repositories +using Microsoft.Extensions.Hosting; + +namespace Monai.Deploy.InformaticsGateway.Database.Api { - public class StorageObjectsinferenceRequest + public interface IDatabaseMigrationManager { + IHost Migrate(IHost host); } -} \ No newline at end of file +} diff --git a/src/InformaticsGateway/Repositories/IInformaticsGatewayRepository.cs b/src/Database/Api/IInformaticsGatewayRepository.cs similarity index 88% rename from src/InformaticsGateway/Repositories/IInformaticsGatewayRepository.cs rename to src/Database/Api/IInformaticsGatewayRepository.cs index 411cd0912..ec9072dc5 100644 --- a/src/InformaticsGateway/Repositories/IInformaticsGatewayRepository.cs +++ b/src/Database/Api/IInformaticsGatewayRepository.cs @@ -14,14 +14,9 @@ * limitations under the License. */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; using Microsoft.EntityFrameworkCore.ChangeTracking; -namespace Monai.Deploy.InformaticsGateway.Repositories +namespace Monai.Deploy.InformaticsGateway.Database.Api { public interface IInformaticsGatewayRepository where T : class { diff --git a/src/Database/Api/Monai.Deploy.InformaticsGateway.Database.Api.csproj b/src/Database/Api/Monai.Deploy.InformaticsGateway.Database.Api.csproj new file mode 100644 index 000000000..dfe506948 --- /dev/null +++ b/src/Database/Api/Monai.Deploy.InformaticsGateway.Database.Api.csproj @@ -0,0 +1,40 @@ + + + + + + Monai.Deploy.InformaticsGateway.Database.Repositories + net6.0 + enable + enable + + + + + + + + + + + + + + + + + diff --git a/src/Database/StorageMetadataWrapper.cs b/src/Database/Api/StorageMetadataWrapper.cs similarity index 94% rename from src/Database/StorageMetadataWrapper.cs rename to src/Database/Api/StorageMetadataWrapper.cs index a3da85fff..f6a92aa39 100644 --- a/src/Database/StorageMetadataWrapper.cs +++ b/src/Database/Api/StorageMetadataWrapper.cs @@ -19,7 +19,7 @@ using Ardalis.GuardClauses; using Monai.Deploy.InformaticsGateway.Api.Storage; -namespace Monai.Deploy.InformaticsGateway.Database +namespace Monai.Deploy.InformaticsGateway.Database.Api { public class StorageMetadataWrapper { @@ -61,7 +61,7 @@ public void Update(FileStorageMetadata metadata) public FileStorageMetadata GetObject() { - var type = System.Type.GetType(TypeName, true); + var type = Type.GetType(TypeName, true); return JsonSerializer.Deserialize(Value, type) as FileStorageMetadata; } } diff --git a/src/Database/Test/Monai.Deploy.InformaticsGateway.Database.Test.csproj b/src/Database/Api/Test/Monai.Deploy.InformaticsGateway.Database.Api.Test.csproj similarity index 93% rename from src/Database/Test/Monai.Deploy.InformaticsGateway.Database.Test.csproj rename to src/Database/Api/Test/Monai.Deploy.InformaticsGateway.Database.Api.Test.csproj index 8cf6d4dcc..d73ad311b 100644 --- a/src/Database/Test/Monai.Deploy.InformaticsGateway.Database.Test.csproj +++ b/src/Database/Api/Test/Monai.Deploy.InformaticsGateway.Database.Api.Test.csproj @@ -38,8 +38,8 @@ - - + + diff --git a/src/Database/Test/StorageMetadataWrapperTest.cs b/src/Database/Api/Test/StorageMetadataWrapperTest.cs similarity index 97% rename from src/Database/Test/StorageMetadataWrapperTest.cs rename to src/Database/Api/Test/StorageMetadataWrapperTest.cs index ea0b60536..e549bf809 100644 --- a/src/Database/Test/StorageMetadataWrapperTest.cs +++ b/src/Database/Api/Test/StorageMetadataWrapperTest.cs @@ -14,7 +14,9 @@ * limitations under the License. */ +using Monai.Deploy.InformaticsGateway.Api.Rest; using Monai.Deploy.InformaticsGateway.Api.Storage; +using Monai.Deploy.InformaticsGateway.Database.Api; namespace Monai.Deploy.InformaticsGateway.Database.Test { @@ -27,7 +29,7 @@ public void GivenAFhirFileStorageMetadataObject_WhenInitializedWithStorageMetada Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), - Api.Rest.FhirStorageFormat.Json); + FhirStorageFormat.Json); metadata.SetWorkflows("A", "B", "C"); var wrapper = new StorageMetadataWrapper(metadata); diff --git a/src/Database/Test/Usings.cs b/src/Database/Api/Test/Usings.cs similarity index 100% rename from src/Database/Test/Usings.cs rename to src/Database/Api/Test/Usings.cs diff --git a/src/Database/DatabaseManager.cs b/src/Database/DatabaseManager.cs new file mode 100644 index 000000000..7b4a1a136 --- /dev/null +++ b/src/Database/DatabaseManager.cs @@ -0,0 +1,52 @@ +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Monai.Deploy.InformaticsGateway.Configuration; +using Monai.Deploy.InformaticsGateway.Database.Api; +using Monai.Deploy.InformaticsGateway.Database.EntityFramework; +using Monai.Deploy.InformaticsGateway.Database.EntityFramework.Configurations; + +namespace Monai.Deploy.InformaticsGateway.Database +{ + public static class DatabaseManager + { + public static IServiceCollection ConfigureDatabase(this IServiceCollection services, IConfigurationSection? connectionStringConfigurationSection) + { + if (connectionStringConfigurationSection is null) + { + throw new ConfigurationException("No database connections found in configuration section 'ConnectionStrings'."); + } + + + var databaseType = connectionStringConfigurationSection["Type"]; + switch (databaseType) + { + case "Sqlite": + services.AddScoped(); + services.AddScoped(typeof(IInformaticsGatewayRepository<>), typeof(InformaticsGatewayRepository<>)); + services.AddDbContext( + options => options.UseSqlite(connectionStringConfigurationSection[SR.DatabaseConnectionStringKey]), + ServiceLifetime.Transient); + return services; + default: + throw new ConfigurationException($"Unsupported database type defined: '{databaseType}'"); + } + } + } +} diff --git a/src/Database/DatabaseMigrationManager.cs b/src/Database/DatabaseMigrationManager.cs new file mode 100644 index 000000000..21a823d94 --- /dev/null +++ b/src/Database/DatabaseMigrationManager.cs @@ -0,0 +1,35 @@ +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; +using Monai.Deploy.InformaticsGateway.Database.Api; + +namespace Monai.Deploy.InformaticsGateway.Database +{ + public static class DatabaseMigrationManager + { + public static IHost MigrateDatabase(this IHost host) + { + using (var scope = host.Services.CreateScope()) + { + scope.ServiceProvider.GetRequiredService()?.Migrate(host); + } + return host; + } + } +} + diff --git a/src/Database/DestinationApplicationEntityConfiguration.cs b/src/Database/EntityFramework/Configuration/DestinationApplicationEntityConfiguration.cs similarity index 94% rename from src/Database/DestinationApplicationEntityConfiguration.cs rename to src/Database/EntityFramework/Configuration/DestinationApplicationEntityConfiguration.cs index a1a131e70..845d4b96c 100644 --- a/src/Database/DestinationApplicationEntityConfiguration.cs +++ b/src/Database/EntityFramework/Configuration/DestinationApplicationEntityConfiguration.cs @@ -19,7 +19,7 @@ using Microsoft.EntityFrameworkCore.Metadata.Builders; using Monai.Deploy.InformaticsGateway.Api; -namespace Monai.Deploy.InformaticsGateway.Database +namespace Monai.Deploy.InformaticsGateway.Database.EntityFramework.Configurations { internal class DestinationApplicationEntityConfiguration : IEntityTypeConfiguration { diff --git a/src/Database/InferenceRequestConfiguration.cs b/src/Database/EntityFramework/Configuration/InferenceRequestConfiguration.cs similarity index 97% rename from src/Database/InferenceRequestConfiguration.cs rename to src/Database/EntityFramework/Configuration/InferenceRequestConfiguration.cs index fd740b7d3..70de97896 100644 --- a/src/Database/InferenceRequestConfiguration.cs +++ b/src/Database/EntityFramework/Configuration/InferenceRequestConfiguration.cs @@ -25,7 +25,7 @@ using Microsoft.EntityFrameworkCore.Metadata.Builders; using Monai.Deploy.InformaticsGateway.Api.Rest; -namespace Monai.Deploy.InformaticsGateway.Database +namespace Monai.Deploy.InformaticsGateway.Database.EntityFramework.Configurations { internal class InferenceRequestConfiguration : IEntityTypeConfiguration { diff --git a/src/Database/MonaiApplicationEntityConfiguration.cs b/src/Database/EntityFramework/Configuration/MonaiApplicationEntityConfiguration.cs similarity index 97% rename from src/Database/MonaiApplicationEntityConfiguration.cs rename to src/Database/EntityFramework/Configuration/MonaiApplicationEntityConfiguration.cs index d04189f6e..4e79c3f6b 100644 --- a/src/Database/MonaiApplicationEntityConfiguration.cs +++ b/src/Database/EntityFramework/Configuration/MonaiApplicationEntityConfiguration.cs @@ -25,7 +25,7 @@ using Microsoft.EntityFrameworkCore.Metadata.Builders; using Monai.Deploy.InformaticsGateway.Api; -namespace Monai.Deploy.InformaticsGateway.Database +namespace Monai.Deploy.InformaticsGateway.Database.EntityFramework.Configurations { internal class MonaiApplicationEntityConfiguration : IEntityTypeConfiguration { diff --git a/src/Database/PayloadConfiguration.cs b/src/Database/EntityFramework/Configuration/PayloadConfiguration.cs similarity index 97% rename from src/Database/PayloadConfiguration.cs rename to src/Database/EntityFramework/Configuration/PayloadConfiguration.cs index f319d43ae..b9d635418 100644 --- a/src/Database/PayloadConfiguration.cs +++ b/src/Database/EntityFramework/Configuration/PayloadConfiguration.cs @@ -24,7 +24,7 @@ using Microsoft.EntityFrameworkCore.Metadata.Builders; using Monai.Deploy.InformaticsGateway.Api.Storage; -namespace Monai.Deploy.InformaticsGateway.Database +namespace Monai.Deploy.InformaticsGateway.Database.EntityFramework.Configurations { internal class PayloadConfiguration : IEntityTypeConfiguration { diff --git a/src/Database/EntityFramework/Configuration/SR.cs b/src/Database/EntityFramework/Configuration/SR.cs new file mode 100644 index 000000000..6bbab8ff2 --- /dev/null +++ b/src/Database/EntityFramework/Configuration/SR.cs @@ -0,0 +1,28 @@ +/* + * Copyright 2021-2022 MONAI Consortium + * Copyright 2019-2021 NVIDIA Corporation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +namespace Monai.Deploy.InformaticsGateway.Database.EntityFramework.Configurations +{ + public static class SR + { + /// + /// Name of the key for retrieve database connection string. + /// + public const string DatabaseConnectionStringKey = "InformaticsGatewayDatabase"; + + } +} diff --git a/src/Database/SourceApplicationEntityConfiguration.cs b/src/Database/EntityFramework/Configuration/SourceApplicationEntityConfiguration.cs similarity index 94% rename from src/Database/SourceApplicationEntityConfiguration.cs rename to src/Database/EntityFramework/Configuration/SourceApplicationEntityConfiguration.cs index ff7b5d160..2fc81f657 100644 --- a/src/Database/SourceApplicationEntityConfiguration.cs +++ b/src/Database/EntityFramework/Configuration/SourceApplicationEntityConfiguration.cs @@ -18,7 +18,7 @@ using Microsoft.EntityFrameworkCore; using Monai.Deploy.InformaticsGateway.Api; -namespace Monai.Deploy.InformaticsGateway.Database +namespace Monai.Deploy.InformaticsGateway.Database.EntityFramework.Configurations { internal class SourceApplicationEntityConfiguration : IEntityTypeConfiguration { diff --git a/src/Database/StorageMetadataWrapperEntityConfiguration.cs b/src/Database/EntityFramework/Configuration/StorageMetadataWrapperEntityConfiguration.cs similarity index 91% rename from src/Database/StorageMetadataWrapperEntityConfiguration.cs rename to src/Database/EntityFramework/Configuration/StorageMetadataWrapperEntityConfiguration.cs index f0620e17a..3991abdac 100644 --- a/src/Database/StorageMetadataWrapperEntityConfiguration.cs +++ b/src/Database/EntityFramework/Configuration/StorageMetadataWrapperEntityConfiguration.cs @@ -17,8 +17,9 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; +using Monai.Deploy.InformaticsGateway.Database.Api; -namespace Monai.Deploy.InformaticsGateway.Database +namespace Monai.Deploy.InformaticsGateway.Database.EntityFramework.Configurations { internal class StorageMetadataWrapperEntityConfiguration : IEntityTypeConfiguration { diff --git a/src/Database/EntityFramework/EfDatabaseMigrationManager.cs b/src/Database/EntityFramework/EfDatabaseMigrationManager.cs new file mode 100644 index 000000000..edbd87511 --- /dev/null +++ b/src/Database/EntityFramework/EfDatabaseMigrationManager.cs @@ -0,0 +1,48 @@ +/* + * Copyright 2022 MONAI Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Logging; +using Monai.Deploy.InformaticsGateway.Database.Api; + +namespace Monai.Deploy.InformaticsGateway.Database.EntityFramework +{ + public class EfDatabaseMigrationManager : IDatabaseMigrationManager + { + public IHost Migrate(IHost host) + { + using (var scope = host.Services.CreateScope()) + { + using (var dbContext = scope.ServiceProvider.GetRequiredService()) + { + try + { + dbContext.Database.Migrate(); + } + catch (Exception ex) + { + var logger = scope.ServiceProvider.GetService(); + logger?.Log(LogLevel.Critical, "Failed to migrate database", ex); + throw; + } + } + } + return host; + } + } +} diff --git a/src/Database/InformaticsGatewayContext.cs b/src/Database/EntityFramework/InformaticsGatewayContext.cs similarity index 96% rename from src/Database/InformaticsGatewayContext.cs rename to src/Database/EntityFramework/InformaticsGatewayContext.cs index 562684a76..91b0be743 100644 --- a/src/Database/InformaticsGatewayContext.cs +++ b/src/Database/EntityFramework/InformaticsGatewayContext.cs @@ -18,8 +18,9 @@ using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.Extensions.Logging; using Monai.Deploy.InformaticsGateway.Api; +using Monai.Deploy.InformaticsGateway.Database.EntityFramework.Configurations; -namespace Monai.Deploy.InformaticsGateway.Database +namespace Monai.Deploy.InformaticsGateway.Database.EntityFramework { public class InformaticsGatewayContext : DbContext { diff --git a/src/Database/InformaticsGatewayContextFactory.cs b/src/Database/EntityFramework/InformaticsGatewayContextFactory.cs similarity index 85% rename from src/Database/InformaticsGatewayContextFactory.cs rename to src/Database/EntityFramework/InformaticsGatewayContextFactory.cs index 80725518d..9bbf82a08 100644 --- a/src/Database/InformaticsGatewayContextFactory.cs +++ b/src/Database/EntityFramework/InformaticsGatewayContextFactory.cs @@ -18,9 +18,8 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Design; using Microsoft.Extensions.Configuration; -using Monai.Deploy.InformaticsGateway.Configuration; -namespace Monai.Deploy.InformaticsGateway.Database +namespace Monai.Deploy.InformaticsGateway.Database.EntityFramework { /// /// Used to EF migration. @@ -30,13 +29,13 @@ public class InformaticsGatewayContextFactory : IDesignTimeDbContextFactory(); - var connectionString = configuration.GetConnectionString(InformaticsGatewayConfiguration.DatabaseConnectionStringKey); + var connectionString = configuration.GetConnectionString(Configurations.SR.DatabaseConnectionStringKey); builder.UseSqlite(connectionString); return new InformaticsGatewayContext(builder.Options); diff --git a/src/InformaticsGateway/Repositories/InformaticsGatewayRepository.cs b/src/Database/EntityFramework/InformaticsGatewayRepository.cs similarity index 90% rename from src/InformaticsGateway/Repositories/InformaticsGatewayRepository.cs rename to src/Database/EntityFramework/InformaticsGatewayRepository.cs index e6d0f43c4..68feb8f74 100644 --- a/src/InformaticsGateway/Repositories/InformaticsGatewayRepository.cs +++ b/src/Database/EntityFramework/InformaticsGatewayRepository.cs @@ -14,20 +14,15 @@ * limitations under the License. */ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; using Ardalis.GuardClauses; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.ChangeTracking; using Microsoft.Extensions.DependencyInjection; -using Monai.Deploy.InformaticsGateway.Database; +using Monai.Deploy.InformaticsGateway.Database.Api; -namespace Monai.Deploy.InformaticsGateway.Repositories +namespace Monai.Deploy.InformaticsGateway.Database.EntityFramework { - internal class InformaticsGatewayRepository : IDisposable, IInformaticsGatewayRepository where T : class + public class InformaticsGatewayRepository : IDisposable, IInformaticsGatewayRepository where T : class { private readonly IServiceScope _scope; private readonly InformaticsGatewayContext _informaticsGatewayContext; @@ -65,13 +60,13 @@ public EntityEntry Update(T entity) { Guard.Against.Null(entity, nameof(entity)); - return _informaticsGatewayContext.Update(entity); + return _informaticsGatewayContext.Update(entity); } public EntityEntry Remove(T entity) { Guard.Against.Null(entity, nameof(entity)); - return _informaticsGatewayContext.Remove(entity); + return _informaticsGatewayContext.Remove(entity); } public void RemoveRange(params T[] entities) diff --git a/src/Database/Migrations/20220203222116_R1_Initialize.Designer.cs b/src/Database/EntityFramework/Migrations/20220203222116_R1_Initialize.Designer.cs similarity index 98% rename from src/Database/Migrations/20220203222116_R1_Initialize.Designer.cs rename to src/Database/EntityFramework/Migrations/20220203222116_R1_Initialize.Designer.cs index 11e07508b..d56e983c7 100644 --- a/src/Database/Migrations/20220203222116_R1_Initialize.Designer.cs +++ b/src/Database/EntityFramework/Migrations/20220203222116_R1_Initialize.Designer.cs @@ -20,7 +20,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Monai.Deploy.InformaticsGateway.Database; +using Monai.Deploy.InformaticsGateway.Database.EntityFramework; #nullable disable diff --git a/src/Database/Migrations/20220203222116_R1_Initialize.cs b/src/Database/EntityFramework/Migrations/20220203222116_R1_Initialize.cs similarity index 100% rename from src/Database/Migrations/20220203222116_R1_Initialize.cs rename to src/Database/EntityFramework/Migrations/20220203222116_R1_Initialize.cs diff --git a/src/Database/Migrations/20220211175051_R1_Patch.Designer.cs b/src/Database/EntityFramework/Migrations/20220211175051_R1_Patch.Designer.cs similarity index 98% rename from src/Database/Migrations/20220211175051_R1_Patch.Designer.cs rename to src/Database/EntityFramework/Migrations/20220211175051_R1_Patch.Designer.cs index 9c9183a4c..592fa70fc 100644 --- a/src/Database/Migrations/20220211175051_R1_Patch.Designer.cs +++ b/src/Database/EntityFramework/Migrations/20220211175051_R1_Patch.Designer.cs @@ -20,7 +20,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Monai.Deploy.InformaticsGateway.Database; +using Monai.Deploy.InformaticsGateway.Database.EntityFramework; #nullable disable diff --git a/src/Database/Migrations/20220211175051_R1_Patch.cs b/src/Database/EntityFramework/Migrations/20220211175051_R1_Patch.cs similarity index 100% rename from src/Database/Migrations/20220211175051_R1_Patch.cs rename to src/Database/EntityFramework/Migrations/20220211175051_R1_Patch.cs diff --git a/src/Database/Migrations/20220613235333_R2_0.2.0.Designer.cs b/src/Database/EntityFramework/Migrations/20220613235333_R2_0.2.0.Designer.cs similarity index 98% rename from src/Database/Migrations/20220613235333_R2_0.2.0.Designer.cs rename to src/Database/EntityFramework/Migrations/20220613235333_R2_0.2.0.Designer.cs index e93ef1cac..7a8a65c50 100644 --- a/src/Database/Migrations/20220613235333_R2_0.2.0.Designer.cs +++ b/src/Database/EntityFramework/Migrations/20220613235333_R2_0.2.0.Designer.cs @@ -20,7 +20,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Monai.Deploy.InformaticsGateway.Database; +using Monai.Deploy.InformaticsGateway.Database.EntityFramework; #nullable disable diff --git a/src/Database/Migrations/20220613235333_R2_0.2.0.cs b/src/Database/EntityFramework/Migrations/20220613235333_R2_0.2.0.cs similarity index 100% rename from src/Database/Migrations/20220613235333_R2_0.2.0.cs rename to src/Database/EntityFramework/Migrations/20220613235333_R2_0.2.0.cs diff --git a/src/Database/Migrations/20220802200605_R3_0.3.0.Designer.cs b/src/Database/EntityFramework/Migrations/20220802200605_R3_0.3.0.Designer.cs similarity index 99% rename from src/Database/Migrations/20220802200605_R3_0.3.0.Designer.cs rename to src/Database/EntityFramework/Migrations/20220802200605_R3_0.3.0.Designer.cs index 824553cd6..870df0416 100644 --- a/src/Database/Migrations/20220802200605_R3_0.3.0.Designer.cs +++ b/src/Database/EntityFramework/Migrations/20220802200605_R3_0.3.0.Designer.cs @@ -20,7 +20,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Monai.Deploy.InformaticsGateway.Database; +using Monai.Deploy.InformaticsGateway.Database.EntityFramework; #nullable disable diff --git a/src/Database/Migrations/20220802200605_R3_0.3.0.cs b/src/Database/EntityFramework/Migrations/20220802200605_R3_0.3.0.cs similarity index 100% rename from src/Database/Migrations/20220802200605_R3_0.3.0.cs rename to src/Database/EntityFramework/Migrations/20220802200605_R3_0.3.0.cs diff --git a/src/Database/Migrations/20221010184458_R3_0.3.2.Designer.cs b/src/Database/EntityFramework/Migrations/20221010184458_R3_0.3.2.Designer.cs similarity index 99% rename from src/Database/Migrations/20221010184458_R3_0.3.2.Designer.cs rename to src/Database/EntityFramework/Migrations/20221010184458_R3_0.3.2.Designer.cs index e3ff92b16..122b5ebd7 100644 --- a/src/Database/Migrations/20221010184458_R3_0.3.2.Designer.cs +++ b/src/Database/EntityFramework/Migrations/20221010184458_R3_0.3.2.Designer.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Monai.Deploy.InformaticsGateway.Database; +using Monai.Deploy.InformaticsGateway.Database.EntityFramework; #nullable disable diff --git a/src/Database/Migrations/20221010184458_R3_0.3.2.cs b/src/Database/EntityFramework/Migrations/20221010184458_R3_0.3.2.cs similarity index 100% rename from src/Database/Migrations/20221010184458_R3_0.3.2.cs rename to src/Database/EntityFramework/Migrations/20221010184458_R3_0.3.2.cs diff --git a/src/Database/Migrations/InformaticsGatewayContextModelSnapshot.cs b/src/Database/EntityFramework/Migrations/InformaticsGatewayContextModelSnapshot.cs similarity index 99% rename from src/Database/Migrations/InformaticsGatewayContextModelSnapshot.cs rename to src/Database/EntityFramework/Migrations/InformaticsGatewayContextModelSnapshot.cs index 18a940cef..2940a6ae8 100644 --- a/src/Database/Migrations/InformaticsGatewayContextModelSnapshot.cs +++ b/src/Database/EntityFramework/Migrations/InformaticsGatewayContextModelSnapshot.cs @@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Monai.Deploy.InformaticsGateway.Database; +using Monai.Deploy.InformaticsGateway.Database.EntityFramework; #nullable disable diff --git a/src/Database/EntityFramework/Monai.Deploy.InformaticsGateway.Database.EntityFramework.csproj b/src/Database/EntityFramework/Monai.Deploy.InformaticsGateway.Database.EntityFramework.csproj new file mode 100644 index 000000000..50cf4f1aa --- /dev/null +++ b/src/Database/EntityFramework/Monai.Deploy.InformaticsGateway.Database.EntityFramework.csproj @@ -0,0 +1,55 @@ + + + + + + Monai.Deploy.InformaticsGateway.Database.EntityFramework + net6.0 + Apache-2.0 + enable + ..\..\.sonarlint\project-monai_monai-deploy-informatics-gatewaycsharp.ruleset + enable + + + + + + + + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + + + + + + + diff --git a/src/Database/Monai.Deploy.InformaticsGateway.Database.csproj b/src/Database/Monai.Deploy.InformaticsGateway.Database.csproj index 0026b843c..2ba6321ea 100644 --- a/src/Database/Monai.Deploy.InformaticsGateway.Database.csproj +++ b/src/Database/Monai.Deploy.InformaticsGateway.Database.csproj @@ -26,6 +26,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -43,11 +63,6 @@ All - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - diff --git a/src/InformaticsGateway/Common/PayloadExtensions.cs b/src/InformaticsGateway/Common/PayloadExtensions.cs index 3733f7e94..190a65347 100644 --- a/src/InformaticsGateway/Common/PayloadExtensions.cs +++ b/src/InformaticsGateway/Common/PayloadExtensions.cs @@ -20,8 +20,8 @@ using Ardalis.GuardClauses; using Microsoft.Extensions.Logging; using Monai.Deploy.InformaticsGateway.Api.Storage; +using Monai.Deploy.InformaticsGateway.Database.Api; using Monai.Deploy.InformaticsGateway.Logging; -using Monai.Deploy.InformaticsGateway.Repositories; using Polly; namespace Monai.Deploy.InformaticsGateway.Common @@ -97,6 +97,5 @@ await Policy }) .ConfigureAwait(false); } - } } diff --git a/src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj b/src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj index 41c6e2516..82ca2efec 100644 --- a/src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj +++ b/src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj @@ -77,6 +77,7 @@ + diff --git a/src/InformaticsGateway/Program.cs b/src/InformaticsGateway/Program.cs index f1212ad8e..271255416 100644 --- a/src/InformaticsGateway/Program.cs +++ b/src/InformaticsGateway/Program.cs @@ -18,10 +18,8 @@ using System.IO; using System.IO.Abstractions; using System.Reflection; -using Ardalis.GuardClauses; using FellowOakDicom.Log; using Microsoft.AspNetCore.Hosting; -using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; @@ -67,20 +65,11 @@ private static void Main(string[] args) logger.Info($"Initializing MONAI Deploy Informatics Gateway v{assemblyVersionNumber}"); var host = CreateHostBuilder(args).Build(); - InitializeDatabase(host); + host.MigrateDatabase(); host.Run(); logger.Info("MONAI Deploy Informatics Gateway shutting down."); } - internal static void InitializeDatabase(IHost host) - { - Guard.Against.Null(host, nameof(host)); - - using var serviceScope = host.Services.CreateScope(); - var context = serviceScope.ServiceProvider.GetRequiredService(); - context.Database.Migrate(); - } - internal static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) .ConfigureHostConfiguration(configHost => @@ -112,9 +101,7 @@ internal static IHostBuilder CreateHostBuilder(string[] args) => services.TryAddEnumerable(ServiceDescriptor.Singleton, ConfigurationValidator>()); - services.AddDbContext( - options => options.UseSqlite(hostContext.Configuration.GetConnectionString(InformaticsGatewayConfiguration.DatabaseConnectionStringKey)), - ServiceLifetime.Transient); + services.ConfigureDatabase(hostContext.Configuration?.GetSection("ConnectionStrings")); services.AddTransient(); services.AddTransient(); @@ -123,7 +110,6 @@ internal static IHostBuilder CreateHostBuilder(string[] args) => services.AddTransient(); services.AddTransient(); - services.AddScoped(typeof(IInformaticsGatewayRepository<>), typeof(InformaticsGatewayRepository<>)); services.AddScoped(); services.AddScoped(); services.AddScoped(); diff --git a/src/InformaticsGateway/Repositories/IInferenceRequestRepository.cs b/src/InformaticsGateway/Repositories/IInferenceRequestRepository.cs index 00ac61e6f..02f3fe67d 100644 --- a/src/InformaticsGateway/Repositories/IInferenceRequestRepository.cs +++ b/src/InformaticsGateway/Repositories/IInferenceRequestRepository.cs @@ -36,7 +36,7 @@ public interface IInferenceRequestRepository /// /// Updates an inference request's status. /// The default implementation drops the request after 3 retries if status is - /// . + /// . /// /// The inference request to be updated. /// Current status of the inference request. @@ -47,7 +47,7 @@ public interface IInferenceRequestRepository /// The default implementation blocks the call until a pending inference request is available for process. /// /// cancellation token used to cancel the action. - /// + /// Task Take(CancellationToken cancellationToken); /// diff --git a/src/InformaticsGateway/Repositories/InferenceRequestRepository.cs b/src/InformaticsGateway/Repositories/InferenceRequestRepository.cs index ca4aa16c0..a44cfdba7 100644 --- a/src/InformaticsGateway/Repositories/InferenceRequestRepository.cs +++ b/src/InformaticsGateway/Repositories/InferenceRequestRepository.cs @@ -24,6 +24,7 @@ using Monai.Deploy.InformaticsGateway.Api; using Monai.Deploy.InformaticsGateway.Api.Rest; using Monai.Deploy.InformaticsGateway.Configuration; +using Monai.Deploy.InformaticsGateway.Database.Api; using Monai.Deploy.InformaticsGateway.Logging; using Polly; diff --git a/src/InformaticsGateway/Repositories/StorageMetadataWrapperRepository.cs b/src/InformaticsGateway/Repositories/StorageMetadataWrapperRepository.cs index a58f1d083..d82523520 100644 --- a/src/InformaticsGateway/Repositories/StorageMetadataWrapperRepository.cs +++ b/src/InformaticsGateway/Repositories/StorageMetadataWrapperRepository.cs @@ -26,7 +26,7 @@ using Monai.Deploy.InformaticsGateway.Api.Rest; using Monai.Deploy.InformaticsGateway.Api.Storage; using Monai.Deploy.InformaticsGateway.Configuration; -using Monai.Deploy.InformaticsGateway.Database; +using Monai.Deploy.InformaticsGateway.Database.Api; using Monai.Deploy.InformaticsGateway.Logging; using Polly; diff --git a/src/InformaticsGateway/Services/Connectors/DataRetrievalService.cs b/src/InformaticsGateway/Services/Connectors/DataRetrievalService.cs index 6f7733759..6a804fbb1 100644 --- a/src/InformaticsGateway/Services/Connectors/DataRetrievalService.cs +++ b/src/InformaticsGateway/Services/Connectors/DataRetrievalService.cs @@ -34,6 +34,7 @@ using Monai.Deploy.InformaticsGateway.Api.Storage; using Monai.Deploy.InformaticsGateway.Common; using Monai.Deploy.InformaticsGateway.Configuration; +using Monai.Deploy.InformaticsGateway.Database.Api; using Monai.Deploy.InformaticsGateway.DicomWeb.Client; using Monai.Deploy.InformaticsGateway.DicomWeb.Client.API; using Monai.Deploy.InformaticsGateway.Logging; diff --git a/src/InformaticsGateway/Services/Connectors/PayloadAssembler.cs b/src/InformaticsGateway/Services/Connectors/PayloadAssembler.cs index c5dbf5387..27bbdf55f 100644 --- a/src/InformaticsGateway/Services/Connectors/PayloadAssembler.cs +++ b/src/InformaticsGateway/Services/Connectors/PayloadAssembler.cs @@ -29,8 +29,8 @@ using Monai.Deploy.InformaticsGateway.Api.Storage; using Monai.Deploy.InformaticsGateway.Common; using Monai.Deploy.InformaticsGateway.Configuration; +using Monai.Deploy.InformaticsGateway.Database.Api; using Monai.Deploy.InformaticsGateway.Logging; -using Monai.Deploy.InformaticsGateway.Repositories; namespace Monai.Deploy.InformaticsGateway.Services.Connectors { diff --git a/src/InformaticsGateway/Services/Connectors/PayloadMoveActionHandler.cs b/src/InformaticsGateway/Services/Connectors/PayloadMoveActionHandler.cs index c2215f85f..71954c55e 100644 --- a/src/InformaticsGateway/Services/Connectors/PayloadMoveActionHandler.cs +++ b/src/InformaticsGateway/Services/Connectors/PayloadMoveActionHandler.cs @@ -27,8 +27,8 @@ using Monai.Deploy.InformaticsGateway.Api.Storage; using Monai.Deploy.InformaticsGateway.Common; using Monai.Deploy.InformaticsGateway.Configuration; +using Monai.Deploy.InformaticsGateway.Database.Api; using Monai.Deploy.InformaticsGateway.Logging; -using Monai.Deploy.InformaticsGateway.Repositories; using Monai.Deploy.Storage.API; namespace Monai.Deploy.InformaticsGateway.Services.Connectors diff --git a/src/InformaticsGateway/Services/Connectors/PayloadNotificationActionHandler.cs b/src/InformaticsGateway/Services/Connectors/PayloadNotificationActionHandler.cs index 28fd2b93a..42d21b18e 100644 --- a/src/InformaticsGateway/Services/Connectors/PayloadNotificationActionHandler.cs +++ b/src/InformaticsGateway/Services/Connectors/PayloadNotificationActionHandler.cs @@ -26,8 +26,9 @@ using Monai.Deploy.InformaticsGateway.Api.Storage; using Monai.Deploy.InformaticsGateway.Common; using Monai.Deploy.InformaticsGateway.Configuration; +using Monai.Deploy.InformaticsGateway.Database.Api; +using Monai.Deploy.InformaticsGateway.Database.Api; using Monai.Deploy.InformaticsGateway.Logging; -using Monai.Deploy.InformaticsGateway.Repositories; using Monai.Deploy.Messaging.API; using Monai.Deploy.Messaging.Events; using Monai.Deploy.Messaging.Messages; diff --git a/src/InformaticsGateway/Services/Connectors/PayloadNotificationService.cs b/src/InformaticsGateway/Services/Connectors/PayloadNotificationService.cs index c5f2f0a7e..8aa4b77a2 100644 --- a/src/InformaticsGateway/Services/Connectors/PayloadNotificationService.cs +++ b/src/InformaticsGateway/Services/Connectors/PayloadNotificationService.cs @@ -29,8 +29,8 @@ using Monai.Deploy.InformaticsGateway.Api.Storage; using Monai.Deploy.InformaticsGateway.Common; using Monai.Deploy.InformaticsGateway.Configuration; +using Monai.Deploy.InformaticsGateway.Database.Api; using Monai.Deploy.InformaticsGateway.Logging; -using Monai.Deploy.InformaticsGateway.Repositories; using Monai.Deploy.InformaticsGateway.Services.Common; namespace Monai.Deploy.InformaticsGateway.Services.Connectors diff --git a/src/InformaticsGateway/Services/Export/ScuExportService.cs b/src/InformaticsGateway/Services/Export/ScuExportService.cs index 60372b993..5e1b987cf 100644 --- a/src/InformaticsGateway/Services/Export/ScuExportService.cs +++ b/src/InformaticsGateway/Services/Export/ScuExportService.cs @@ -29,8 +29,8 @@ using Monai.Deploy.InformaticsGateway.Api; using Monai.Deploy.InformaticsGateway.Common; using Monai.Deploy.InformaticsGateway.Configuration; +using Monai.Deploy.InformaticsGateway.Database.Api; using Monai.Deploy.InformaticsGateway.Logging; -using Monai.Deploy.InformaticsGateway.Repositories; using Monai.Deploy.Messaging.Events; using Polly; diff --git a/src/InformaticsGateway/Services/Http/DestinationAeTitleController.cs b/src/InformaticsGateway/Services/Http/DestinationAeTitleController.cs index 7a0bc3b08..468a312c7 100644 --- a/src/InformaticsGateway/Services/Http/DestinationAeTitleController.cs +++ b/src/InformaticsGateway/Services/Http/DestinationAeTitleController.cs @@ -25,8 +25,8 @@ using Monai.Deploy.InformaticsGateway.Api; using Monai.Deploy.InformaticsGateway.Common; using Monai.Deploy.InformaticsGateway.Configuration; +using Monai.Deploy.InformaticsGateway.Database.Api; using Monai.Deploy.InformaticsGateway.Logging; -using Monai.Deploy.InformaticsGateway.Repositories; using Monai.Deploy.InformaticsGateway.Services.Scu; namespace Monai.Deploy.InformaticsGateway.Services.Http diff --git a/src/InformaticsGateway/Services/Http/MonaiAeTitleController.cs b/src/InformaticsGateway/Services/Http/MonaiAeTitleController.cs index bc715d111..2ace1759d 100644 --- a/src/InformaticsGateway/Services/Http/MonaiAeTitleController.cs +++ b/src/InformaticsGateway/Services/Http/MonaiAeTitleController.cs @@ -26,8 +26,8 @@ using Monai.Deploy.InformaticsGateway.Api; using Monai.Deploy.InformaticsGateway.Common; using Monai.Deploy.InformaticsGateway.Configuration; +using Monai.Deploy.InformaticsGateway.Database.Api; using Monai.Deploy.InformaticsGateway.Logging; -using Monai.Deploy.InformaticsGateway.Repositories; using Monai.Deploy.InformaticsGateway.Services.Scp; namespace Monai.Deploy.InformaticsGateway.Services.Http diff --git a/src/InformaticsGateway/Services/Http/SourceAeTitleController.cs b/src/InformaticsGateway/Services/Http/SourceAeTitleController.cs index 0478e9832..37cd526db 100644 --- a/src/InformaticsGateway/Services/Http/SourceAeTitleController.cs +++ b/src/InformaticsGateway/Services/Http/SourceAeTitleController.cs @@ -25,8 +25,8 @@ using Monai.Deploy.InformaticsGateway.Api; using Monai.Deploy.InformaticsGateway.Common; using Monai.Deploy.InformaticsGateway.Configuration; +using Monai.Deploy.InformaticsGateway.Database.Api; using Monai.Deploy.InformaticsGateway.Logging; -using Monai.Deploy.InformaticsGateway.Repositories; namespace Monai.Deploy.InformaticsGateway.Services.Http { diff --git a/src/InformaticsGateway/Services/Http/Startup.cs b/src/InformaticsGateway/Services/Http/Startup.cs index fed574936..a510d91d8 100644 --- a/src/InformaticsGateway/Services/Http/Startup.cs +++ b/src/InformaticsGateway/Services/Http/Startup.cs @@ -28,7 +28,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.OpenApi.Models; -using Monai.Deploy.InformaticsGateway.Database; +using Monai.Deploy.InformaticsGateway.Database.EntityFramework; using Monai.Deploy.InformaticsGateway.Services.Fhir; namespace Monai.Deploy.InformaticsGateway.Services.Http diff --git a/src/InformaticsGateway/Services/Scp/ApplicationEntityManager.cs b/src/InformaticsGateway/Services/Scp/ApplicationEntityManager.cs index dc44710bb..402f180e8 100644 --- a/src/InformaticsGateway/Services/Scp/ApplicationEntityManager.cs +++ b/src/InformaticsGateway/Services/Scp/ApplicationEntityManager.cs @@ -27,8 +27,8 @@ using Monai.Deploy.InformaticsGateway.Api; using Monai.Deploy.InformaticsGateway.Common; using Monai.Deploy.InformaticsGateway.Configuration; +using Monai.Deploy.InformaticsGateway.Database.Api; using Monai.Deploy.InformaticsGateway.Logging; -using Monai.Deploy.InformaticsGateway.Repositories; using Monai.Deploy.InformaticsGateway.Services.Storage; namespace Monai.Deploy.InformaticsGateway.Services.Scp diff --git a/src/InformaticsGateway/Services/Scu/ScuService.cs b/src/InformaticsGateway/Services/Scu/ScuService.cs index 4ff542c9e..62c8492d9 100644 --- a/src/InformaticsGateway/Services/Scu/ScuService.cs +++ b/src/InformaticsGateway/Services/Scu/ScuService.cs @@ -30,9 +30,8 @@ using Monai.Deploy.InformaticsGateway.Configuration; using Monai.Deploy.InformaticsGateway.Logging; using Monai.Deploy.InformaticsGateway.Services.Common; -using Monai.Deploy.InformaticsGateway.Services.Scu; -namespace Monai.Deploy.InformaticsGateway.Services.Scp +namespace Monai.Deploy.InformaticsGateway.Services.Scu { internal sealed class ScuService : IHostedService, IDisposable, IMonaiService { diff --git a/src/InformaticsGateway/Test/Monai.Deploy.InformaticsGateway.Test.csproj b/src/InformaticsGateway/Test/Monai.Deploy.InformaticsGateway.Test.csproj index d78a5da67..21e0c600f 100644 --- a/src/InformaticsGateway/Test/Monai.Deploy.InformaticsGateway.Test.csproj +++ b/src/InformaticsGateway/Test/Monai.Deploy.InformaticsGateway.Test.csproj @@ -51,6 +51,7 @@ + diff --git a/src/InformaticsGateway/Test/ProgramTest.cs b/src/InformaticsGateway/Test/ProgramTest.cs index 9ea89b2c9..8ea0ac349 100644 --- a/src/InformaticsGateway/Test/ProgramTest.cs +++ b/src/InformaticsGateway/Test/ProgramTest.cs @@ -36,8 +36,6 @@ public void Startup_RunsProperly() var host = Program.CreateHostBuilder(System.Array.Empty()).Build(); Assert.NotNull(host); - - Program.InitializeDatabase(host); } } } diff --git a/src/InformaticsGateway/Test/Repositories/InferenceRequestRepositoryTest.cs b/src/InformaticsGateway/Test/Repositories/InferenceRequestRepositoryTest.cs index d0e5c1c6a..5b211cfa6 100644 --- a/src/InformaticsGateway/Test/Repositories/InferenceRequestRepositoryTest.cs +++ b/src/InformaticsGateway/Test/Repositories/InferenceRequestRepositoryTest.cs @@ -21,6 +21,7 @@ using Microsoft.Extensions.Options; using Monai.Deploy.InformaticsGateway.Api.Rest; using Monai.Deploy.InformaticsGateway.Configuration; +using Monai.Deploy.InformaticsGateway.Database.Api; using Monai.Deploy.InformaticsGateway.Repositories; using Monai.Deploy.InformaticsGateway.SharedTest; using Moq; diff --git a/src/InformaticsGateway/Test/Repositories/InformaticsGatewayRepositoryTest.cs b/src/InformaticsGateway/Test/Repositories/InformaticsGatewayRepositoryTest.cs index 0bea243f1..51798e112 100644 --- a/src/InformaticsGateway/Test/Repositories/InformaticsGatewayRepositoryTest.cs +++ b/src/InformaticsGateway/Test/Repositories/InformaticsGatewayRepositoryTest.cs @@ -21,8 +21,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Monai.Deploy.InformaticsGateway.Api; -using Monai.Deploy.InformaticsGateway.Database; -using Monai.Deploy.InformaticsGateway.Repositories; +using Monai.Deploy.InformaticsGateway.Database.EntityFramework; using Moq; using xRetry; using Xunit; diff --git a/src/InformaticsGateway/Test/Repositories/StorageInfoWrapperRepositoryTest.cs b/src/InformaticsGateway/Test/Repositories/StorageInfoWrapperRepositoryTest.cs index f6b35e021..f1c3ebd8d 100644 --- a/src/InformaticsGateway/Test/Repositories/StorageInfoWrapperRepositoryTest.cs +++ b/src/InformaticsGateway/Test/Repositories/StorageInfoWrapperRepositoryTest.cs @@ -24,7 +24,7 @@ using Microsoft.Extensions.Options; using Monai.Deploy.InformaticsGateway.Api.Storage; using Monai.Deploy.InformaticsGateway.Configuration; -using Monai.Deploy.InformaticsGateway.Database; +using Monai.Deploy.InformaticsGateway.Database.Api; using Monai.Deploy.InformaticsGateway.Repositories; using Moq; using Xunit; diff --git a/src/InformaticsGateway/Test/Services/Connectors/DataRetrievalServiceTest.cs b/src/InformaticsGateway/Test/Services/Connectors/DataRetrievalServiceTest.cs index f07b59965..5eeb5724e 100644 --- a/src/InformaticsGateway/Test/Services/Connectors/DataRetrievalServiceTest.cs +++ b/src/InformaticsGateway/Test/Services/Connectors/DataRetrievalServiceTest.cs @@ -32,6 +32,7 @@ using Monai.Deploy.InformaticsGateway.Api.Storage; using Monai.Deploy.InformaticsGateway.Common; using Monai.Deploy.InformaticsGateway.Configuration; +using Monai.Deploy.InformaticsGateway.Database.Api; using Monai.Deploy.InformaticsGateway.DicomWeb.Client; using Monai.Deploy.InformaticsGateway.Repositories; using Monai.Deploy.InformaticsGateway.Services.Connectors; diff --git a/src/InformaticsGateway/Test/Services/Connectors/PayloadAssemblerTest.cs b/src/InformaticsGateway/Test/Services/Connectors/PayloadAssemblerTest.cs index 290906ca3..5ed9e0984 100644 --- a/src/InformaticsGateway/Test/Services/Connectors/PayloadAssemblerTest.cs +++ b/src/InformaticsGateway/Test/Services/Connectors/PayloadAssemblerTest.cs @@ -24,7 +24,7 @@ using Microsoft.Extensions.Options; using Monai.Deploy.InformaticsGateway.Api.Storage; using Monai.Deploy.InformaticsGateway.Configuration; -using Monai.Deploy.InformaticsGateway.Repositories; +using Monai.Deploy.InformaticsGateway.Database.Api; using Monai.Deploy.InformaticsGateway.Services.Connectors; using Monai.Deploy.InformaticsGateway.SharedTest; using Moq; @@ -74,7 +74,7 @@ public void GivenAPayloadAssembler_WhenInitialized_ExpectParametersToBeValidated Assert.Throws(() => new PayloadAssembler(_options, _logger.Object, null)); } - [RetryFact(10,200)] + [RetryFact(10, 200)] public async Task GivenAFileStorageMetadata_WhenQueueingWihtoutSpecifyingATimeout_ExpectDefaultTimeoutToBeUsed() { var payloadAssembler = new PayloadAssembler(_options, _logger.Object, _serviceScopeFactory.Object); @@ -88,7 +88,7 @@ public async Task GivenAFileStorageMetadata_WhenQueueingWihtoutSpecifyingATimeou _cancellationTokenSource.Cancel(); } - [RetryFact(10,200)] + [RetryFact(10, 200)] public async Task GivenFileStorageMetadataInTheDatabase_AtServiceStartup_ExpectPayloadsInCreatedStateToBeRemoved() { var dataset = new List @@ -110,7 +110,7 @@ public async Task GivenFileStorageMetadataInTheDatabase_AtServiceStartup_ExpectP _repository.Verify(p => p.Remove(It.IsAny()), Times.Exactly(2)); } - [RetryFact(10,200)] + [RetryFact(10, 200)] public async Task GivenAPayloadAssembler_WhenDisposed_ExpectResourceToBeCleanedUp() { var payloadAssembler = new PayloadAssembler(_options, _logger.Object, _serviceScopeFactory.Object); @@ -126,7 +126,7 @@ public async Task GivenAPayloadAssembler_WhenDisposed_ExpectResourceToBeCleanedU _logger.VerifyLoggingMessageBeginsWith($"Number of collections in queue", LogLevel.Trace, Times.Never()); } - [RetryFact(10,200)] + [RetryFact(10, 200)] public async Task GivenFileStorageMetadata_WhenQueueingWithDatabaseError_ExpectToRetryXTimes() { int callCount = 0; @@ -152,7 +152,7 @@ public async Task GivenFileStorageMetadata_WhenQueueingWithDatabaseError_ExpectT _logger.VerifyLoggingMessageBeginsWith($"Number of buckets active: 1.", LogLevel.Trace, Times.AtLeastOnce()); } - [RetryFact(10,200)] + [RetryFact(10, 200)] public async Task GivenAPayloadThatHasNotCompleteUploads_WhenProcessedByTimedEvent_ExpectToBeAddedToQueue() { _repository.Setup(p => p.SaveChangesAsync(It.IsAny())).Callback(() => @@ -171,7 +171,7 @@ public async Task GivenAPayloadThatHasNotCompleteUploads_WhenProcessedByTimedEve _logger.VerifyLoggingMessageBeginsWith($"Bucket A sent to processing queue", LogLevel.Information, Times.Never()); } - [RetryFact(10,200)] + [RetryFact(10, 200)] public async Task GivenAPayloadThatHasCompletedUploads_WhenProcessedByTimedEvent_ExpectToBeAddedToQueue() { var payloadAssembler = new PayloadAssembler(_options, _logger.Object, _serviceScopeFactory.Object); diff --git a/src/InformaticsGateway/Test/Services/Connectors/PayloadMoveActionHandlerTest.cs b/src/InformaticsGateway/Test/Services/Connectors/PayloadMoveActionHandlerTest.cs index 1c8434245..8dfe7de9d 100644 --- a/src/InformaticsGateway/Test/Services/Connectors/PayloadMoveActionHandlerTest.cs +++ b/src/InformaticsGateway/Test/Services/Connectors/PayloadMoveActionHandlerTest.cs @@ -24,7 +24,7 @@ using Microsoft.Extensions.Options; using Monai.Deploy.InformaticsGateway.Api.Storage; using Monai.Deploy.InformaticsGateway.Configuration; -using Monai.Deploy.InformaticsGateway.Repositories; +using Monai.Deploy.InformaticsGateway.Database.Api; using Monai.Deploy.InformaticsGateway.Services.Connectors; using Monai.Deploy.Storage.API; using Moq; @@ -70,7 +70,7 @@ public PayloadMoveActionHandlerTest() _options.Value.Storage.StorageServiceBucketName = "bucket"; } - [RetryFact(10,200)] + [RetryFact(10, 200)] public void GivenAPayloadMoveActionHandler_WhenInitialized_ExpectParametersToBeValidated() { Assert.Throws(() => new PayloadMoveActionHandler(null, null, null)); @@ -80,7 +80,7 @@ public void GivenAPayloadMoveActionHandler_WhenInitialized_ExpectParametersToBeV _ = new PayloadMoveActionHandler(_serviceScopeFactory.Object, _logger.Object, _options); } - [RetryFact(10,200)] + [RetryFact(10, 200)] public async Task GivenAPayloadInIncorrectState_WhenHandlerIsCalled_ExpectExceptionToBeThrown() { var resetEvent = new ManualResetEventSlim(); @@ -144,7 +144,7 @@ public async Task GivenAPayload_WhenHandlerFailedToCopyFiles_ExpectToBePutBackIn Assert.Equal(retryCount + 1, payload.RetryCount); } - [RetryFact(10,200)] + [RetryFact(10, 200)] public async Task GivenAPayloadThatHasReachedMaximumRetries_WhenHandlerFailedToCopyFiles_ExpectPayloadToBeDeleted() { var moveAction = new ActionBlock(payload => @@ -175,7 +175,7 @@ public async Task GivenAPayloadThatHasReachedMaximumRetries_WhenHandlerFailedToC _repository.Verify(p => p.Remove(payload), Times.Once()); } - [RetryFact(10,200)] + [RetryFact(10, 200)] public async Task GivenAPayload_WhenAllFilesAreMove_ExpectPayloadToBeAddedToNotificationQueue() { var notifyEvent = new ManualResetEventSlim(); diff --git a/src/InformaticsGateway/Test/Services/Connectors/PayloadNotificationActionHandlerTest.cs b/src/InformaticsGateway/Test/Services/Connectors/PayloadNotificationActionHandlerTest.cs index 67bc77e7f..1f6f9d780 100644 --- a/src/InformaticsGateway/Test/Services/Connectors/PayloadNotificationActionHandlerTest.cs +++ b/src/InformaticsGateway/Test/Services/Connectors/PayloadNotificationActionHandlerTest.cs @@ -24,7 +24,7 @@ using Microsoft.Extensions.Options; using Monai.Deploy.InformaticsGateway.Api.Storage; using Monai.Deploy.InformaticsGateway.Configuration; -using Monai.Deploy.InformaticsGateway.Repositories; +using Monai.Deploy.InformaticsGateway.Database.Api; using Monai.Deploy.InformaticsGateway.Services.Connectors; using Monai.Deploy.Messaging.API; using Monai.Deploy.Messaging.Messages; diff --git a/src/InformaticsGateway/Test/Services/Connectors/PayloadNotificationServiceTest.cs b/src/InformaticsGateway/Test/Services/Connectors/PayloadNotificationServiceTest.cs index a67307b17..1aa87f2f3 100644 --- a/src/InformaticsGateway/Test/Services/Connectors/PayloadNotificationServiceTest.cs +++ b/src/InformaticsGateway/Test/Services/Connectors/PayloadNotificationServiceTest.cs @@ -25,7 +25,7 @@ using Microsoft.Extensions.Options; using Monai.Deploy.InformaticsGateway.Api.Storage; using Monai.Deploy.InformaticsGateway.Configuration; -using Monai.Deploy.InformaticsGateway.Repositories; +using Monai.Deploy.InformaticsGateway.Database.Api; using Monai.Deploy.InformaticsGateway.Services.Connectors; using Monai.Deploy.InformaticsGateway.SharedTest; using Monai.Deploy.Messaging.API; @@ -85,7 +85,7 @@ public PayloadNotificationServiceTest() _logger.Setup(p => p.IsEnabled(It.IsAny())).Returns(true); } - [RetryFact(10,200)] + [RetryFact(10, 200)] public void GivenAPayloadNotificationService_AtInitialization_ExpectParametersToBeValidated() { Assert.Throws(() => new PayloadNotificationService(null, null, null)); @@ -93,7 +93,7 @@ public void GivenAPayloadNotificationService_AtInitialization_ExpectParametersTo Assert.Throws(() => new PayloadNotificationService(_serviceScopeFactory.Object, _logger.Object, null)); } - [RetryFact(10,200)] + [RetryFact(10, 200)] public async Task GivenThePayloadNotificationService_WhenStopAsyncIsCalled_ExpectServiceToStopAnyProcessing() { var payload = new Payload("test", Guid.NewGuid().ToString(), 100) { State = Payload.PayloadState.Move }; @@ -116,7 +116,7 @@ public async Task GivenThePayloadNotificationService_WhenStopAsyncIsCalled_Expec _logger.VerifyLogging($"Uploading payload {payload.Id} to storage service at {_options.Value.Storage.StorageServiceBucketName}.", LogLevel.Information, Times.Never()); } - [RetryFact(10,200)] + [RetryFact(10, 200)] public void GivenPayloadsStoredInTheDatabase_WhenServiceStarts_ExpectThePayloadsToBeRestored() { var testData = new List @@ -139,7 +139,7 @@ public void GivenPayloadsStoredInTheDatabase_WhenServiceStarts_ExpectThePayloads _payloadNotificationActionHandler.Verify(p => p.NotifyAsync(It.IsAny(), It.IsAny>(), It.IsAny()), Times.AtLeastOnce()); } - [RetryFact(10,200)] + [RetryFact(10, 200)] public void GivenAPayload_WhenDequedFromPayloadAssemblerAndFailedToBeProcessByTheMoveActionHandler() { var resetEvent = new ManualResetEventSlim(); @@ -157,7 +157,7 @@ public void GivenAPayload_WhenDequedFromPayloadAssemblerAndFailedToBeProcessByTh resetEvent.Wait(); } - [RetryFact(10,200)] + [RetryFact(10, 200)] public void GivenAPayload_WhenDequedFromPayloadAssembler_ExpectThePayloadBeProcessedByTheMoveActionHandler() { var payload = new Payload("test", Guid.NewGuid().ToString(), 100) { State = Payload.PayloadState.Move }; diff --git a/src/InformaticsGateway/Test/Services/Export/ScuExportServiceTest.cs b/src/InformaticsGateway/Test/Services/Export/ScuExportServiceTest.cs index 06cfd5c51..6573eac55 100644 --- a/src/InformaticsGateway/Test/Services/Export/ScuExportServiceTest.cs +++ b/src/InformaticsGateway/Test/Services/Export/ScuExportServiceTest.cs @@ -29,7 +29,7 @@ using Monai.Deploy.InformaticsGateway.Api; using Monai.Deploy.InformaticsGateway.Common; using Monai.Deploy.InformaticsGateway.Configuration; -using Monai.Deploy.InformaticsGateway.Repositories; +using Monai.Deploy.InformaticsGateway.Database.Api; using Monai.Deploy.InformaticsGateway.Services.Export; using Monai.Deploy.InformaticsGateway.Services.Storage; using Monai.Deploy.InformaticsGateway.SharedTest; diff --git a/src/InformaticsGateway/Test/Services/Http/DestinationAeTitleControllerTest.cs b/src/InformaticsGateway/Test/Services/Http/DestinationAeTitleControllerTest.cs index 7d14b2758..0f4513309 100644 --- a/src/InformaticsGateway/Test/Services/Http/DestinationAeTitleControllerTest.cs +++ b/src/InformaticsGateway/Test/Services/Http/DestinationAeTitleControllerTest.cs @@ -25,7 +25,7 @@ using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.Extensions.Logging; using Monai.Deploy.InformaticsGateway.Api; -using Monai.Deploy.InformaticsGateway.Repositories; +using Monai.Deploy.InformaticsGateway.Database.Api; using Monai.Deploy.InformaticsGateway.Services.Http; using Monai.Deploy.InformaticsGateway.Services.Scu; using Moq; diff --git a/src/InformaticsGateway/Test/Services/Http/MonaiAeTitleControllerTest.cs b/src/InformaticsGateway/Test/Services/Http/MonaiAeTitleControllerTest.cs index df1c0ad0e..466e91496 100644 --- a/src/InformaticsGateway/Test/Services/Http/MonaiAeTitleControllerTest.cs +++ b/src/InformaticsGateway/Test/Services/Http/MonaiAeTitleControllerTest.cs @@ -25,7 +25,7 @@ using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.Extensions.Logging; using Monai.Deploy.InformaticsGateway.Api; -using Monai.Deploy.InformaticsGateway.Repositories; +using Monai.Deploy.InformaticsGateway.Database.Api; using Monai.Deploy.InformaticsGateway.Services.Http; using Monai.Deploy.InformaticsGateway.Services.Scp; using Moq; diff --git a/src/InformaticsGateway/Test/Services/Http/SourceAeTitleControllerTest.cs b/src/InformaticsGateway/Test/Services/Http/SourceAeTitleControllerTest.cs index 5cf5d1d73..e4113d6d4 100644 --- a/src/InformaticsGateway/Test/Services/Http/SourceAeTitleControllerTest.cs +++ b/src/InformaticsGateway/Test/Services/Http/SourceAeTitleControllerTest.cs @@ -25,7 +25,7 @@ using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.Extensions.Logging; using Monai.Deploy.InformaticsGateway.Api; -using Monai.Deploy.InformaticsGateway.Repositories; +using Monai.Deploy.InformaticsGateway.Database.Api; using Monai.Deploy.InformaticsGateway.Services.Http; using Moq; using xRetry; diff --git a/src/InformaticsGateway/Test/Services/Scp/ApplicationEntityManagerTest.cs b/src/InformaticsGateway/Test/Services/Scp/ApplicationEntityManagerTest.cs index 023b618dd..cb2e023ab 100644 --- a/src/InformaticsGateway/Test/Services/Scp/ApplicationEntityManagerTest.cs +++ b/src/InformaticsGateway/Test/Services/Scp/ApplicationEntityManagerTest.cs @@ -27,7 +27,7 @@ using Monai.Deploy.InformaticsGateway.Api; using Monai.Deploy.InformaticsGateway.Common; using Monai.Deploy.InformaticsGateway.Configuration; -using Monai.Deploy.InformaticsGateway.Repositories; +using Monai.Deploy.InformaticsGateway.Database.Api; using Monai.Deploy.InformaticsGateway.Services.Scp; using Monai.Deploy.InformaticsGateway.Services.Storage; using Monai.Deploy.InformaticsGateway.SharedTest; diff --git a/src/InformaticsGateway/Test/Services/Scu/ScuServiceTest.cs b/src/InformaticsGateway/Test/Services/Scu/ScuServiceTest.cs index 13444945c..0b04bfa28 100644 --- a/src/InformaticsGateway/Test/Services/Scu/ScuServiceTest.cs +++ b/src/InformaticsGateway/Test/Services/Scu/ScuServiceTest.cs @@ -22,7 +22,6 @@ using Microsoft.Extensions.Options; using Monai.Deploy.InformaticsGateway.Api.Rest; using Monai.Deploy.InformaticsGateway.Configuration; -using Monai.Deploy.InformaticsGateway.Services.Scp; using Monai.Deploy.InformaticsGateway.Services.Scu; using Monai.Deploy.InformaticsGateway.SharedTest; using Moq; diff --git a/src/InformaticsGateway/Test/appsettings.json b/src/InformaticsGateway/Test/appsettings.json index ab2d2eeac..c48c5da51 100644 --- a/src/InformaticsGateway/Test/appsettings.json +++ b/src/InformaticsGateway/Test/appsettings.json @@ -1,5 +1,6 @@ { "ConnectionStrings": { + "Type": "Sqlite", "InformaticsGatewayDatabase": "Data Source=migdev.db" }, "InformaticsGateway": { diff --git a/src/InformaticsGateway/appsettings.json b/src/InformaticsGateway/appsettings.json index 7f444e1b1..d8125499a 100644 --- a/src/InformaticsGateway/appsettings.json +++ b/src/InformaticsGateway/appsettings.json @@ -1,5 +1,6 @@ { "ConnectionStrings": { + "Type": "Sqlite", "InformaticsGatewayDatabase": "Data Source=/database/mig.db" }, "InformaticsGateway": { diff --git a/src/Monai.Deploy.InformaticsGateway.sln b/src/Monai.Deploy.InformaticsGateway.sln index ac7be6905..91eee03f2 100644 --- a/src/Monai.Deploy.InformaticsGateway.sln +++ b/src/Monai.Deploy.InformaticsGateway.sln @@ -42,7 +42,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.InformaticsGat EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.InformaticsGateway.DicomWeb.Client.CLI", "DicomWebClient\CLI\Monai.Deploy.InformaticsGateway.DicomWeb.Client.CLI.csproj", "{689E0066-81DA-4602-B058-D93389DF5DBD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.InformaticsGateway.Database.Test", "Database\Test\Monai.Deploy.InformaticsGateway.Database.Test.csproj", "{D5BA6DE3-E861-44D4-BD1B-45FFA57649AC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.InformaticsGateway.Database.EntityFramework", "Database\EntityFramework\Monai.Deploy.InformaticsGateway.Database.EntityFramework.csproj", "{313B68CE-A0DB-4DE2-8359-AC777F5997FE}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.InformaticsGateway.Database.Api", "Database\Api\Monai.Deploy.InformaticsGateway.Database.Api.csproj", "{366CA24C-B546-46AD-8607-AABE4F0F4864}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Monai.Deploy.InformaticsGateway.Database.Api.Test", "Database\Api\Test\Monai.Deploy.InformaticsGateway.Database.Api.Test.csproj", "{7F56994D-5310-467F-96FC-87C26F151737}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -282,18 +286,42 @@ Global {689E0066-81DA-4602-B058-D93389DF5DBD}.Release|x64.Build.0 = Release|Any CPU {689E0066-81DA-4602-B058-D93389DF5DBD}.Release|x86.ActiveCfg = Release|Any CPU {689E0066-81DA-4602-B058-D93389DF5DBD}.Release|x86.Build.0 = Release|Any CPU - {D5BA6DE3-E861-44D4-BD1B-45FFA57649AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5BA6DE3-E861-44D4-BD1B-45FFA57649AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5BA6DE3-E861-44D4-BD1B-45FFA57649AC}.Debug|x64.ActiveCfg = Debug|Any CPU - {D5BA6DE3-E861-44D4-BD1B-45FFA57649AC}.Debug|x64.Build.0 = Debug|Any CPU - {D5BA6DE3-E861-44D4-BD1B-45FFA57649AC}.Debug|x86.ActiveCfg = Debug|Any CPU - {D5BA6DE3-E861-44D4-BD1B-45FFA57649AC}.Debug|x86.Build.0 = Debug|Any CPU - {D5BA6DE3-E861-44D4-BD1B-45FFA57649AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5BA6DE3-E861-44D4-BD1B-45FFA57649AC}.Release|Any CPU.Build.0 = Release|Any CPU - {D5BA6DE3-E861-44D4-BD1B-45FFA57649AC}.Release|x64.ActiveCfg = Release|Any CPU - {D5BA6DE3-E861-44D4-BD1B-45FFA57649AC}.Release|x64.Build.0 = Release|Any CPU - {D5BA6DE3-E861-44D4-BD1B-45FFA57649AC}.Release|x86.ActiveCfg = Release|Any CPU - {D5BA6DE3-E861-44D4-BD1B-45FFA57649AC}.Release|x86.Build.0 = Release|Any CPU + {313B68CE-A0DB-4DE2-8359-AC777F5997FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {313B68CE-A0DB-4DE2-8359-AC777F5997FE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {313B68CE-A0DB-4DE2-8359-AC777F5997FE}.Debug|x64.ActiveCfg = Debug|Any CPU + {313B68CE-A0DB-4DE2-8359-AC777F5997FE}.Debug|x64.Build.0 = Debug|Any CPU + {313B68CE-A0DB-4DE2-8359-AC777F5997FE}.Debug|x86.ActiveCfg = Debug|Any CPU + {313B68CE-A0DB-4DE2-8359-AC777F5997FE}.Debug|x86.Build.0 = Debug|Any CPU + {313B68CE-A0DB-4DE2-8359-AC777F5997FE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {313B68CE-A0DB-4DE2-8359-AC777F5997FE}.Release|Any CPU.Build.0 = Release|Any CPU + {313B68CE-A0DB-4DE2-8359-AC777F5997FE}.Release|x64.ActiveCfg = Release|Any CPU + {313B68CE-A0DB-4DE2-8359-AC777F5997FE}.Release|x64.Build.0 = Release|Any CPU + {313B68CE-A0DB-4DE2-8359-AC777F5997FE}.Release|x86.ActiveCfg = Release|Any CPU + {313B68CE-A0DB-4DE2-8359-AC777F5997FE}.Release|x86.Build.0 = Release|Any CPU + {366CA24C-B546-46AD-8607-AABE4F0F4864}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {366CA24C-B546-46AD-8607-AABE4F0F4864}.Debug|Any CPU.Build.0 = Debug|Any CPU + {366CA24C-B546-46AD-8607-AABE4F0F4864}.Debug|x64.ActiveCfg = Debug|Any CPU + {366CA24C-B546-46AD-8607-AABE4F0F4864}.Debug|x64.Build.0 = Debug|Any CPU + {366CA24C-B546-46AD-8607-AABE4F0F4864}.Debug|x86.ActiveCfg = Debug|Any CPU + {366CA24C-B546-46AD-8607-AABE4F0F4864}.Debug|x86.Build.0 = Debug|Any CPU + {366CA24C-B546-46AD-8607-AABE4F0F4864}.Release|Any CPU.ActiveCfg = Release|Any CPU + {366CA24C-B546-46AD-8607-AABE4F0F4864}.Release|Any CPU.Build.0 = Release|Any CPU + {366CA24C-B546-46AD-8607-AABE4F0F4864}.Release|x64.ActiveCfg = Release|Any CPU + {366CA24C-B546-46AD-8607-AABE4F0F4864}.Release|x64.Build.0 = Release|Any CPU + {366CA24C-B546-46AD-8607-AABE4F0F4864}.Release|x86.ActiveCfg = Release|Any CPU + {366CA24C-B546-46AD-8607-AABE4F0F4864}.Release|x86.Build.0 = Release|Any CPU + {7F56994D-5310-467F-96FC-87C26F151737}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7F56994D-5310-467F-96FC-87C26F151737}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7F56994D-5310-467F-96FC-87C26F151737}.Debug|x64.ActiveCfg = Debug|Any CPU + {7F56994D-5310-467F-96FC-87C26F151737}.Debug|x64.Build.0 = Debug|Any CPU + {7F56994D-5310-467F-96FC-87C26F151737}.Debug|x86.ActiveCfg = Debug|Any CPU + {7F56994D-5310-467F-96FC-87C26F151737}.Debug|x86.Build.0 = Debug|Any CPU + {7F56994D-5310-467F-96FC-87C26F151737}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7F56994D-5310-467F-96FC-87C26F151737}.Release|Any CPU.Build.0 = Release|Any CPU + {7F56994D-5310-467F-96FC-87C26F151737}.Release|x64.ActiveCfg = Release|Any CPU + {7F56994D-5310-467F-96FC-87C26F151737}.Release|x64.Build.0 = Release|Any CPU + {7F56994D-5310-467F-96FC-87C26F151737}.Release|x86.ActiveCfg = Release|Any CPU + {7F56994D-5310-467F-96FC-87C26F151737}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -308,7 +336,7 @@ Global {E1583FDB-9DC1-46E7-BB14-AFC2A7608600} = {B8E99EF7-84EA-4D11-B722-9EE81B89CD86} {28099DFC-8937-4508-848C-35C99E56C121} = {B8E99EF7-84EA-4D11-B722-9EE81B89CD86} {0BB99F0E-669F-4884-9DB1-AFA16CC9C67B} = {B8E99EF7-84EA-4D11-B722-9EE81B89CD86} - {D5BA6DE3-E861-44D4-BD1B-45FFA57649AC} = {B8E99EF7-84EA-4D11-B722-9EE81B89CD86} + {7F56994D-5310-467F-96FC-87C26F151737} = {B8E99EF7-84EA-4D11-B722-9EE81B89CD86} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E23DC856-D033-49F6-9BC6-9F1D0ECD05CB} diff --git a/tests/Integration.Test/Hooks/SqlHooks.cs b/tests/Integration.Test/Hooks/SqlHooks.cs index df3873605..3d48f0c68 100644 --- a/tests/Integration.Test/Hooks/SqlHooks.cs +++ b/tests/Integration.Test/Hooks/SqlHooks.cs @@ -16,7 +16,7 @@ using Microsoft.EntityFrameworkCore; using Monai.Deploy.InformaticsGateway.Api.Rest; -using Monai.Deploy.InformaticsGateway.Database; +using Monai.Deploy.InformaticsGateway.Database.EntityFramework; using Monai.Deploy.InformaticsGateway.Integration.Test.Drivers; using Monai.Deploy.InformaticsGateway.Integration.Test.StepDefinitions; using TechTalk.SpecFlow.Infrastructure; diff --git a/tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj b/tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj index 8adce514c..293799c5b 100644 --- a/tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj +++ b/tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj @@ -1,4 +1,4 @@ -