diff --git a/build/build.yml b/build/build.yml index 1124c136..928652d8 100644 --- a/build/build.yml +++ b/build/build.yml @@ -4,7 +4,9 @@ parameters: steps: - task: UseDotNet@2 - displayName: 'Use .NET Core sdk' + displayName: 'Use .NET Core sdk 6.0.x' + inputs: + version: 6.0.x - script: dotnet build --configuration $(buildConfiguration) --version-suffix $(build.buildNumber) /warnaserror displayName: 'dotnet build $(buildConfiguration)' diff --git a/deploy/templates/consumption-azuredeploy.json b/deploy/templates/consumption-azuredeploy.json index 0feb68e3..29914c81 100644 --- a/deploy/templates/consumption-azuredeploy.json +++ b/deploy/templates/consumption-azuredeploy.json @@ -570,7 +570,7 @@ "properties": { "InputEventHub": "[concat('Endpoint=sb://', variables('app_service_name'), '.servicebus.windows.net/;Authentication=ManagedIdentity;EntityPath=devicedata')]", "OutputEventHub": "[concat('Endpoint=sb://', variables('app_service_name'), '.servicebus.windows.net/;Authentication=ManagedIdentity;EntityPath=normalizeddata')]", - "FUNCTIONS_EXTENSION_VERSION": "~3", + "FUNCTIONS_EXTENSION_VERSION": "~4", "FUNCTIONS_EXTENSION_RUNTIME": "dotnet", "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, ')')]", diff --git a/deploy/templates/default-managed-identity-azuredeploy.json b/deploy/templates/default-managed-identity-azuredeploy.json index 7914d1d9..7e8621a2 100644 --- a/deploy/templates/default-managed-identity-azuredeploy.json +++ b/deploy/templates/default-managed-identity-azuredeploy.json @@ -567,7 +567,7 @@ "properties": { "InputEventHub": "[concat('Endpoint=sb://', variables('eventhub_hostname'), '/;Authentication=ManagedIdentity;EntityPath=', variables('devicedata_name'))]", "OutputEventHub": "[concat('Endpoint=sb://', variables('eventhub_hostname'), '/;Authentication=ManagedIdentity;EntityPath=', variables('normalizeddata_name'))]", - "FUNCTIONS_EXTENSION_VERSION": "~3", + "FUNCTIONS_EXTENSION_VERSION": "~4", "FUNCTIONS_EXTENSION_RUNTIME": "dotnet", "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, ')')]", diff --git a/deploy/templates/premium-azuredeploy.json b/deploy/templates/premium-azuredeploy.json index bb7bf9c5..ba6a67b1 100644 --- a/deploy/templates/premium-azuredeploy.json +++ b/deploy/templates/premium-azuredeploy.json @@ -570,7 +570,7 @@ "properties": { "InputEventHub": "[concat('Endpoint=sb://', variables('app_service_name'), '.servicebus.windows.net/;Authentication=ManagedIdentity;EntityPath=devicedata')]", "OutputEventHub": "[concat('Endpoint=sb://', variables('app_service_name'), '.servicebus.windows.net/;Authentication=ManagedIdentity;EntityPath=normalizeddata')]", - "FUNCTIONS_EXTENSION_VERSION": "~3", + "FUNCTIONS_EXTENSION_VERSION": "~4", "FUNCTIONS_EXTENSION_RUNTIME": "dotnet", "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, ')')]", diff --git a/src/console/Microsoft.Health.Fhir.Ingest.Console.csproj b/src/console/Microsoft.Health.Fhir.Ingest.Console.csproj index fd4fd24f..07d3917a 100644 --- a/src/console/Microsoft.Health.Fhir.Ingest.Console.csproj +++ b/src/console/Microsoft.Health.Fhir.Ingest.Console.csproj @@ -1,36 +1,32 @@  + + Exe + net6.0 + + + true + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - Exe - netcoreapp3.1 - + + + + + + + - - true - + + + Always + Never + + - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - - - Always - Never - - - diff --git a/src/console/appsettings.json b/src/console/appsettings.json index c691ac63..f3c3605b 100644 --- a/src/console/appsettings.json +++ b/src/console/appsettings.json @@ -9,7 +9,7 @@ "TemplateStorage:AuthenticationType": "ManagedIdentity", "TemplateStorage:BlobStorageContainerUri": "", "Console:ApplicationType": "", - "FhirClient:UseManagedIdentity": 1, + "FhirClient:UseManagedIdentity": true, "FhirService:Url": "", "InputEventHub:AuthenticationType": "ManagedIdentity", "InputEventHub:EventHubNamespaceFQDN": "", 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 37eaee41..fe1096fa 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,7 +1,7 @@  - netcoreapp3.1 - v3 + net6.0 + v4 ..\..\..\CustomAnalysisRules.ruleset true Microsoft.Health.Fhir.Ingest.Host @@ -30,11 +30,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all diff --git a/src/lib/Microsoft.Health.Common/Microsoft.Health.Common.csproj b/src/lib/Microsoft.Health.Common/Microsoft.Health.Common.csproj index 965f5352..0392ce2b 100644 --- a/src/lib/Microsoft.Health.Common/Microsoft.Health.Common.csproj +++ b/src/lib/Microsoft.Health.Common/Microsoft.Health.Common.csproj @@ -19,7 +19,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/lib/Microsoft.Health.Events/Microsoft.Health.Events.csproj b/src/lib/Microsoft.Health.Events/Microsoft.Health.Events.csproj index c3b86226..9cb8d6f8 100644 --- a/src/lib/Microsoft.Health.Events/Microsoft.Health.Events.csproj +++ b/src/lib/Microsoft.Health.Events/Microsoft.Health.Events.csproj @@ -1,6 +1,6 @@  - netcoreapp3.1 + net6.0 ..\..\..\CustomAnalysisRules.ruleset true 7.3 @@ -25,7 +25,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/lib/Microsoft.Health.Expressions/Microsoft.Health.Expressions.csproj b/src/lib/Microsoft.Health.Expressions/Microsoft.Health.Expressions.csproj index 458c6bca..ccab3bfe 100644 --- a/src/lib/Microsoft.Health.Expressions/Microsoft.Health.Expressions.csproj +++ b/src/lib/Microsoft.Health.Expressions/Microsoft.Health.Expressions.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 ..\..\..\CustomAnalysisRules.ruleset @@ -15,7 +15,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive 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 cdbed9a4..0b0a51dd 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.1 + net6.0 ..\..\..\CustomAnalysisRules.ruleset true 7.3 @@ -20,7 +20,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive 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 dd4e0ee9..b490fa34 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.1 + net6.0 ..\..\..\CustomAnalysisRules.ruleset true 7.3 @@ -17,7 +17,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive 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 e1213c49..ae145393 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.1 + net6.0 ..\..\..\CustomAnalysisRules.ruleset true 7.3 @@ -18,7 +18,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/lib/Microsoft.Health.Fhir.Ingest.Schema/Microsoft.Health.Fhir.Ingest.Schema.csproj b/src/lib/Microsoft.Health.Fhir.Ingest.Schema/Microsoft.Health.Fhir.Ingest.Schema.csproj index 0ea5f2b4..86f7cc4c 100644 --- a/src/lib/Microsoft.Health.Fhir.Ingest.Schema/Microsoft.Health.Fhir.Ingest.Schema.csproj +++ b/src/lib/Microsoft.Health.Fhir.Ingest.Schema/Microsoft.Health.Fhir.Ingest.Schema.csproj @@ -17,7 +17,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/lib/Microsoft.Health.Fhir.Ingest.Template/Microsoft.Health.Fhir.Ingest.Template.csproj b/src/lib/Microsoft.Health.Fhir.Ingest.Template/Microsoft.Health.Fhir.Ingest.Template.csproj index 907099f2..be89b42a 100644 --- a/src/lib/Microsoft.Health.Fhir.Ingest.Template/Microsoft.Health.Fhir.Ingest.Template.csproj +++ b/src/lib/Microsoft.Health.Fhir.Ingest.Template/Microsoft.Health.Fhir.Ingest.Template.csproj @@ -19,7 +19,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/lib/Microsoft.Health.Fhir.Ingest.Validation/Microsoft.Health.Fhir.Ingest.Validation.csproj b/src/lib/Microsoft.Health.Fhir.Ingest.Validation/Microsoft.Health.Fhir.Ingest.Validation.csproj index b41f05a7..37815313 100644 --- a/src/lib/Microsoft.Health.Fhir.Ingest.Validation/Microsoft.Health.Fhir.Ingest.Validation.csproj +++ b/src/lib/Microsoft.Health.Fhir.Ingest.Validation/Microsoft.Health.Fhir.Ingest.Validation.csproj @@ -1,6 +1,6 @@ - netcoreapp3.1 + net6.0 ..\..\..\CustomAnalysisRules.ruleset true Microsoft.Health.Fhir.Ingest.Validation @@ -21,7 +21,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive 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 c8606844..6a1b4699 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.1 + net6.0 ..\..\..\CustomAnalysisRules.ruleset true Microsoft.Health.Fhir.Ingest @@ -27,7 +27,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive 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 58645ddb..82dfbf08 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.1 + net6.0 ..\..\..\CustomAnalysisRules.ruleset true Microsoft.Health.Fhir.Ingest.R4 @@ -29,7 +29,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/lib/Microsoft.Health.Logger/Microsoft.Health.Logging.csproj b/src/lib/Microsoft.Health.Logger/Microsoft.Health.Logging.csproj index c5550062..b3361945 100644 --- a/src/lib/Microsoft.Health.Logger/Microsoft.Health.Logging.csproj +++ b/src/lib/Microsoft.Health.Logger/Microsoft.Health.Logging.csproj @@ -11,7 +11,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive 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 60e0436e..5650e8e5 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.1 + net6.0 ..\..\CustomAnalysisRules.Test.ruleset true Off @@ -12,7 +12,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Microsoft.Health.Events.UnitTest/Microsoft.Health.Events.UnitTest.csproj b/test/Microsoft.Health.Events.UnitTest/Microsoft.Health.Events.UnitTest.csproj index 1d12f810..3140dc21 100644 --- a/test/Microsoft.Health.Events.UnitTest/Microsoft.Health.Events.UnitTest.csproj +++ b/test/Microsoft.Health.Events.UnitTest/Microsoft.Health.Events.UnitTest.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net6.0 false diff --git a/test/Microsoft.Health.Expressions.UnitTests/Microsoft.Health.Expressions.UnitTests.csproj b/test/Microsoft.Health.Expressions.UnitTests/Microsoft.Health.Expressions.UnitTests.csproj index aaa45146..81c687fd 100644 --- a/test/Microsoft.Health.Expressions.UnitTests/Microsoft.Health.Expressions.UnitTests.csproj +++ b/test/Microsoft.Health.Expressions.UnitTests/Microsoft.Health.Expressions.UnitTests.csproj @@ -1,6 +1,6 @@ - netcoreapp3.1 + net6.0 ..\..\CustomAnalysisRules.Test.ruleset Off Microsoft.Health.Expressions.UnitTests @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive 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 b8118dea..44591b7d 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.1 + net6.0 ..\..\CustomAnalysisRules.Test.ruleset true false @@ -11,7 +11,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive 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 c8d0bc13..36b4420e 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.1 + net6.0 ..\..\CustomAnalysisRules.Test.ruleset true false @@ -11,7 +11,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Microsoft.Health.Fhir.Ingest.Template.UnitTests/Microsoft.Health.Fhir.Ingest.Template.UnitTests.csproj b/test/Microsoft.Health.Fhir.Ingest.Template.UnitTests/Microsoft.Health.Fhir.Ingest.Template.UnitTests.csproj index 30870c54..0db9a9f8 100644 --- a/test/Microsoft.Health.Fhir.Ingest.Template.UnitTests/Microsoft.Health.Fhir.Ingest.Template.UnitTests.csproj +++ b/test/Microsoft.Health.Fhir.Ingest.Template.UnitTests/Microsoft.Health.Fhir.Ingest.Template.UnitTests.csproj @@ -1,6 +1,6 @@  - netcoreapp3.1 + net6.0 ..\..\CustomAnalysisRules.Test.ruleset true Off @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive 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 7757a436..4b11a28f 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.1 + net6.0 ..\..\CustomAnalysisRules.Test.ruleset false Microsoft.Health.Fhir.Ingest @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Microsoft.Health.Fhir.Ingest.Validation.UnitTests/Microsoft.Health.Fhir.Ingest.Validation.UnitTests.csproj b/test/Microsoft.Health.Fhir.Ingest.Validation.UnitTests/Microsoft.Health.Fhir.Ingest.Validation.UnitTests.csproj index 06493275..50824384 100644 --- a/test/Microsoft.Health.Fhir.Ingest.Validation.UnitTests/Microsoft.Health.Fhir.Ingest.Validation.UnitTests.csproj +++ b/test/Microsoft.Health.Fhir.Ingest.Validation.UnitTests/Microsoft.Health.Fhir.Ingest.Validation.UnitTests.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net6.0 ..\..\CustomAnalysisRules.Test.ruleset true Off @@ -15,7 +15,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -27,7 +27,6 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - all runtime; build; native; contentfiles; analyzers; buildtransitive 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 51903478..275373d8 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.1 + net6.0 ..\..\CustomAnalysisRules.Test.ruleset false Microsoft.Health.Fhir.Ingest @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Microsoft.Health.Tests.Common.R4/Microsoft.Health.Tests.Common.R4.csproj b/test/Microsoft.Health.Tests.Common.R4/Microsoft.Health.Tests.Common.R4.csproj index c346779a..12d74997 100644 --- a/test/Microsoft.Health.Tests.Common.R4/Microsoft.Health.Tests.Common.R4.csproj +++ b/test/Microsoft.Health.Tests.Common.R4/Microsoft.Health.Tests.Common.R4.csproj @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive 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 33f30340..f812f4a7 100644 --- a/test/Microsoft.Health.Tests.Common/Microsoft.Health.Tests.Common.csproj +++ b/test/Microsoft.Health.Tests.Common/Microsoft.Health.Tests.Common.csproj @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive