Skip to content

Commit 3d61ec2

Browse files
authored
{IotHub} Update device sdk (#12528)
* Update device sdk * Re-record test session * Removed additional NewtonSoft reference * update the device sdk in dps and iothub both * Remove Iothub reference from DPS test * Added IotHub reference * Update the DeviceProvisioningService SDK * Reverted DPS upgrade * Update changelog
1 parent b440594 commit 3d61ec2

File tree

20 files changed

+9364
-8962
lines changed

20 files changed

+9364
-8962
lines changed

src/DeviceProvisioningServices/DeviceProvisioningServices.Test/DeviceProvisioningServices.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.Azure.Devices" Version="1.18.2" />
14+
<PackageReference Include="Microsoft.Azure.Devices" Version="1.22.0" />
1515
<PackageReference Include="Microsoft.Azure.Management.DeviceProvisioningServices" Version="0.10.0-preview" />
1616
<PackageReference Include="Microsoft.Azure.Management.IotHub" Version="2.10.0-preview" />
1717
</ItemGroup>

src/DeviceProvisioningServices/DeviceProvisioningServices.Test/SessionRecords/Commands.DeviceProvisioningServices.Test.IotDpsAccessPolicyTests/IotDpsAccessPolicyLifeCycle.json

Lines changed: 607 additions & 334 deletions
Large diffs are not rendered by default.

src/DeviceProvisioningServices/DeviceProvisioningServices.Test/SessionRecords/Commands.DeviceProvisioningServices.Test.IotDpsEnrollmentGroupTests/IotDpsEnrollmentGroupLifeCycle.json

Lines changed: 896 additions & 1124 deletions
Large diffs are not rendered by default.

src/DeviceProvisioningServices/DeviceProvisioningServices.Test/SessionRecords/Commands.DeviceProvisioningServices.Test.IotDpsEnrollmentTests/IotDpsEnrollmentLifeCycle.json

Lines changed: 994 additions & 937 deletions
Large diffs are not rendered by default.

src/DeviceProvisioningServices/DeviceProvisioningServices.Test/SessionRecords/Commands.DeviceProvisioningServices.Test.IotDpsLinkedHubTests/IotDpsLinkedHubLifeCycle.json

Lines changed: 591 additions & 648 deletions
Large diffs are not rendered by default.

src/DeviceProvisioningServices/DeviceProvisioningServices.Test/SessionRecords/Commands.DeviceProvisioningServices.Test.IotDpsRegistrationTests/IotDpsRegistrationLifeCycle.json

Lines changed: 730 additions & 1129 deletions
Large diffs are not rendered by default.

src/DeviceProvisioningServices/DeviceProvisioningServices.Test/SessionRecords/Commands.DeviceProvisioningServices.Test.IotDpsTests/IotDpsLifeCycle.json

Lines changed: 398 additions & 398 deletions
Large diffs are not rendered by default.

src/DeviceProvisioningServices/DeviceProvisioningServices.sln

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScenarioTest.ResourceManage
1919
EndProject
2020
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestFx", "..\..\tools\TestFx\TestFx.csproj", "{BC80A1D0-FFA4-43D9-AA74-799F5CB54B58}"
2121
EndProject
22-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IotHub", "..\IotHub\IotHub\IotHub.csproj", "{FD98F78A-2655-40A3-9330-A2B2CCBF7625}"
22+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IotHub", "..\IotHub\IotHub\IotHub.csproj", "{7F81FF1A-8216-4F21-BC14-53BA42FC6478}"
2323
EndProject
2424
Global
2525
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -55,17 +55,17 @@ Global
5555
{BC80A1D0-FFA4-43D9-AA74-799F5CB54B58}.Debug|Any CPU.Build.0 = Debug|Any CPU
5656
{BC80A1D0-FFA4-43D9-AA74-799F5CB54B58}.Release|Any CPU.ActiveCfg = Release|Any CPU
5757
{BC80A1D0-FFA4-43D9-AA74-799F5CB54B58}.Release|Any CPU.Build.0 = Release|Any CPU
58-
{FD98F78A-2655-40A3-9330-A2B2CCBF7625}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
59-
{FD98F78A-2655-40A3-9330-A2B2CCBF7625}.Debug|Any CPU.Build.0 = Debug|Any CPU
60-
{FD98F78A-2655-40A3-9330-A2B2CCBF7625}.Release|Any CPU.ActiveCfg = Release|Any CPU
61-
{FD98F78A-2655-40A3-9330-A2B2CCBF7625}.Release|Any CPU.Build.0 = Release|Any CPU
58+
{7F81FF1A-8216-4F21-BC14-53BA42FC6478}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
59+
{7F81FF1A-8216-4F21-BC14-53BA42FC6478}.Debug|Any CPU.Build.0 = Debug|Any CPU
60+
{7F81FF1A-8216-4F21-BC14-53BA42FC6478}.Release|Any CPU.ActiveCfg = Release|Any CPU
61+
{7F81FF1A-8216-4F21-BC14-53BA42FC6478}.Release|Any CPU.Build.0 = Release|Any CPU
6262
EndGlobalSection
6363
GlobalSection(SolutionProperties) = preSolution
6464
HideSolutionNode = FALSE
6565
EndGlobalSection
6666
GlobalSection(NestedProjects) = preSolution
6767
{4802BBF0-70F7-4FCB-81A6-381810234F14} = {DB3F9035-1533-4D52-B782-285C784EFDD4}
68-
{FD98F78A-2655-40A3-9330-A2B2CCBF7625} = {DB3F9035-1533-4D52-B782-285C784EFDD4}
68+
{7F81FF1A-8216-4F21-BC14-53BA42FC6478} = {DB3F9035-1533-4D52-B782-285C784EFDD4}
6969
EndGlobalSection
7070
GlobalSection(ExtensibilityGlobals) = postSolution
7171
SolutionGuid = {930E4484-D6C7-4C25-AE5B-05EDACF6ED88}

src/DeviceProvisioningServices/DeviceProvisioningServices/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+
* Update devices provisioning service sdk
2122

2223
## Version 0.7.4
2324
* Fixed debug: Enrollment does not retain/assign linked IotHubs while choosing Custom allocation policy. [#12154]

src/DeviceProvisioningServices/DeviceProvisioningServices/DeviceProvisioningServices.csproj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<PsModuleName>DeviceProvisioningServices</PsModuleName>
@@ -11,8 +11,12 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.Azure.Devices.Provisioning.Service" Version="1.5.0" />
14+
<PackageReference Include="Microsoft.Azure.Devices.Provisioning.Service" Version="1.6.3" />
1515
<PackageReference Include="Microsoft.Azure.Management.DeviceProvisioningServices" Version="0.10.0-preview" />
1616
</ItemGroup>
1717

18+
<ItemGroup>
19+
<PackageReference Update="Newtonsoft.Json" Version="12.0.3" />
20+
</ItemGroup>
21+
1822
</Project>

0 commit comments

Comments
 (0)