diff --git a/iothub/device/src/Microsoft.Azure.Devices.Client.csproj b/iothub/device/src/Microsoft.Azure.Devices.Client.csproj index 1798469fc3..46be631def 100644 --- a/iothub/device/src/Microsoft.Azure.Devices.Client.csproj +++ b/iothub/device/src/Microsoft.Azure.Devices.Client.csproj @@ -33,7 +33,7 @@ - 1.43.0-edgeLts + 1.43.2-edgeLts Microsoft Azure IoT Device Client SDK True True diff --git a/iothub/device/src/Transport/Mqtt/MqttTransportHandler.cs b/iothub/device/src/Transport/Mqtt/MqttTransportHandler.cs index bea2b43233..90242d14aa 100644 --- a/iothub/device/src/Transport/Mqtt/MqttTransportHandler.cs +++ b/iothub/device/src/Transport/Mqtt/MqttTransportHandler.cs @@ -1504,6 +1504,8 @@ private async Task HandleIncomingEventMessageAsync(MqttApplicationMessageReceive // We try to get the endpoint from the topic, if the topic is in the above format. string[] tokens = receivedEventArgs.ApplicationMessage.Topic.Split('/'); + PopulateMessagePropertiesFromMqttMessage(iotHubMessage, receivedEventArgs.ApplicationMessage); + // if there is an input name in the topic string, set the system property accordingly if (tokens.Length >= 6) { diff --git a/vsts/horton-e2e.yaml b/vsts/horton-e2e.yaml index 2833102b48..175ca7788f 100644 --- a/vsts/horton-e2e.yaml +++ b/vsts/horton-e2e.yaml @@ -1,6 +1,6 @@ variables: Horton.FrameworkRoot: $(Agent.BuildDirectory)/e2e-fx - Horton.FrameworkRef: master + Horton.FrameworkRef: timtay/temp # This is deliberately not targeting main because the main branch builds for an older version of .NET than this branch of the azure-iot-sdk-csharp repo targets Horton.Language: csharp Horton.Repo: $(Build.Repository.Uri) Horton.Commit: $(Build.SourceBranch) @@ -12,7 +12,31 @@ resources: type: github name: Azure/iot-sdks-e2e-fx ref: refs/heads/master - endpoint: 'GitHub OAuth - az-iot-builder-01' + endpoint: 'azure-iot-sdk-python-github' -jobs: -- template: vsts/templates/jobs-gate-csharp.yaml@e2e_fx +stages: +- stage: setup + jobs: + - job: create_azure_resources + pool: + vmImage: 'windows-latest' + steps: + - template: vsts/templates/steps-create-azure-resources.yaml@e2e_fx + +- stage: build_and_test + dependsOn: setup + jobs: + - template: vsts/templates/jobs-gate-csharp.yaml@e2e_fx + +- stage: cleanup + dependsOn: + - setup + - build_and_test + condition: always() + jobs: + - job: destroy_azure_resource_group + condition: always() + pool: + vmImage: 'ubuntu-24.04' + steps: + - template: vsts/templates/steps-destroy-azure-resources.yaml@e2e_fx \ No newline at end of file