Merge commit 'f48217a728a3fe7189146c103129f167dae563a0' into HEAD

Azure · Jun 5, 2017 · a2a5a87 · a2a5a87
2 parents 52958b5 + f48217a
commit a2a5a87
Show file tree

Hide file tree

Showing 38 changed files with 156 additions and 156 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 2.8.11)
 project(azure_iot_sdks)
 
-set(IOT_SDK_VERSION 1.1.15)
+set(IOT_SDK_VERSION 1.1.16)
 
 if(POLICY CMP0042)
     cmake_policy(SET CMP0042 NEW)

diff --git a/build_all/docs/Doxyfile b/build_all/docs/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = "Microsoft Azure IoT Device SDK for C"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.1.15
+PROJECT_NUMBER         = 1.1.16
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/build_all/packaging/linux/debian/changelog-trusty b/build_all/packaging/linux/debian/changelog-trusty
@@ -1,4 +1,4 @@
-azure-iot-sdk-c (0.1.0-23trusty) trusty; urgency=low
+azure-iot-sdk-c (0.1.0-24trusty) trusty; urgency=low
 
   * See https://github.com/Azure/azure-iot-sdk-c/releases for details of the release
 

diff --git a/build_all/packaging/linux/debian/changelog-vivid b/build_all/packaging/linux/debian/changelog-vivid
@@ -1,4 +1,4 @@
-azure-iot-sdk-c (0.1.0-44vivid) vivid; urgency=low
+azure-iot-sdk-c (0.1.0-45vivid) vivid; urgency=low
 
   * See https://github.com/Azure/azure-iot-sdk-c/releases for details of the release
 

diff --git a/build_all/packaging/linux/debian/changelog-xenial b/build_all/packaging/linux/debian/changelog-xenial
@@ -1,4 +1,4 @@
-azure-iot-sdk-c (0.1.0.0-19xenial) xenial; urgency=low
+azure-iot-sdk-c (0.1.0.0-20xenial) xenial; urgency=low
 
   * See https://github.com/Azure/azure-iot-sdk-c/releases for details of the release
 

diff --git a/build_all/packaging/windows/Microsoft.Azure.IoTHub.AmqpTransport.nuspec b/build_all/packaging/windows/Microsoft.Azure.IoTHub.AmqpTransport.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
     <metadata>
         <id>Microsoft.Azure.IoTHub.AmqpTransport</id>
-        <version>1.1.16</version>
+        <version>1.1.17</version>
         <title>Microsoft Azure IoTHub AMQP transport</title>
         <authors>Microsoft</authors>
         <licenseUrl>https://github.com/Azure/azure-iot-sdk-c/blob/master/LICENSE</licenseUrl>
@@ -16,9 +16,9 @@
         <copyright>© Microsoft Corporation. All rights reserved.</copyright>
         <tags>AMQP Microsoft Azure IoT Native x86 x64 arm native package</tags>
         <dependencies>
-            <dependency id="Microsoft.Azure.Uamqp" version="1.0.35"/>
-            <dependency id="Microsoft.Azure.IoTHub.IoTHubClient" version="1.1.16"/>
-            <dependency id="Microsoft.Azure.C.SharedUtility" version="1.0.35"/>
+            <dependency id="Microsoft.Azure.Uamqp" version="1.0.36"/>
+            <dependency id="Microsoft.Azure.IoTHub.IoTHubClient" version="1.1.17"/>
+            <dependency id="Microsoft.Azure.C.SharedUtility" version="1.0.36"/>
         </dependencies>
     </metadata>
     <files>
@@ -51,4 +51,4 @@
         <file src="Microsoft.Azure.IoTHub.AmqpTransport.targets" target="build\native"/>
         <file src="..\..\..\iothub_client\inc\iothubtransportamqp.h" target="build\native\include"/>
     </files>
-</package>
+</package>
diff --git a/build_all/packaging/windows/Microsoft.Azure.IoTHub.HttpTransport.nuspec b/build_all/packaging/windows/Microsoft.Azure.IoTHub.HttpTransport.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
     <metadata>
         <id>Microsoft.Azure.IoTHub.HttpTransport</id>
-        <version>1.1.16</version>
+        <version>1.1.17</version>
         <title>Microsoft Azure IoTHub HTTP transport</title>
         <authors>Microsoft</authors>
         <licenseUrl>https://github.com/Azure/azure-iot-sdk-c/blob/master/LICENSE</licenseUrl>
@@ -16,8 +16,8 @@
         <copyright>© Microsoft Corporation. All rights reserved.</copyright>
         <tags>HTTP Microsoft Azure IoT Native x86 x64 arm native package</tags>
         <dependencies>
-            <dependency id="Microsoft.Azure.IoTHub.IoTHubClient" version="1.1.16"/>
-            <dependency id="Microsoft.Azure.C.SharedUtility" version="1.0.35"/>
+            <dependency id="Microsoft.Azure.IoTHub.IoTHubClient" version="1.1.17"/>
+            <dependency id="Microsoft.Azure.C.SharedUtility" version="1.0.36"/>
         </dependencies>
     </metadata>
     <files>

diff --git a/build_all/packaging/windows/Microsoft.Azure.IoTHub.IoTHubClient.nuspec b/build_all/packaging/windows/Microsoft.Azure.IoTHub.IoTHubClient.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
     <metadata>
         <id>Microsoft.Azure.IoTHub.IoTHubClient</id>
-        <version>1.1.16</version>
+        <version>1.1.17</version>
         <title>Microsoft Azure IoTHub IoTHubClient</title>
         <authors>Microsoft</authors>
         <licenseUrl>https://github.com/Azure/azure-iot-sdk-c/blob/master/LICENSE</licenseUrl>
@@ -16,7 +16,7 @@
         <copyright>© Microsoft Corporation. All rights reserved.</copyright>
         <tags>Microsoft Azure IoT Native x86 x64 arm native package IoTHubClient</tags>
         <dependencies>
-            <dependency id="Microsoft.Azure.C.SharedUtility" version="1.0.35"/>
+            <dependency id="Microsoft.Azure.C.SharedUtility" version="1.0.36"/>
         </dependencies>
     </metadata>
     <files>

diff --git a/build_all/packaging/windows/Microsoft.Azure.IoTHub.MqttTransport.nuspec b/build_all/packaging/windows/Microsoft.Azure.IoTHub.MqttTransport.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
     <metadata>
         <id>Microsoft.Azure.IoTHub.MqttTransport</id>
-        <version>1.1.16</version>
+        <version>1.1.17</version>
         <title>Microsoft Azure IoTHub MQTT transport</title>
         <authors>Microsoft</authors>
         <licenseUrl>https://github.com/Azure/azure-iot-sdk-c/blob/master/LICENSE</licenseUrl>
@@ -16,9 +16,9 @@
         <copyright>© Microsoft Corporation. All rights reserved.</copyright>
         <tags>MQTT Microsoft Azure IoT Native x86 x64 arm native package</tags>
         <dependencies>
-            <dependency id="Microsoft.Azure.IoTHub.IoTHubClient" version="1.1.16"/>
-            <dependency id="Microsoft.Azure.C.SharedUtility" version="1.0.35"/>
-            <dependency id="Microsoft.Azure.umqtt" version="1.0.35"/>
+            <dependency id="Microsoft.Azure.IoTHub.IoTHubClient" version="1.1.17"/>
+            <dependency id="Microsoft.Azure.C.SharedUtility" version="1.0.36"/>
+            <dependency id="Microsoft.Azure.umqtt" version="1.0.36"/>
         </dependencies>
     </metadata>
     <files>

diff --git a/build_all/packaging/windows/Microsoft.Azure.IoTHub.Serializer.nuspec b/build_all/packaging/windows/Microsoft.Azure.IoTHub.Serializer.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
     <metadata>
         <id>Microsoft.Azure.IoTHub.Serializer</id>
-        <version>1.1.16</version>
+        <version>1.1.17</version>
         <title>Microsoft Azure IoTHub Serializer</title>
         <authors>Microsoft</authors>
         <licenseUrl>https://github.com/Azure/azure-iot-sdk-c/blob/master/LICENSE</licenseUrl>
@@ -16,7 +16,7 @@
         <copyright>© Microsoft Corporation. All rights reserved.</copyright>
         <tags>Microsoft Azure IoT Native x86 x64 arm native package</tags>
         <dependencies>
-            <dependency id="Microsoft.Azure.C.SharedUtility" version="1.0.35"/>
+            <dependency id="Microsoft.Azure.C.SharedUtility" version="1.0.36"/>
         </dependencies>
     </metadata>
     <files>

diff --git a/c-utility b/c-utility
diff --git a/iothub_client/inc/iothub_client_version.h b/iothub_client/inc/iothub_client_version.h
@@ -8,7 +8,7 @@
 #ifndef IOTHUB_CLIENT_VERSION_H
 #define IOTHUB_CLIENT_VERSION_H
 
-#define IOTHUB_SDK_VERSION "1.1.15"
+#define IOTHUB_SDK_VERSION "1.1.16"
 
 #include "azure_c_shared_utility/umock_c_prod.h"
 

diff --git a/iothub_client/samples/iothub_client_sample_amqp/windows/iothub_client_sample_amqp.vcxproj b/iothub_client/samples/iothub_client_sample_amqp/windows/iothub_client_sample_amqp.vcxproj
@@ -161,18 +161,18 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="packages\Microsoft.Azure.C.SharedUtility.1.0.35\build\native\Microsoft.Azure.C.SharedUtility.targets" Condition="Exists('packages\Microsoft.Azure.C.SharedUtility.1.0.35\build\native\Microsoft.Azure.C.SharedUtility.targets')" />
-    <Import Project="packages\Microsoft.Azure.IoTHub.IoTHubClient.1.1.16\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets" Condition="Exists('packages\Microsoft.Azure.IoTHub.IoTHubClient.1.1.16\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets')" />
-    <Import Project="packages\Microsoft.Azure.uamqp.1.0.35\build\native\Microsoft.Azure.uamqp.targets" Condition="Exists('packages\Microsoft.Azure.uamqp.1.0.35\build\native\Microsoft.Azure.uamqp.targets')" />
-    <Import Project="packages\Microsoft.Azure.IoTHub.AmqpTransport.1.1.16\build\native\Microsoft.Azure.IoTHub.AmqpTransport.targets" Condition="Exists('packages\Microsoft.Azure.IoTHub.AmqpTransport.1.1.16\build\native\Microsoft.Azure.IoTHub.AmqpTransport.targets')" />
+    <Import Project="packages\Microsoft.Azure.C.SharedUtility.1.0.36\build\native\Microsoft.Azure.C.SharedUtility.targets" Condition="Exists('packages\Microsoft.Azure.C.SharedUtility.1.0.36\build\native\Microsoft.Azure.C.SharedUtility.targets')" />
+    <Import Project="packages\Microsoft.Azure.IoTHub.IoTHubClient.1.1.17\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets" Condition="Exists('packages\Microsoft.Azure.IoTHub.IoTHubClient.1.1.17\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets')" />
+    <Import Project="packages\Microsoft.Azure.uamqp.1.0.36\build\native\Microsoft.Azure.uamqp.targets" Condition="Exists('packages\Microsoft.Azure.uamqp.1.0.36\build\native\Microsoft.Azure.uamqp.targets')" />
+    <Import Project="packages\Microsoft.Azure.IoTHub.AmqpTransport.1.1.17\build\native\Microsoft.Azure.IoTHub.AmqpTransport.targets" Condition="Exists('packages\Microsoft.Azure.IoTHub.AmqpTransport.1.1.17\build\native\Microsoft.Azure.IoTHub.AmqpTransport.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('packages\Microsoft.Azure.C.SharedUtility.1.0.35\build\native\Microsoft.Azure.C.SharedUtility.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Azure.C.SharedUtility.1.0.35\build\native\Microsoft.Azure.C.SharedUtility.targets'))" />
-    <Error Condition="!Exists('packages\Microsoft.Azure.IoTHub.IoTHubClient.1.1.16\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Azure.IoTHub.IoTHubClient.1.1.16\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets'))" />
-    <Error Condition="!Exists('packages\Microsoft.Azure.uamqp.1.0.35\build\native\Microsoft.Azure.uamqp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Azure.uamqp.1.0.35\build\native\Microsoft.Azure.uamqp.targets'))" />
-    <Error Condition="!Exists('packages\Microsoft.Azure.IoTHub.AmqpTransport.1.1.16\build\native\Microsoft.Azure.IoTHub.AmqpTransport.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Azure.IoTHub.AmqpTransport.1.1.16\build\native\Microsoft.Azure.IoTHub.AmqpTransport.targets'))" />
+    <Error Condition="!Exists('packages\Microsoft.Azure.C.SharedUtility.1.0.36\build\native\Microsoft.Azure.C.SharedUtility.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Azure.C.SharedUtility.1.0.36\build\native\Microsoft.Azure.C.SharedUtility.targets'))" />
+    <Error Condition="!Exists('packages\Microsoft.Azure.IoTHub.IoTHubClient.1.1.17\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Azure.IoTHub.IoTHubClient.1.1.17\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets'))" />
+    <Error Condition="!Exists('packages\Microsoft.Azure.uamqp.1.0.36\build\native\Microsoft.Azure.uamqp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Azure.uamqp.1.0.36\build\native\Microsoft.Azure.uamqp.targets'))" />
+    <Error Condition="!Exists('packages\Microsoft.Azure.IoTHub.AmqpTransport.1.1.17\build\native\Microsoft.Azure.IoTHub.AmqpTransport.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Azure.IoTHub.AmqpTransport.1.1.17\build\native\Microsoft.Azure.IoTHub.AmqpTransport.targets'))" />
   </Target>
 </Project>
diff --git a/iothub_client/samples/iothub_client_sample_amqp/windows/packages.config b/iothub_client/samples/iothub_client_sample_amqp/windows/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><packages>
-  <package id="Microsoft.Azure.C.SharedUtility" version="1.0.35" targetFramework="native"/>
-  <package id="Microsoft.Azure.IoTHub.AmqpTransport" version="1.1.16" targetFramework="native"/>
-  <package id="Microsoft.Azure.IoTHub.IoTHubClient" version="1.1.16" targetFramework="native"/>
-  <package id="Microsoft.Azure.uamqp" version="1.0.35" targetFramework="native"/>
+  <package id="Microsoft.Azure.C.SharedUtility" version="1.0.36" targetFramework="native"/>
+  <package id="Microsoft.Azure.IoTHub.AmqpTransport" version="1.1.17" targetFramework="native"/>
+  <package id="Microsoft.Azure.IoTHub.IoTHubClient" version="1.1.17" targetFramework="native"/>
+  <package id="Microsoft.Azure.uamqp" version="1.0.36" targetFramework="native"/>
 </packages>
diff --git a/iothub_client/samples/iothub_client_sample_http/windows/iothub_client_sample_http.vcxproj b/iothub_client/samples/iothub_client_sample_http/windows/iothub_client_sample_http.vcxproj
@@ -158,16 +158,16 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="packages\Microsoft.Azure.C.SharedUtility.1.0.35\build\native\Microsoft.Azure.C.SharedUtility.targets" Condition="Exists('packages\Microsoft.Azure.C.SharedUtility.1.0.35\build\native\Microsoft.Azure.C.SharedUtility.targets')" />
-    <Import Project="packages\Microsoft.Azure.IoTHub.IoTHubClient.1.1.16\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets" Condition="Exists('packages\Microsoft.Azure.IoTHub.IoTHubClient.1.1.16\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets')" />
-    <Import Project="packages\Microsoft.Azure.IoTHub.HttpTransport.1.1.16\build\native\Microsoft.Azure.IoTHub.HttpTransport.targets" Condition="Exists('packages\Microsoft.Azure.IoTHub.HttpTransport.1.1.16\build\native\Microsoft.Azure.IoTHub.HttpTransport.targets')" />
+    <Import Project="packages\Microsoft.Azure.C.SharedUtility.1.0.36\build\native\Microsoft.Azure.C.SharedUtility.targets" Condition="Exists('packages\Microsoft.Azure.C.SharedUtility.1.0.36\build\native\Microsoft.Azure.C.SharedUtility.targets')" />
+    <Import Project="packages\Microsoft.Azure.IoTHub.IoTHubClient.1.1.17\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets" Condition="Exists('packages\Microsoft.Azure.IoTHub.IoTHubClient.1.1.17\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets')" />
+    <Import Project="packages\Microsoft.Azure.IoTHub.HttpTransport.1.1.17\build\native\Microsoft.Azure.IoTHub.HttpTransport.targets" Condition="Exists('packages\Microsoft.Azure.IoTHub.HttpTransport.1.1.17\build\native\Microsoft.Azure.IoTHub.HttpTransport.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('packages\Microsoft.Azure.C.SharedUtility.1.0.35\build\native\Microsoft.Azure.C.SharedUtility.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Azure.C.SharedUtility.1.0.35\build\native\Microsoft.Azure.C.SharedUtility.targets'))" />
-    <Error Condition="!Exists('packages\Microsoft.Azure.IoTHub.IoTHubClient.1.1.16\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Azure.IoTHub.IoTHubClient.1.1.16\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets'))" />
-    <Error Condition="!Exists('packages\Microsoft.Azure.IoTHub.HttpTransport.1.1.16\build\native\Microsoft.Azure.IoTHub.HttpTransport.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Azure.IoTHub.HttpTransport.1.1.16\build\native\Microsoft.Azure.IoTHub.HttpTransport.targets'))" />
+    <Error Condition="!Exists('packages\Microsoft.Azure.C.SharedUtility.1.0.36\build\native\Microsoft.Azure.C.SharedUtility.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Azure.C.SharedUtility.1.0.36\build\native\Microsoft.Azure.C.SharedUtility.targets'))" />
+    <Error Condition="!Exists('packages\Microsoft.Azure.IoTHub.IoTHubClient.1.1.17\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Azure.IoTHub.IoTHubClient.1.1.17\build\native\Microsoft.Azure.IoTHub.IoTHubClient.targets'))" />
+    <Error Condition="!Exists('packages\Microsoft.Azure.IoTHub.HttpTransport.1.1.17\build\native\Microsoft.Azure.IoTHub.HttpTransport.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Azure.IoTHub.HttpTransport.1.1.17\build\native\Microsoft.Azure.IoTHub.HttpTransport.targets'))" />
   </Target>
 </Project>
diff --git a/iothub_client/samples/iothub_client_sample_http/windows/packages.config b/iothub_client/samples/iothub_client_sample_http/windows/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><packages>
-  <package id="Microsoft.Azure.C.SharedUtility" version="1.0.35" targetFramework="native"/>
-  <package id="Microsoft.Azure.IoTHub.HttpTransport" version="1.1.16" targetFramework="native"/>
-  <package id="Microsoft.Azure.IoTHub.IoTHubClient" version="1.1.16" targetFramework="native"/>
+  <package id="Microsoft.Azure.C.SharedUtility" version="1.0.36" targetFramework="native"/>
+  <package id="Microsoft.Azure.IoTHub.HttpTransport" version="1.1.17" targetFramework="native"/>
+  <package id="Microsoft.Azure.IoTHub.IoTHubClient" version="1.1.17" targetFramework="native"/>
 </packages>