Merge pull request #679 from Azure/dev

huangpf PR: dev <- Azure:dev

Author: huangpf

src/ResourceManager/IotHub/AzureRM.IotHub.psd1

@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '1.0.0'
+ModuleVersion = '1.0.1'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()

src/ResourceManager/IotHub/ChangeLog.md

@@ -19,39 +19,5 @@
 -->
 ## Current Release
 
-## Version 1.0.0
-* Adds commandlets for the Azure IoT Hub 
-    - Add-AzureRmIotHubEventHubConsumerGroup
-        - Adds an Event Hub consumer group for an existing Azure IoT hub.
-    - Add-AzureRmIotHubKey
-        - Adds a new key to an existing Azure IoT hub.
-    - Get-AzureRmIotHub
-        - Gets the properties of an exisiting Azure IoT hub.
-    - Get-AzureRmIotHubConnectionString
-        - Gets the connection strings of an existing Azure IoT hub.
-    - Get-AzureRmIotHubEventHubConsumerGroup
-        - Gets the list of event hub consumer groups for the specified eventhub endpoint.
-    - Get-AzureRmIotHubJob
-        - Gets the properties of a set of Azure IoT hubs in a subscription or resource group.
-    - Get-AzureRmIotHubKey
-        - Gets the information related to a list of keys of an Azure IoT hub.
-    - Get-AzureRmIotHubQuotaMetric
-        - Gets the quota metrics for an Azure IoT hub.
-    - Get-AzureRmIotHubRegistryStatistic
-        - Gets the registry statistics for an Azure IoT hub.
-    - Get-AzureRmIotHubValidSku
-        - Gets the list of valid Skus to which an existing Azure IoT hub can transition to.
-    - New-AzureRmIotHub
-        - Creates a new Azure IoT hub.
-    - New-AzureRmIotHubExportDevices
-        - Starts a new job for exporting the devices of an Azure IoT hub.
-    - New-AzureRmIotHubImportDevices
-        - Starts a new job for importing the devices of an Azure IoT hub.
-    - Remove-AzureRmIotHub
-        - Removes an Azure IoT hub.
-    - Remove-AzureRmIotHubEventHubConsumerGroup
-        - Removes a consumer group for the specified event hub endpoint of a give Azure IoT hub.
-    - Remove-AzureRmIotHubKey
-        - Removes a key from an Azure IoT hub.
-    - Set-AzureRmIotHub
-        - Updates the properties of an Azure IoT hub.
+## Version 1.0.1
+* Fixes deserialization issue for one of the properties of PSIotHub

src/ResourceManager/IotHub/Commands.IotHub.Test/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1")]
+[assembly: AssemblyFileVersion("1.0.1")]

src/ResourceManager/IotHub/Commands.IotHub/Commands.IotHub.csproj

@@ -21,18 +21,18 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'"> 
-    <OutputPath>..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.IotHub</OutputPath> 
-    <DefineConstants>TRACE;SIGN</DefineConstants> 
-    <Optimize>true</Optimize> 
-    <DebugType>pdbonly</DebugType> 
-    <PlatformTarget>AnyCPU</PlatformTarget> 
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors> 
-    <SignAssembly>true</SignAssembly> 
-    <AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile> 
-    <DelaySign>true</DelaySign> 
-    <Prefer32Bit>false</Prefer32Bit> 
-  </PropertyGroup> 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <OutputPath>..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.IotHub</OutputPath>
+    <DefineConstants>TRACE;SIGN</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
+    <DelaySign>true</DelaySign>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Hyak.Common">
       <HintPath>..\..\..\packages\Hyak.Common.1.0.3\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
@@ -105,7 +105,6 @@
     <Compile Include="Models\PSAccessRights.cs" />
     <Compile Include="Models\PSCapabilities.cs" />
     <Compile Include="Models\PSCloudToDeviceProperties.cs" />
-    <Compile Include="Models\PSDiagnosticCategory.cs" />
     <Compile Include="Models\PSEventHubInputProperties.cs" />
     <Compile Include="Models\PSEventHubProperties.cs" />
     <Compile Include="Models\PSExportDevicesRequest.cs" />
@@ -126,7 +125,6 @@
     <Compile Include="Models\PSIotHubSkuTier.cs" />
     <Compile Include="Models\PSIotHubJobStatus.cs" />
     <Compile Include="Models\PSMessagingEndpointProperties.cs" />
-    <Compile Include="Models\PSOperationMonitoringLevel.cs" />
     <Compile Include="Models\PSOperationsMonitoringProperties.cs" />
     <Compile Include="Models\PSSBAccessRights.cs" />
     <Compile Include="Models\PSSharedAccessAuthorizationRule.cs" />

src/ResourceManager/IotHub/Commands.IotHub/Models/PSDiagnosticCategory.cs

@@ -22,6 +22,6 @@ public class PSOperationsMonitoringProperties
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "events")]
-        public IDictionary<PSDiagnosticCategory, PSOperationMonitoringLevel> OperationMonitoringEvents;
+        public IDictionary<string, string> OperationMonitoringEvents;
     }
 }

src/ResourceManager/IotHub/Commands.IotHub/Models/PSOperationMonitoringLevel.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("1.0.0")]
+[assembly: AssemblyVersion("1.0.1")]
+[assembly: AssemblyFileVersion("1.0.1")]