Skip to content

Commit 2194c43

Browse files
cgillumcgillum
authored
Updating dependencies to resolve component governance issues (#1224)
Also fixes some build warnings
1 parent cc46e03 commit 2194c43

File tree

6 files changed

+30
-29
lines changed

6 files changed

+30
-29
lines changed

‎Directory.Packages.props‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,20 @@
99

1010
<!-- Product dependencies -->
1111
<ItemGroup>
12-
<PackageVersion Include="Azure.Core" Version="1.43.0" />
13-
<PackageVersion Include="Azure.Data.Tables" Version="12.9.1" />
14-
<PackageVersion Include="Azure.Messaging.ServiceBus" Version="7.17.0" />
15-
<PackageVersion Include="Azure.Storage.Blobs" Version="12.22.1" />
16-
<PackageVersion Include="Azure.Storage.Queues" Version="12.20.0" />
12+
<PackageVersion Include="Azure.Core" Version="1.44.1" />
13+
<PackageVersion Include="Azure.Data.Tables" Version="12.11.0" />
14+
<PackageVersion Include="Azure.Messaging.ServiceBus" Version="7.19.0" />
15+
<PackageVersion Include="Azure.Storage.Blobs" Version="12.24.0" />
16+
<PackageVersion Include="Azure.Storage.Queues" Version="12.22.0" />
1717
<PackageVersion Include="Castle.Core" Version="5.0.0" />
1818
<PackageVersion Include="ImpromptuInterface" Version="6.2.2" Condition="'$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net472'" />
1919
<PackageVersion Include="ImpromptuInterface" Version="7.0.1" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
2020
<PackageVersion Include="Microsoft.ApplicationInsights" Version="2.21.0" />
21-
<PackageVersion Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.6" />
21+
<PackageVersion Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.3.0" />
2222
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
2323
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
2424
<PackageVersion Include="Microsoft.Data.Services.Client" Version="5.8.5" />
2525
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
26-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
2726
<PackageVersion Include="Microsoft.ServiceFabric" Version="6.4.617" />
2827
<PackageVersion Include="Microsoft.ServiceFabric.Data" Version="3.3.617" />
2928
<PackageVersion Include="Microsoft.ServiceFabric.Services" Version="3.3.617" />
@@ -52,10 +51,8 @@
5251
<PackageVersion Include="CommandLineParser" Version="2.4.3" Condition="'$(TargetFramework)' == 'net6.0'" />
5352
<PackageVersion Include="CommandLineParser" Version="1.9.71" Condition="'$(TargetFramework)' == 'net462'" />
5453
<PackageVersion Include="EnterpriseLibrary.SemanticLogging.EventSourceAnalyzer.NetCore" Version="2.0.1406.4" />
55-
<PackageVersion Include="Microsoft.AspNet.WebApi.Core" Version="5.2.6" />
54+
<PackageVersion Include="Microsoft.AspNet.WebApi.Core" Version="5.3.0" />
5655
<PackageVersion Include="Microsoft.Diagnostics.EventFlow.Core" Version="1.5.6" />
57-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.0" />
58-
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
5956
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
6057
<PackageVersion Include="Moq" Version="4.10.0" />
6158
<PackageVersion Include="MSTest.TestAdapter" Version="3.5.0" />
@@ -68,24 +65,24 @@
6865
<PackageVersion Include="WindowsAzure.Storage" Version="8.7.0" Condition="'$(TargetFramework)' == 'net462'" />
6966
</ItemGroup>
7067

71-
<!-- Test dependencies with netcoreapp3.1-->
72-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
68+
<!-- Test dependencies with net6.0-->
69+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
7370
<PackageVersion Include="EnterpriseLibrary.SemanticLogging.NetCore" Version="2.0.1406.4" />
7471
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
7572
</ItemGroup>
7673

7774
<!-- Test dependencies with net472-->
7875
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
79-
<PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="5.2.6" />
80-
<PackageVersion Include="Microsoft.AspNet.WebApi.Owin" Version="5.2.6" />
81-
<PackageVersion Include="Microsoft.Owin.Hosting" Version="4.0.0" />
76+
<PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
77+
<PackageVersion Include="Microsoft.AspNet.WebApi.Owin" Version="5.3.0" />
78+
<PackageVersion Include="Microsoft.Owin.Hosting" Version="4.2.2" />
8279
</ItemGroup>
8380

8481
<!-- Test dependencies with net462-->
8582
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
8683
<PackageVersion Include="EnterpriseLibrary.SemanticLogging" version="2.0.1406.1" />
8784
<PackageVersion Include="EnterpriseLibrary.SemanticLogging.TextFile" version="2.0.1406.1" />
88-
<PackageVersion Include="Microsoft.Owin.Hosting" Version="4.0.0" />
85+
<PackageVersion Include="Microsoft.Owin.Hosting" Version="4.2.2" />
8986
<PackageVersion Include="Microsoft.Tpl.Dataflow" version="4.5.24" />
9087
</ItemGroup>
9188

@@ -104,12 +101,18 @@
104101
<PackageVersion Include="Vio.DurableTask.Hosting" Version="2.2.1" />
105102
</ItemGroup>
106103

107-
<!-- Samples dependencies with net8.0-->
104+
<!-- Dependencies specific to net8.0-->
108105
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
109106
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
110107
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
111108
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
112109
</ItemGroup>
110+
<ItemGroup Condition="'$(TargetFramework)' != 'net8.0'">
111+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.0" />
112+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
113+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
114+
</ItemGroup>
115+
113116

114117
<!-- Samples dependencies with net462-->
115118
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">

‎samples/Correlation.Samples/Correlation.Samples.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎samples/Correlation.Samples/DurableTaskCorrelationTelemetryInitializer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ internal static void UpdateTelemetry(ITelemetry telemetry, Activity activity, bo
313313
if (initializeFromCurrent)
314314
{
315315
opTelemetry.Id = activity.SpanId.ToHexString();
316-
if (activity.ParentSpanId != null)
316+
if (activity.ParentSpanId != default)
317317
{
318318
opTelemetry.Context.Operation.ParentId = activity.ParentSpanId.ToHexString();
319319
}

‎src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
</PropertyGroup>
4141

4242
<ItemGroup>
43-
<PackageReference Include="Azure.Core" />
4443
<PackageReference Include="Azure.Data.Tables" />
4544
<PackageReference Include="Azure.Storage.Blobs" />
4645
<PackageReference Include="Azure.Storage.Queues" />

‎test/DurableTask.ServiceBus.Tests/DurableTask.ServiceBus.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),DurableTask.sln))\tools\DurableTask.props" />
44
<PropertyGroup>
5-
<TargetFrameworks>netcoreapp3.1;net462</TargetFrameworks>
5+
<TargetFrameworks>net6.0;net462</TargetFrameworks>
66
</PropertyGroup>
77

88
<PropertyGroup Condition="'$(TargetFramework)' == 'net462'">
@@ -28,7 +28,7 @@
2828
<PackageReference Include="WindowsAzure.ServiceBus" />
2929
</ItemGroup>
3030

31-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
31+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
3232
<PackageReference Include="Azure.Data.Tables" />
3333
<PackageReference Include="Azure.Storage.Blobs" />
3434
<PackageReference Include="EnterpriseLibrary.SemanticLogging.NetCore" />
@@ -60,7 +60,7 @@
6060
<Reference Include="System.Configuration" />
6161
</ItemGroup>
6262

63-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
63+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
6464
<None Update="testhost.dll.config">
6565
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
6666
</None>

‎test/DurableTask.ServiceBus.Tests/OrchestrationHubTableClientTests.cs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -274,31 +274,30 @@ bool CompareEnumerations(IEnumerable<AzureTableCompositeTableEntity> expected, I
274274
return true;
275275
}
276276

277-
bool CompareHistoryEntity(AzureTableOrchestrationHistoryEventEntity expected, AzureTableOrchestrationHistoryEventEntity actual)
277+
static bool CompareHistoryEntity(AzureTableOrchestrationHistoryEventEntity expected, AzureTableOrchestrationHistoryEventEntity actual)
278278
{
279279
// TODO : history comparison!
280280
return expected.InstanceId.Equals(actual.InstanceId) && expected.ExecutionId.Equals(actual.ExecutionId) &&
281281
expected.SequenceNumber == actual.SequenceNumber;
282282
}
283283

284-
bool CompareStateEntity(AzureTableOrchestrationStateEntity expected, AzureTableOrchestrationStateEntity actual)
284+
static bool CompareStateEntity(AzureTableOrchestrationStateEntity expected, AzureTableOrchestrationStateEntity actual)
285285
{
286286
return
287287
expected.State.OrchestrationInstance.InstanceId.Equals(actual.State.OrchestrationInstance.InstanceId) &&
288288
expected.State.OrchestrationInstance.ExecutionId.Equals(actual.State.OrchestrationInstance.ExecutionId) &&
289289
expected.State.Name.Equals(actual.State.Name) &&
290290
expected.State.CreatedTime.Equals(actual.State.CreatedTime) &&
291291
expected.State.LastUpdatedTime.Equals(actual.State.LastUpdatedTime) &&
292-
// ReSharper disable once ConditionIsAlwaysTrueOrFalse
293-
(expected.State.CompletedTime == null && actual.State.CompletedTime == null ||
292+
(expected.State.CompletedTime == default && actual.State.CompletedTime == default ||
294293
expected.State.CompletedTime.Equals(actual.State.CompletedTime)) &&
295294
expected.State.Status.Equals(actual.State.Status) &&
296295
expected.State.Input.Equals(actual.State.Input) &&
297296
(string.IsNullOrWhiteSpace(expected.State.Output) && string.IsNullOrWhiteSpace(actual.State.Output) ||
298297
expected.State.Output.Equals(actual.State.Output));
299298
}
300299

301-
IEnumerable<AzureTableOrchestrationHistoryEventEntity> CreateHistoryEntities(AzureTableClient azureTableClient, string instanceId,
300+
static IEnumerable<AzureTableOrchestrationHistoryEventEntity> CreateHistoryEntities(AzureTableClient azureTableClient, string instanceId,
302301
string genId, int count)
303302
{
304303
var historyEntities = new List<AzureTableOrchestrationHistoryEventEntity>();
@@ -314,7 +313,7 @@ IEnumerable<AzureTableOrchestrationHistoryEventEntity> CreateHistoryEntities(Azu
314313
return historyEntities;
315314
}
316315

317-
IEnumerable<AzureTableOrchestrationStateEntity> CreateStateEntities(AzureTableClient azureTableClient, string instanceId, string genId)
316+
static IEnumerable<AzureTableOrchestrationStateEntity> CreateStateEntities(AzureTableClient azureTableClient, string instanceId, string genId)
318317
{
319318
var entities = new List<AzureTableOrchestrationStateEntity>();
320319
var runtimeState = new OrchestrationState

0 commit comments

Comments
 (0)