From 7c6428d978a9cf4a2e9f798f25008811fbb567c4 Mon Sep 17 00:00:00 2001 From: Dustin Burson Date: Mon, 18 Nov 2019 06:21:00 -0800 Subject: [PATCH 1/6] Enable code deploy --- Microsoft.Health.Fhir.Ingest.sln | 2 +- .../default-azuredeploy-sandbox.json | 4 +- deploy/templates/default-azuredeploy.json | 4 +- ... Microsoft.Health.Fhir.Ingest.Host.csproj} | 110 +++++++++--------- 4 files changed, 60 insertions(+), 60 deletions(-) rename src/func/Microsoft.Health.Fhir.Ingest.Host/{Microsoft.Health.Ingest.Host.csproj => Microsoft.Health.Fhir.Ingest.Host.csproj} (93%) diff --git a/Microsoft.Health.Fhir.Ingest.sln b/Microsoft.Health.Fhir.Ingest.sln index 55a2c65c..08b33811 100644 --- a/Microsoft.Health.Fhir.Ingest.sln +++ b/Microsoft.Health.Fhir.Ingest.sln @@ -14,7 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "func", "func", "{E8C74AB9-F EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{FAF8B402-892E-4EA2-B4CF-69B0C70BA762}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Health.Ingest.Host", "src\func\Microsoft.Health.Fhir.Ingest.Host\Microsoft.Health.Ingest.Host.csproj", "{11F6C10F-483A-4DD7-99A3-14FDD5CCA3F1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Health.Fhir.Ingest.Host", "src\func\Microsoft.Health.Fhir.Ingest.Host\Microsoft.Health.Fhir.Ingest.Host.csproj", "{11F6C10F-483A-4DD7-99A3-14FDD5CCA3F1}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Health.Fhir.Ingest.UnitTests", "test\Microsoft.Health.Fhir.Ingest.UnitTests\Microsoft.Health.Fhir.Ingest.UnitTests.csproj", "{F6422A39-DC02-436B-AC1F-82CC9CF75E73}" EndProject diff --git a/deploy/templates/default-azuredeploy-sandbox.json b/deploy/templates/default-azuredeploy-sandbox.json index c19516d8..db800a19 100644 --- a/deploy/templates/default-azuredeploy-sandbox.json +++ b/deploy/templates/default-azuredeploy-sandbox.json @@ -12,7 +12,7 @@ }, "RepositoryUrl": { "type": "string", - "defaultValue": "https://github.com/microsoft/iomt-fhir", + "defaultValue": "https://github.com/Microsoft/iomt-fhir", "metadata": { "description": "Repository to pull source code from. If blank, source code will not be deployed." } @@ -637,7 +637,7 @@ "OutputEventHub": "[concat('@Microsoft.KeyVault(SecretUri=', reference(resourceId('Microsoft.KeyVault/vaults/secrets', variables('key_vault_name'),'device-output-connection'), '2018-02-14').secretUriWithVersion, ')')]", "FUNCTIONS_EXTENSION_VERSION": "~2", "FUNCTIONS_EXTENSION_RUNTIME": "dotnet", - "PROJECT": "src/func/Microsoft.Health.Ingest.Host/Microsoft.Health.Ingest.Host.csproj", + "PROJECT": "src/func/Microsoft.Health.Fhir.Ingest.Host/Microsoft.Health.Fhir.Ingest.Host.csproj", "AzureWebJobsStorage": "[concat('@Microsoft.KeyVault(SecretUri=', reference(resourceId('Microsoft.KeyVault/vaults/secrets', variables('key_vault_name'),'blob-storage-cs'), '2018-02-14').secretUriWithVersion, ')')]", "AzureWebJobsSecretStorageType": "Files", "FhirService:Url": "[concat('@Microsoft.KeyVault(SecretUri=', reference(resourceId('Microsoft.KeyVault/vaults/secrets', variables('key_vault_name'),'fhirserver-url'), '2018-02-14').secretUriWithVersion, ')')]", diff --git a/deploy/templates/default-azuredeploy.json b/deploy/templates/default-azuredeploy.json index af24b05f..908c51e5 100644 --- a/deploy/templates/default-azuredeploy.json +++ b/deploy/templates/default-azuredeploy.json @@ -12,7 +12,7 @@ }, "RepositoryUrl": { "type": "string", - "defaultValue": "https://github.com/microsoft/iomt-fhir", + "defaultValue": "https://github.com/Microsoft/iomt-fhir", "metadata": { "description": "Repository to pull source code from. If blank, source code will not be deployed." } @@ -575,7 +575,7 @@ "OutputEventHub": "[concat('@Microsoft.KeyVault(SecretUri=', reference(resourceId('Microsoft.KeyVault/vaults/secrets', variables('key_vault_name'),'device-output-connection'), '2018-02-14').secretUriWithVersion, ')')]", "FUNCTIONS_EXTENSION_VERSION": "~2", "FUNCTIONS_EXTENSION_RUNTIME": "dotnet", - "PROJECT": "src/func/Microsoft.Health.Ingest.Host/Microsoft.Health.Ingest.Host.csproj", + "PROJECT": "src/func/Microsoft.Health.Fhir.Ingest.Host/Microsoft.Health.Fhir.Ingest.Host.csproj", "AzureWebJobsStorage": "[concat('@Microsoft.KeyVault(SecretUri=', reference(resourceId('Microsoft.KeyVault/vaults/secrets', variables('key_vault_name'),'blob-storage-cs'), '2018-02-14').secretUriWithVersion, ')')]", "AzureWebJobsSecretStorageType": "Files", "FhirService:Url": "[concat('@Microsoft.KeyVault(SecretUri=', reference(resourceId('Microsoft.KeyVault/vaults/secrets', variables('key_vault_name'),'fhirserver-url'), '2018-02-14').secretUriWithVersion, ')')]", diff --git a/src/func/Microsoft.Health.Fhir.Ingest.Host/Microsoft.Health.Ingest.Host.csproj b/src/func/Microsoft.Health.Fhir.Ingest.Host/Microsoft.Health.Fhir.Ingest.Host.csproj similarity index 93% rename from src/func/Microsoft.Health.Fhir.Ingest.Host/Microsoft.Health.Ingest.Host.csproj rename to src/func/Microsoft.Health.Fhir.Ingest.Host/Microsoft.Health.Fhir.Ingest.Host.csproj index 79aaf9d4..95d22f2b 100644 --- a/src/func/Microsoft.Health.Fhir.Ingest.Host/Microsoft.Health.Ingest.Host.csproj +++ b/src/func/Microsoft.Health.Fhir.Ingest.Host/Microsoft.Health.Fhir.Ingest.Host.csproj @@ -1,56 +1,56 @@ - - - netcoreapp3.0 - v2 - ..\..\..\CustomAnalysisRules.ruleset - true - Microsoft.Health.Fhir.Ingest.Service - Microsoft.Health.Fhir.Ingest.Service - latest - - - true - - - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - PreserveNewest - - - Always - Never - - - Never - - - Never - - - - - - - - - + + + netcoreapp3.0 + v2 + ..\..\..\CustomAnalysisRules.ruleset + true + Microsoft.Health.Fhir.Ingest.Host + Microsoft.Health.Fhir.Ingest.Host + latest + + + true + + + + + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + PreserveNewest + + + Always + Never + + + Never + + + Never + + + + + + + + + \ No newline at end of file From 2ee596a06eaac0da5bbaafac0d6c02ff22acbb18 Mon Sep 17 00:00:00 2001 From: Dustin Burson Date: Mon, 18 Nov 2019 06:48:01 -0800 Subject: [PATCH 2/6] Downgrade to .NET Core 2.2 --- .../Microsoft.Health.Fhir.Ingest.Host.csproj | 2 +- .../Microsoft.Health.Common.csproj | 2 +- ...Microsoft.Health.Extensions.Fhir.R4.csproj | 2 +- .../Microsoft.Health.Extensions.Fhir.csproj | 2 +- .../Microsoft.Health.Extensions.Host.csproj | 2 +- .../Microsoft.Health.Fhir.Ingest.csproj | 2 +- .../Microsoft.Health.Fhir.R4.Ingest.csproj | 2 +- .../Microsoft.Health.Common.UnitTests.csproj | 2 +- ...Health.Extensions.Fhir.R4.UnitTests.csproj | 2 +- ...ft.Health.Extensions.Fhir.UnitTests.csproj | 2 +- ...rosoft.Health.Fhir.Ingest.UnitTests.csproj | 2 +- ...oft.Health.Fhir.R4.Ingest.UnitTests.csproj | 2 +- .../CodeValueFhirTemplateProcessorTests.cs | 48 +++++++++---------- .../Microsoft.Health.Tests.Common.csproj | 2 +- 14 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/func/Microsoft.Health.Fhir.Ingest.Host/Microsoft.Health.Fhir.Ingest.Host.csproj b/src/func/Microsoft.Health.Fhir.Ingest.Host/Microsoft.Health.Fhir.Ingest.Host.csproj index 95d22f2b..5d21a280 100644 --- a/src/func/Microsoft.Health.Fhir.Ingest.Host/Microsoft.Health.Fhir.Ingest.Host.csproj +++ b/src/func/Microsoft.Health.Fhir.Ingest.Host/Microsoft.Health.Fhir.Ingest.Host.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0 + netcoreapp2.2 v2 ..\..\..\CustomAnalysisRules.ruleset true diff --git a/src/lib/Microsoft.Health.Common/Microsoft.Health.Common.csproj b/src/lib/Microsoft.Health.Common/Microsoft.Health.Common.csproj index df79323b..1bc8a60b 100644 --- a/src/lib/Microsoft.Health.Common/Microsoft.Health.Common.csproj +++ b/src/lib/Microsoft.Health.Common/Microsoft.Health.Common.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0 + netcoreapp2.2 ..\..\..\CustomAnalysisRules.ruleset true diff --git a/src/lib/Microsoft.Health.Extensions.Fhir.R4/Microsoft.Health.Extensions.Fhir.R4.csproj b/src/lib/Microsoft.Health.Extensions.Fhir.R4/Microsoft.Health.Extensions.Fhir.R4.csproj index 32d51f72..a2b3bb65 100644 --- a/src/lib/Microsoft.Health.Extensions.Fhir.R4/Microsoft.Health.Extensions.Fhir.R4.csproj +++ b/src/lib/Microsoft.Health.Extensions.Fhir.R4/Microsoft.Health.Extensions.Fhir.R4.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0 + netcoreapp2.2 ..\..\..\CustomAnalysisRules.ruleset true diff --git a/src/lib/Microsoft.Health.Extensions.Fhir/Microsoft.Health.Extensions.Fhir.csproj b/src/lib/Microsoft.Health.Extensions.Fhir/Microsoft.Health.Extensions.Fhir.csproj index 3016e264..0d2071c2 100644 --- a/src/lib/Microsoft.Health.Extensions.Fhir/Microsoft.Health.Extensions.Fhir.csproj +++ b/src/lib/Microsoft.Health.Extensions.Fhir/Microsoft.Health.Extensions.Fhir.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0 + netcoreapp2.2 ..\..\..\CustomAnalysisRules.ruleset true diff --git a/src/lib/Microsoft.Health.Extensions.Host/Microsoft.Health.Extensions.Host.csproj b/src/lib/Microsoft.Health.Extensions.Host/Microsoft.Health.Extensions.Host.csproj index 987dfd04..93abae41 100644 --- a/src/lib/Microsoft.Health.Extensions.Host/Microsoft.Health.Extensions.Host.csproj +++ b/src/lib/Microsoft.Health.Extensions.Host/Microsoft.Health.Extensions.Host.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0 + netcoreapp2.2 ..\..\..\CustomAnalysisRules.ruleset true diff --git a/src/lib/Microsoft.Health.Fhir.Ingest/Microsoft.Health.Fhir.Ingest.csproj b/src/lib/Microsoft.Health.Fhir.Ingest/Microsoft.Health.Fhir.Ingest.csproj index 574025f9..10cf5429 100644 --- a/src/lib/Microsoft.Health.Fhir.Ingest/Microsoft.Health.Fhir.Ingest.csproj +++ b/src/lib/Microsoft.Health.Fhir.Ingest/Microsoft.Health.Fhir.Ingest.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0 + netcoreapp2.2 ..\..\..\CustomAnalysisRules.ruleset true Microsoft.Health.Fhir.Ingest diff --git a/src/lib/Microsoft.Health.Fhir.R4.Ingest/Microsoft.Health.Fhir.R4.Ingest.csproj b/src/lib/Microsoft.Health.Fhir.R4.Ingest/Microsoft.Health.Fhir.R4.Ingest.csproj index 11470b33..33f44b85 100644 --- a/src/lib/Microsoft.Health.Fhir.R4.Ingest/Microsoft.Health.Fhir.R4.Ingest.csproj +++ b/src/lib/Microsoft.Health.Fhir.R4.Ingest/Microsoft.Health.Fhir.R4.Ingest.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0 + netcoreapp2.2 ..\..\..\CustomAnalysisRules.ruleset true Microsoft.Health.Fhir.Ingest.R4 diff --git a/test/Microsoft.Health.Common.UnitTests/Microsoft.Health.Common.UnitTests.csproj b/test/Microsoft.Health.Common.UnitTests/Microsoft.Health.Common.UnitTests.csproj index cb051d6e..7c6e5b8f 100644 --- a/test/Microsoft.Health.Common.UnitTests/Microsoft.Health.Common.UnitTests.csproj +++ b/test/Microsoft.Health.Common.UnitTests/Microsoft.Health.Common.UnitTests.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0 + netcoreapp2.2 ..\..\CustomAnalysisRules.Test.ruleset true Off diff --git a/test/Microsoft.Health.Extensions.Fhir.R4.UnitTests/Microsoft.Health.Extensions.Fhir.R4.UnitTests.csproj b/test/Microsoft.Health.Extensions.Fhir.R4.UnitTests/Microsoft.Health.Extensions.Fhir.R4.UnitTests.csproj index c08a4a00..7d7d1278 100644 --- a/test/Microsoft.Health.Extensions.Fhir.R4.UnitTests/Microsoft.Health.Extensions.Fhir.R4.UnitTests.csproj +++ b/test/Microsoft.Health.Extensions.Fhir.R4.UnitTests/Microsoft.Health.Extensions.Fhir.R4.UnitTests.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0 + netcoreapp2.2 ..\..\CustomAnalysisRules.Test.ruleset true false diff --git a/test/Microsoft.Health.Extensions.Fhir.UnitTests/Microsoft.Health.Extensions.Fhir.UnitTests.csproj b/test/Microsoft.Health.Extensions.Fhir.UnitTests/Microsoft.Health.Extensions.Fhir.UnitTests.csproj index c08a4a00..7d7d1278 100644 --- a/test/Microsoft.Health.Extensions.Fhir.UnitTests/Microsoft.Health.Extensions.Fhir.UnitTests.csproj +++ b/test/Microsoft.Health.Extensions.Fhir.UnitTests/Microsoft.Health.Extensions.Fhir.UnitTests.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0 + netcoreapp2.2 ..\..\CustomAnalysisRules.Test.ruleset true false diff --git a/test/Microsoft.Health.Fhir.Ingest.UnitTests/Microsoft.Health.Fhir.Ingest.UnitTests.csproj b/test/Microsoft.Health.Fhir.Ingest.UnitTests/Microsoft.Health.Fhir.Ingest.UnitTests.csproj index 460210de..38bbe6b6 100644 --- a/test/Microsoft.Health.Fhir.Ingest.UnitTests/Microsoft.Health.Fhir.Ingest.UnitTests.csproj +++ b/test/Microsoft.Health.Fhir.Ingest.UnitTests/Microsoft.Health.Fhir.Ingest.UnitTests.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0 + netcoreapp2.2 ..\..\CustomAnalysisRules.Test.ruleset false Microsoft.Health.Fhir.Ingest diff --git a/test/Microsoft.Health.Fhir.R4.Ingest.UnitTests/Microsoft.Health.Fhir.R4.Ingest.UnitTests.csproj b/test/Microsoft.Health.Fhir.R4.Ingest.UnitTests/Microsoft.Health.Fhir.R4.Ingest.UnitTests.csproj index ee651407..4f797409 100644 --- a/test/Microsoft.Health.Fhir.R4.Ingest.UnitTests/Microsoft.Health.Fhir.R4.Ingest.UnitTests.csproj +++ b/test/Microsoft.Health.Fhir.R4.Ingest.UnitTests/Microsoft.Health.Fhir.R4.Ingest.UnitTests.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0 + netcoreapp2.2 ..\..\CustomAnalysisRules.Test.ruleset false Microsoft.Health.Fhir.Ingest diff --git a/test/Microsoft.Health.Fhir.R4.Ingest.UnitTests/Template/CodeValueFhirTemplateProcessorTests.cs b/test/Microsoft.Health.Fhir.R4.Ingest.UnitTests/Template/CodeValueFhirTemplateProcessorTests.cs index 56106dc1..09cf6947 100644 --- a/test/Microsoft.Health.Fhir.R4.Ingest.UnitTests/Template/CodeValueFhirTemplateProcessorTests.cs +++ b/test/Microsoft.Health.Fhir.R4.Ingest.UnitTests/Template/CodeValueFhirTemplateProcessorTests.cs @@ -228,17 +228,17 @@ public void GivenTemplateWithComponent_WhenCreateObservation_ThenObservationRetu { Assert.Collection( c.Code.Coding, - c => + code => { - Assert.Equal("d", c.System); - Assert.Equal("code2", c.Code); - Assert.Equal("c", c.Display); + Assert.Equal("d", code.System); + Assert.Equal("code2", code.Code); + Assert.Equal("c", code.Display); }, - c => + code => { - Assert.Equal(FhirImportService.ServiceSystem, c.System); - Assert.Equal("p2", c.Code); - Assert.Equal("p2", c.Display); + Assert.Equal(FhirImportService.ServiceSystem, code.System); + Assert.Equal("p2", code.Code); + Assert.Equal("p2", code.Display); }); Assert.Equal(element, c.Value); }); @@ -427,17 +427,17 @@ public void GivenTemplateWithComponent_WhenMergObservation_ThenObservationReturn // New component value added to observation Assert.Collection( c.Code.Coding, - c => + code => { - Assert.Equal("f", c.System); - Assert.Equal("code3", c.Code); - Assert.Equal("e", c.Display); + Assert.Equal("f", code.System); + Assert.Equal("code3", code.Code); + Assert.Equal("e", code.Display); }, - c => + code => { - Assert.Equal(FhirImportService.ServiceSystem, c.System); - Assert.Equal("p3", c.Code); - Assert.Equal("p3", c.Display); + Assert.Equal(FhirImportService.ServiceSystem, code.System); + Assert.Equal("p3", code.Code); + Assert.Equal("p3", code.Display); }); Assert.Equal(element, c.Value); }); @@ -517,17 +517,17 @@ public void GivenTemplateWithComponentAndObservationWithOutComponent_WhenMergObs // New component value added to observation Assert.Collection( c.Code.Coding, - c => + code => { - Assert.Equal("d", c.System); - Assert.Equal("code2", c.Code); - Assert.Equal("c", c.Display); + Assert.Equal("d", code.System); + Assert.Equal("code2", code.Code); + Assert.Equal("c", code.Display); }, - c => + code => { - Assert.Equal(FhirImportService.ServiceSystem, c.System); - Assert.Equal("p2", c.Code); - Assert.Equal("p2", c.Display); + Assert.Equal(FhirImportService.ServiceSystem, code.System); + Assert.Equal("p2", code.Code); + Assert.Equal("p2", code.Display); }); Assert.Equal(element, c.Value); }); diff --git a/test/Microsoft.Health.Tests.Common/Microsoft.Health.Tests.Common.csproj b/test/Microsoft.Health.Tests.Common/Microsoft.Health.Tests.Common.csproj index 0dd79911..2471864d 100644 --- a/test/Microsoft.Health.Tests.Common/Microsoft.Health.Tests.Common.csproj +++ b/test/Microsoft.Health.Tests.Common/Microsoft.Health.Tests.Common.csproj @@ -1,6 +1,6 @@  - netcoreapp3.0 + netcoreapp2.2 false ..\..\CustomAnalysisRules.Test.ruleset true From b106c7278335f976efe5fb730816d4a666ce0778 Mon Sep 17 00:00:00 2001 From: Dustin Burson Date: Mon, 18 Nov 2019 06:57:50 -0800 Subject: [PATCH 3/6] Update Test Nuget --- .../Microsoft.Health.Common.UnitTests.csproj | 2 +- .../Microsoft.Health.Extensions.Fhir.R4.UnitTests.csproj | 2 +- .../Microsoft.Health.Extensions.Fhir.UnitTests.csproj | 2 +- .../Microsoft.Health.Fhir.Ingest.UnitTests.csproj | 2 +- .../Microsoft.Health.Fhir.R4.Ingest.UnitTests.csproj | 2 +- .../Microsoft.Health.Tests.Common.csproj | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/Microsoft.Health.Common.UnitTests/Microsoft.Health.Common.UnitTests.csproj b/test/Microsoft.Health.Common.UnitTests/Microsoft.Health.Common.UnitTests.csproj index 7c6e5b8f..83679f10 100644 --- a/test/Microsoft.Health.Common.UnitTests/Microsoft.Health.Common.UnitTests.csproj +++ b/test/Microsoft.Health.Common.UnitTests/Microsoft.Health.Common.UnitTests.csproj @@ -7,7 +7,7 @@ Microsoft.Health.Extensions.Processing - + diff --git a/test/Microsoft.Health.Extensions.Fhir.R4.UnitTests/Microsoft.Health.Extensions.Fhir.R4.UnitTests.csproj b/test/Microsoft.Health.Extensions.Fhir.R4.UnitTests/Microsoft.Health.Extensions.Fhir.R4.UnitTests.csproj index 7d7d1278..f2e0d19e 100644 --- a/test/Microsoft.Health.Extensions.Fhir.R4.UnitTests/Microsoft.Health.Extensions.Fhir.R4.UnitTests.csproj +++ b/test/Microsoft.Health.Extensions.Fhir.R4.UnitTests/Microsoft.Health.Extensions.Fhir.R4.UnitTests.csproj @@ -6,7 +6,7 @@ false - + diff --git a/test/Microsoft.Health.Extensions.Fhir.UnitTests/Microsoft.Health.Extensions.Fhir.UnitTests.csproj b/test/Microsoft.Health.Extensions.Fhir.UnitTests/Microsoft.Health.Extensions.Fhir.UnitTests.csproj index 7d7d1278..f2e0d19e 100644 --- a/test/Microsoft.Health.Extensions.Fhir.UnitTests/Microsoft.Health.Extensions.Fhir.UnitTests.csproj +++ b/test/Microsoft.Health.Extensions.Fhir.UnitTests/Microsoft.Health.Extensions.Fhir.UnitTests.csproj @@ -6,7 +6,7 @@ false - + diff --git a/test/Microsoft.Health.Fhir.Ingest.UnitTests/Microsoft.Health.Fhir.Ingest.UnitTests.csproj b/test/Microsoft.Health.Fhir.Ingest.UnitTests/Microsoft.Health.Fhir.Ingest.UnitTests.csproj index 38bbe6b6..6310471e 100644 --- a/test/Microsoft.Health.Fhir.Ingest.UnitTests/Microsoft.Health.Fhir.Ingest.UnitTests.csproj +++ b/test/Microsoft.Health.Fhir.Ingest.UnitTests/Microsoft.Health.Fhir.Ingest.UnitTests.csproj @@ -8,7 +8,7 @@ Off - + diff --git a/test/Microsoft.Health.Fhir.R4.Ingest.UnitTests/Microsoft.Health.Fhir.R4.Ingest.UnitTests.csproj b/test/Microsoft.Health.Fhir.R4.Ingest.UnitTests/Microsoft.Health.Fhir.R4.Ingest.UnitTests.csproj index 4f797409..4e88f0d1 100644 --- a/test/Microsoft.Health.Fhir.R4.Ingest.UnitTests/Microsoft.Health.Fhir.R4.Ingest.UnitTests.csproj +++ b/test/Microsoft.Health.Fhir.R4.Ingest.UnitTests/Microsoft.Health.Fhir.R4.Ingest.UnitTests.csproj @@ -8,7 +8,7 @@ Off - + diff --git a/test/Microsoft.Health.Tests.Common/Microsoft.Health.Tests.Common.csproj b/test/Microsoft.Health.Tests.Common/Microsoft.Health.Tests.Common.csproj index 2471864d..ed316571 100644 --- a/test/Microsoft.Health.Tests.Common/Microsoft.Health.Tests.Common.csproj +++ b/test/Microsoft.Health.Tests.Common/Microsoft.Health.Tests.Common.csproj @@ -7,7 +7,7 @@ Off - + From 662be2d9d56abb96dfa290688e5f1ec277aed044 Mon Sep 17 00:00:00 2001 From: Dustin Burson Date: Mon, 18 Nov 2019 07:13:21 -0800 Subject: [PATCH 4/6] Remove unused packages from Test projects --- .../Microsoft.Health.Common.UnitTests.csproj | 3 +-- .../Microsoft.Health.Fhir.Ingest.UnitTests.csproj | 1 - .../Microsoft.Health.Fhir.R4.Ingest.UnitTests.csproj | 1 - .../Microsoft.Health.Tests.Common.csproj | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/test/Microsoft.Health.Common.UnitTests/Microsoft.Health.Common.UnitTests.csproj b/test/Microsoft.Health.Common.UnitTests/Microsoft.Health.Common.UnitTests.csproj index 83679f10..14ede170 100644 --- a/test/Microsoft.Health.Common.UnitTests/Microsoft.Health.Common.UnitTests.csproj +++ b/test/Microsoft.Health.Common.UnitTests/Microsoft.Health.Common.UnitTests.csproj @@ -4,10 +4,9 @@ ..\..\CustomAnalysisRules.Test.ruleset true Off - Microsoft.Health.Extensions.Processing + Microsoft.Health.Common.UnitTests - diff --git a/test/Microsoft.Health.Fhir.Ingest.UnitTests/Microsoft.Health.Fhir.Ingest.UnitTests.csproj b/test/Microsoft.Health.Fhir.Ingest.UnitTests/Microsoft.Health.Fhir.Ingest.UnitTests.csproj index 6310471e..d6e6e276 100644 --- a/test/Microsoft.Health.Fhir.Ingest.UnitTests/Microsoft.Health.Fhir.Ingest.UnitTests.csproj +++ b/test/Microsoft.Health.Fhir.Ingest.UnitTests/Microsoft.Health.Fhir.Ingest.UnitTests.csproj @@ -8,7 +8,6 @@ Off - diff --git a/test/Microsoft.Health.Fhir.R4.Ingest.UnitTests/Microsoft.Health.Fhir.R4.Ingest.UnitTests.csproj b/test/Microsoft.Health.Fhir.R4.Ingest.UnitTests/Microsoft.Health.Fhir.R4.Ingest.UnitTests.csproj index 4e88f0d1..9b75b930 100644 --- a/test/Microsoft.Health.Fhir.R4.Ingest.UnitTests/Microsoft.Health.Fhir.R4.Ingest.UnitTests.csproj +++ b/test/Microsoft.Health.Fhir.R4.Ingest.UnitTests/Microsoft.Health.Fhir.R4.Ingest.UnitTests.csproj @@ -8,7 +8,6 @@ Off - diff --git a/test/Microsoft.Health.Tests.Common/Microsoft.Health.Tests.Common.csproj b/test/Microsoft.Health.Tests.Common/Microsoft.Health.Tests.Common.csproj index ed316571..f663a17b 100644 --- a/test/Microsoft.Health.Tests.Common/Microsoft.Health.Tests.Common.csproj +++ b/test/Microsoft.Health.Tests.Common/Microsoft.Health.Tests.Common.csproj @@ -7,7 +7,6 @@ Off - From e26f8ea656a4f6d2e59217f8493d5c8f6c2053dc Mon Sep 17 00:00:00 2001 From: Dustin Burson Date: Mon, 18 Nov 2019 07:26:46 -0800 Subject: [PATCH 5/6] Remove additional packages --- .../Microsoft.Health.Extensions.Fhir.R4.UnitTests.csproj | 1 - .../Microsoft.Health.Extensions.Fhir.UnitTests.csproj | 1 - 2 files changed, 2 deletions(-) diff --git a/test/Microsoft.Health.Extensions.Fhir.R4.UnitTests/Microsoft.Health.Extensions.Fhir.R4.UnitTests.csproj b/test/Microsoft.Health.Extensions.Fhir.R4.UnitTests/Microsoft.Health.Extensions.Fhir.R4.UnitTests.csproj index f2e0d19e..42f25429 100644 --- a/test/Microsoft.Health.Extensions.Fhir.R4.UnitTests/Microsoft.Health.Extensions.Fhir.R4.UnitTests.csproj +++ b/test/Microsoft.Health.Extensions.Fhir.R4.UnitTests/Microsoft.Health.Extensions.Fhir.R4.UnitTests.csproj @@ -6,7 +6,6 @@ false - diff --git a/test/Microsoft.Health.Extensions.Fhir.UnitTests/Microsoft.Health.Extensions.Fhir.UnitTests.csproj b/test/Microsoft.Health.Extensions.Fhir.UnitTests/Microsoft.Health.Extensions.Fhir.UnitTests.csproj index f2e0d19e..42f25429 100644 --- a/test/Microsoft.Health.Extensions.Fhir.UnitTests/Microsoft.Health.Extensions.Fhir.UnitTests.csproj +++ b/test/Microsoft.Health.Extensions.Fhir.UnitTests/Microsoft.Health.Extensions.Fhir.UnitTests.csproj @@ -6,7 +6,6 @@ false - From b5bac9ad95f328af3e8186efab7af2fee0fd2bbe Mon Sep 17 00:00:00 2001 From: Dustin Burson Date: Mon, 18 Nov 2019 07:32:03 -0800 Subject: [PATCH 6/6] Re-add .NET.Test.Sdk --- .../Microsoft.Health.Common.UnitTests.csproj | 1 + .../Microsoft.Health.Extensions.Fhir.R4.UnitTests.csproj | 1 + .../Microsoft.Health.Extensions.Fhir.UnitTests.csproj | 1 + .../Microsoft.Health.Fhir.Ingest.UnitTests.csproj | 1 + .../Microsoft.Health.Fhir.R4.Ingest.UnitTests.csproj | 1 + .../Microsoft.Health.Tests.Common.csproj | 1 + 6 files changed, 6 insertions(+) diff --git a/test/Microsoft.Health.Common.UnitTests/Microsoft.Health.Common.UnitTests.csproj b/test/Microsoft.Health.Common.UnitTests/Microsoft.Health.Common.UnitTests.csproj index 14ede170..35928bb8 100644 --- a/test/Microsoft.Health.Common.UnitTests/Microsoft.Health.Common.UnitTests.csproj +++ b/test/Microsoft.Health.Common.UnitTests/Microsoft.Health.Common.UnitTests.csproj @@ -7,6 +7,7 @@ Microsoft.Health.Common.UnitTests + diff --git a/test/Microsoft.Health.Extensions.Fhir.R4.UnitTests/Microsoft.Health.Extensions.Fhir.R4.UnitTests.csproj b/test/Microsoft.Health.Extensions.Fhir.R4.UnitTests/Microsoft.Health.Extensions.Fhir.R4.UnitTests.csproj index 42f25429..f2e0d19e 100644 --- a/test/Microsoft.Health.Extensions.Fhir.R4.UnitTests/Microsoft.Health.Extensions.Fhir.R4.UnitTests.csproj +++ b/test/Microsoft.Health.Extensions.Fhir.R4.UnitTests/Microsoft.Health.Extensions.Fhir.R4.UnitTests.csproj @@ -6,6 +6,7 @@ false + diff --git a/test/Microsoft.Health.Extensions.Fhir.UnitTests/Microsoft.Health.Extensions.Fhir.UnitTests.csproj b/test/Microsoft.Health.Extensions.Fhir.UnitTests/Microsoft.Health.Extensions.Fhir.UnitTests.csproj index 42f25429..f2e0d19e 100644 --- a/test/Microsoft.Health.Extensions.Fhir.UnitTests/Microsoft.Health.Extensions.Fhir.UnitTests.csproj +++ b/test/Microsoft.Health.Extensions.Fhir.UnitTests/Microsoft.Health.Extensions.Fhir.UnitTests.csproj @@ -6,6 +6,7 @@ false + diff --git a/test/Microsoft.Health.Fhir.Ingest.UnitTests/Microsoft.Health.Fhir.Ingest.UnitTests.csproj b/test/Microsoft.Health.Fhir.Ingest.UnitTests/Microsoft.Health.Fhir.Ingest.UnitTests.csproj index d6e6e276..6310471e 100644 --- a/test/Microsoft.Health.Fhir.Ingest.UnitTests/Microsoft.Health.Fhir.Ingest.UnitTests.csproj +++ b/test/Microsoft.Health.Fhir.Ingest.UnitTests/Microsoft.Health.Fhir.Ingest.UnitTests.csproj @@ -8,6 +8,7 @@ Off + diff --git a/test/Microsoft.Health.Fhir.R4.Ingest.UnitTests/Microsoft.Health.Fhir.R4.Ingest.UnitTests.csproj b/test/Microsoft.Health.Fhir.R4.Ingest.UnitTests/Microsoft.Health.Fhir.R4.Ingest.UnitTests.csproj index 9b75b930..4e88f0d1 100644 --- a/test/Microsoft.Health.Fhir.R4.Ingest.UnitTests/Microsoft.Health.Fhir.R4.Ingest.UnitTests.csproj +++ b/test/Microsoft.Health.Fhir.R4.Ingest.UnitTests/Microsoft.Health.Fhir.R4.Ingest.UnitTests.csproj @@ -8,6 +8,7 @@ Off + diff --git a/test/Microsoft.Health.Tests.Common/Microsoft.Health.Tests.Common.csproj b/test/Microsoft.Health.Tests.Common/Microsoft.Health.Tests.Common.csproj index f663a17b..ed316571 100644 --- a/test/Microsoft.Health.Tests.Common/Microsoft.Health.Tests.Common.csproj +++ b/test/Microsoft.Health.Tests.Common/Microsoft.Health.Tests.Common.csproj @@ -7,6 +7,7 @@ Off +