Skip to content

Commit

Permalink
Update all non-test framework NuGets to latest version
Browse files Browse the repository at this point in the history
  • Loading branch information
drwill-ms committed Oct 26, 2022
1 parent 1fc7ef1 commit d616ae1
Show file tree
Hide file tree
Showing 23 changed files with 98 additions and 95 deletions.
10 changes: 5 additions & 5 deletions e2e/test/E2ETests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@

<!-- All Platforms -->
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.0" />
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.0" />
<PackageReference Include="FluentAssertions" Version="6.8.0" />
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
<PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.7" />
<PackageReference Include="System.Diagnostics.Tracing" Version="4.3.0" />
<PackageReference Include="WindowsAzure.Storage" Version="9.3.2" />
<PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
</ItemGroup>

<!-- NetCore and .NET 4.7.2 -->
<ItemGroup>
<PackageReference Include="Microsoft.Azure.Storage.Blob" Version="11.1.3" />
<PackageReference Include="Azure.Identity" Version="1.3.0" />
<PackageReference Include="Microsoft.Azure.Storage.Blob" Version="11.2.3" />
<PackageReference Include="Azure.Identity" Version="1.7.0" />
</ItemGroup>

<ItemGroup Condition=" '$(AZURE_IOT_LOCALPACKAGES)' == '' ">
Expand Down
2 changes: 1 addition & 1 deletion e2e/test/iothub/messaging/MessageReceiveE2ETests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ private async Task DoNotReceiveMessagesSentBeforeSubscriptionAsync(TestDeviceTyp
{
await testDeviceCallbackHandler.WaitForReceiveMessageCallbackAsync(cts.Token).ConfigureAwait(false);
};
receiveMessageOverCallback.Should().Throw<OperationCanceledException>();
await receiveMessageOverCallback.Should().ThrowAsync<OperationCanceledException>();

await serviceClient.Messages.CloseAsync().ConfigureAwait(false);
await deviceClient.CloseAsync().ConfigureAwait(false);
Expand Down
27 changes: 15 additions & 12 deletions e2e/test/iothub/service/ConfigurationsClientE2ETests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,10 @@ public async Task ConfigurationOperations_Work()
updateResult.TargetCondition.Should().Be(expected.TargetCondition);
updateResult.Content.DeviceContent.First().Should().Be(expected.Content.DeviceContent.First());
updateResult.Metrics.Queries.First().Should().Be(expected.Metrics.Queries.First());
updateResult.ETag.ToString().Should().NotBeNullOrEmpty().And.Should().NotBe(getResult.ETag, "The ETag should have changed after update");
updateResult.ETag.ToString()
.Should().NotBeNullOrEmpty()
.And
.NotBe(getResult.ETag.ToString(), "The ETag should have changed after update");
}
finally
{
Expand Down Expand Up @@ -124,17 +127,17 @@ public async Task ConfigurationsClient_SetETag_Works()
error.And.IsTransient.Should().BeFalse();

// set the 'onlyIfUnchanged' flag to false to check that, even with an out of date ETag, the request performs without exception.
FluentActions
await FluentActions
.Invoking(async () => { configuration = await serviceClient.Configurations.SetAsync(configuration, false).ConfigureAwait(false); })
.Should()
.NotThrow<IotHubServiceException>("Did not expect test to throw a precondition failed exception since 'onlyIfUnchanged' was set to false");
.NotThrowAsync<IotHubServiceException>("Did not expect test to throw a precondition failed exception since 'onlyIfUnchanged' was set to false");

// set the 'onlyIfUnchanged' flag to true to check that, with an out of date ETag, the request throws a PreconditionFailedException.
configuration.Priority = 2;
FluentActions
await FluentActions
.Invoking(async () => { await serviceClient.Configurations.SetAsync(configuration, true).ConfigureAwait(false); })
.Should()
.NotThrow<IotHubServiceException>("Did not expect test to throw a precondition failed exception since 'onlyIfUnchanged' was set to true");
.NotThrowAsync<IotHubServiceException>("Did not expect test to throw a precondition failed exception since 'onlyIfUnchanged' was set to true");
}
finally
{
Expand Down Expand Up @@ -189,13 +192,13 @@ public async Task ConfigurationsClient_DeleteETag_Works()
error.And.IsTransient.Should().BeFalse();

// set the 'onlyIfUnchanged' flag to false to check that, even with an out of date ETag, the request performs without exception.
FluentActions
.Invoking(async () =>
{
await serviceClient.Configurations.DeleteAsync(configuration, false).ConfigureAwait(false);
})
.Should()
.NotThrow<IotHubServiceException>("Did not expect test to throw a precondition failed exception since 'onlyIfUnchanged' was set to false");
await FluentActions
.Invoking(async () =>
{
await serviceClient.Configurations.DeleteAsync(configuration, false).ConfigureAwait(false);
})
.Should()
.NotThrowAsync<IotHubServiceException>("Did not expect test to throw a precondition failed exception since 'onlyIfUnchanged' was set to false");
}
finally
{
Expand Down
8 changes: 4 additions & 4 deletions e2e/test/iothub/service/QueryClientE2ETests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,9 @@ public async Task JobQuery_QueryWorks()
// tests in this suite are written to work even if the queried job isn't the one they created.
// That's why these checks aren't more specific.
queriedJob.JobId.Should().NotBeNull();
queriedJob.JobType.Should().NotBeNull();
queriedJob.JobType.Should().NotBe(JobType.Unknown);
queriedJob.CreatedOnUtc.Should().NotBeNull();
queriedJob.Status.Should().NotBeNull();
queriedJob.Status.Should().NotBe(JobStatus.Unknown);
if (queriedJob.Status != JobStatus.Queued
&& queriedJob.Status != JobStatus.Scheduled
&& queriedJob.Status != JobStatus.Cancelled
Expand Down Expand Up @@ -248,10 +248,10 @@ public async Task JobQuery_QueryByTypeWorks()
// tests in this suite are written to work even if the queried job isn't the one they created.
// That's why these checks aren't more specific.
queriedJob.JobId.Should().NotBeNull();
queriedJob.JobType.Should().NotBeNull();
queriedJob.JobType.Should().NotBe(JobType.Unknown);
queriedJob.EndedOnUtc.Should().NotBeNull();
queriedJob.CreatedOnUtc.Should().NotBeNull();
queriedJob.Status.Should().NotBeNull();
queriedJob.Status.Should().NotBe(JobStatus.Unknown);
}

[TestMethod]
Expand Down
48 changes: 24 additions & 24 deletions e2e/test/iothub/service/RegistryE2ETests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -550,17 +550,17 @@ public async Task DevicesClient_SetDevicesETag_Works()
error.And.IsTransient.Should().BeFalse();

// set the 'onlyIfUnchanged' flag to false to check that, even with an out of date ETag, the request performs without exception.
FluentActions
.Invoking(async () => { device = await serviceClient.Devices.SetAsync(device, false).ConfigureAwait(false); })
.Should()
.NotThrow<IotHubServiceException>("Did not expect test to throw a precondition failed exception since 'onlyIfUnchanged' was set to false");
await FluentActions
.Invoking(async () => { device = await serviceClient.Devices.SetAsync(device, false).ConfigureAwait(false); })
.Should()
.NotThrowAsync<IotHubServiceException>("Did not expect test to throw a precondition failed exception since 'onlyIfUnchanged' was set to false");

// set the 'onlyIfUnchanged' flag to true to check that, with an up-to-date ETag, the request performs without exception.
device.Status = ClientStatus.Enabled;
FluentActions
.Invoking(async () => { device = await serviceClient.Devices.SetAsync(device, true).ConfigureAwait(false); })
.Should()
.NotThrow<IotHubServiceException>("Did not expect test to throw a precondition failed exception since 'onlyIfUnchanged' was set to true");
await FluentActions
.Invoking(async () => { device = await serviceClient.Devices.SetAsync(device, true).ConfigureAwait(false); })
.Should()
.NotThrowAsync<IotHubServiceException>("Did not expect test to throw a precondition failed exception since 'onlyIfUnchanged' was set to true");
}
finally
{
Expand Down Expand Up @@ -604,10 +604,10 @@ public async Task DevicesClient_DeleteDevicesETag_Works()
error.And.IsTransient.Should().BeFalse();

// set the 'onlyIfUnchanged' flag to false to check that, even with an out of date ETag, the request performs without exception.
FluentActions
.Invoking(async () => { await serviceClient.Devices.DeleteAsync(device, false).ConfigureAwait(false); })
.Should()
.NotThrow<IotHubServiceException>("Did not expect test to throw a precondition failed exception since 'onlyIfUnchanged' was set to false");
await FluentActions
.Invoking(async () => { await serviceClient.Devices.DeleteAsync(device, false).ConfigureAwait(false); })
.Should()
.NotThrowAsync<IotHubServiceException>("Did not expect test to throw a precondition failed exception since 'onlyIfUnchanged' was set to false");
}
finally
{
Expand Down Expand Up @@ -668,18 +668,18 @@ await RetryOperationHelper
error.And.IsTransient.Should().BeFalse();

// set the 'onlyIfUnchanged' flag to false to check that, even with an out of date ETag, the request performs without exception.
FluentActions
.Invoking(async () => { module = await serviceClient.Modules.SetAsync(module, false).ConfigureAwait(false); })
.Should()
.NotThrow<IotHubServiceException>("Did not expect test to throw a precondition failed exception since 'onlyIfUnchanged' was set to false");
await FluentActions
.Invoking(async () => { module = await serviceClient.Modules.SetAsync(module, false).ConfigureAwait(false); })
.Should()
.NotThrowAsync<IotHubServiceException>("Did not expect test to throw a precondition failed exception since 'onlyIfUnchanged' was set to false");

// set the 'onlyIfUnchanged' flag to true to check that, with an up-to-date ETag, the request performs without exception.
module.ManagedBy = "";
device.Status = ClientStatus.Enabled;
FluentActions
.Invoking(async () => { await serviceClient.Modules.SetAsync(module, true).ConfigureAwait(false); })
.Should()
.NotThrow<IotHubServiceException>("Did not expect test to throw a precondition failed exception since 'onlyIfUnchanged' was set to true");
await FluentActions
.Invoking(async () => { await serviceClient.Modules.SetAsync(module, true).ConfigureAwait(false); })
.Should()
.NotThrowAsync<IotHubServiceException>("Did not expect test to throw a precondition failed exception since 'onlyIfUnchanged' was set to true");
}
finally
{
Expand Down Expand Up @@ -736,10 +736,10 @@ await RetryOperationHelper
error.And.IsTransient.Should().BeFalse();

// set the 'onlyIfUnchanged' flag to false to check that, even with an out of date ETag, the request performs without exception.
FluentActions
.Invoking(async () => { await serviceClient.Modules.DeleteAsync(module, false).ConfigureAwait(false); })
.Should()
.NotThrow<IotHubServiceException>("Did not expect test to throw a precondition failed exception since 'onlyIfUnchanged' was set to false");
await FluentActions
.Invoking(async () => { await serviceClient.Modules.DeleteAsync(module, false).ConfigureAwait(false); })
.Should()
.NotThrowAsync<IotHubServiceException>("Did not expect test to throw a precondition failed exception since 'onlyIfUnchanged' was set to false");
}
finally
{
Expand Down
10 changes: 5 additions & 5 deletions e2e/test/iothub/twin/TwinE2ETests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -759,18 +759,18 @@ public async Task Twin_Client_SetETag_Works(IotHubClientTransportProtocol transp
error.And.IsTransient.Should().BeFalse();

// set the 'onlyIfUnchanged' flag to false to check that, even with an out of date ETag, the request performs without exception.
FluentActions
await FluentActions
.Invoking(async () => { twin = await _serviceClient.Twins.UpdateAsync(testDevice.Id, twin, false).ConfigureAwait(false); })
.Should()
.NotThrow<IotHubServiceException>("Did not expect test to throw a precondition failed exception since 'onlyIfUnchanged' was set to false");
.NotThrowAsync<IotHubServiceException>("Did not expect test to throw a precondition failed exception since 'onlyIfUnchanged' was set to false");

// set the 'onlyIfUnchanged' flag to true to check that, with an up-to-date ETag, the request performs without exception.
twin.Properties.Desired[propName] = propValue + "1";
twin.ETag = new ETag("*");
FluentActions
twin.ETag = ETag.All;
await FluentActions
.Invoking(async () => { twin = await _serviceClient.Twins.UpdateAsync(testDevice.Id, twin, true).ConfigureAwait(false); })
.Should()
.NotThrow<IotHubServiceException>("Did not expect test to throw a precondition failed exception since 'onlyIfUnchanged' was set to true");
.NotThrowAsync<IotHubServiceException>("Did not expect test to throw a precondition failed exception since 'onlyIfUnchanged' was set to true");
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.Storage.Blobs" Version="12.13.0" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.14.1" />
<PackageReference Include="CommandLineParser" Version="2.9.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.9.1" />
<PackageReference Include="System.Text.Json" Version="6.0.5" />
<PackageReference Include="System.Text.Json" Version="6.0.6" />
</ItemGroup>

<!--<ItemGroup Condition="'$(Configuration)' == 'Release'">
Expand Down
4 changes: 2 additions & 2 deletions iothub/device/src/Microsoft.Azure.Devices.Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@

<!--Nuget package dependencies-->
<ItemGroup>
<PackageReference Include="MQTTnet" Version="4.0.0.167" />
<PackageReference Include="MQTTnet" Version="4.1.2.350" />
<PackageReference Include="Microsoft.Azure.Amqp" Version="2.5.12" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Microsoft.Win32.Registry" Version="4.5.0" />
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
</ItemGroup>
</Project>

0 comments on commit d616ae1

Please sign in to comment.