Skip to content

Commit 1ca9208

Browse files
committed
Merge branch 'master' of https://github.com/Azure/azure-powershell into iot-device-module-cs
2 parents bcea597 + b9908c9 commit 1ca9208

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

src/DataLakeStore/DataLakeStore/Az.DataLakeStore.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.7.2'; })
5757

5858
# Assemblies that must be loaded prior to importing this module
5959
RequiredAssemblies = 'Microsoft.Azure.Management.DataLake.Store.dll',
60-
'Microsoft.Azure.DataLake.Store.dll', 'NLog.dll'
60+
'Microsoft.Azure.DataLake.Store.dll', 'NLog.dll', 'System.Buffers.dll'
6161

6262
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
6363
# ScriptsToProcess = @()

src/DataLakeStore/DataLakeStore/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21+
* Add reference to System.Buffers explicitly in csproj and psd1.
2122

2223
## Version 1.2.6
2324
* Update references in .psd1 to use relative path

src/DataLakeStore/DataLakeStore/DataLakeStore.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<PackageReference Include="Microsoft.Azure.DataLake.Store" Version="1.2.3-alpha" />
1616
<PackageReference Include="Microsoft.Azure.Management.DataLake.Store" Version="2.4.2-preview" />
1717
<PackageReference Include="NLog" Version="4.5.0" />
18+
<PackageReference Include="System.Buffers" Version="4.3.0" />
1819
<PackageReference Include="System.Net.Requests" Version="4.3.0" />
1920
</ItemGroup>
2021

src/IotHub/IotHub/help/Get-AzIotHubDeviceConnectionString.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ PS C:\> Get-AzIotHubDeviceConnectionString -ResourceGroupName "myresourcegroup"
4141
4242
Device Id Connection String
4343
--------- -----------------
44-
device1 HostName=myiothub.azure-devices.net;DeviceId=device1;SharedAccessKey=/X4yj1WhlkpcZWied4mNEI+KShScCc+fgNjsdTSM3ag=
44+
device1 HostName=myiothub.azure-devices.net;DeviceId=device1;SharedAccessKey=/X4y******
4545
device2 HostName=myiothub.azure-devices.net;DeviceId=device2;x509=true
4646
```
4747

@@ -53,7 +53,7 @@ PS C:\> Get-AzIotHubDCS -ResourceGroupName "myresourcegroup" -IotHubName "myioth
5353
5454
Device Id Connection String
5555
--------- -----------------
56-
device1 HostName=myiothub.azure-devices.net;DeviceId=device1;SharedAccessKey=/X4yj1WhlkpcZWied4mNEI+KShScCc+fgNjsdTSM3ag=
56+
device1 HostName=myiothub.azure-devices.net;DeviceId=device1;SharedAccessKey=/X4y******
5757
```
5858

5959
Get the secondary connection string of an IoT device.

0 commit comments

Comments
 (0)