Skip to content

Commit 468c668

Browse files
jsquirejsquire
authored
[Governance] Update WCF Extensions (Azure#48730)
* [Governance] Update WCF Extensions The focus of these changes is to update the dependency versions of the WCF extensions to remediate governance alerts for potential security vulnerabilities. * Bumping test dependency from an RC version to latest * Rolling back version of Primitives due to breaking changes. * Direct version of UserSecrets to ensure no downgrade * Adding in inapprorpriately cleaned using * Fixing version mismatch in net framework builds * Fixing typo
1 parent 15ce09a commit 468c668

File tree

4 files changed

+32
-33
lines changed

4 files changed

+32
-33
lines changed

‎eng/Packages.Data.props‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,6 @@
171171
<PackageReference Update="Microsoft.Identity.Client" Version="4.69.1" />
172172
<PackageReference Update="Microsoft.Identity.Client.Extensions.Msal" Version="4.69.1" />
173173
<PackageReference Update="Microsoft.Identity.Client.Broker" Version="4.69.1" />
174-
175-
<!-- TODO: Make sure this package is arch-board approved -->
176174
<PackageReference Update="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.35.0" />
177175
<PackageReference Update="Microsoft.IdentityModel.Tokens" Version="6.35.0" />
178176
<PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="6.35.0" />
@@ -207,6 +205,10 @@
207205
<PackageReference Update="System.Memory.Data" Version="8.0.1"/>
208206
</ItemGroup>
209207

208+
<ItemGroup Condition="'$(IsGeneratorLibrary)' == 'true'">
209+
<PackageReference Update="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20250307.1" />
210+
</ItemGroup>
211+
210212
<!--
211213
Dependency versions for Track 2, Microsoft.* libraries.
212214
These are dependencies for Track 2 integration packages
@@ -245,6 +247,28 @@
245247
<PackageReference Update="Microsoft.Extensions.Options" Version="2.1.0" />
246248
</ItemGroup>
247249

250+
<!-- Packages intended for WCF/CoreWCF Extensions libraries only -->
251+
<ItemGroup Condition="'$(IsWcfLibrary)' == 'true'">
252+
<PackageReference Update="CoreWCF.Primitives" Version="1.7.0" />
253+
<PackageReference Update="CoreWCF.Queue" Version="1.7.0" />
254+
<PackageReference Update="System.IO.Pipelines" Version="8.0.0" />
255+
<PackageReference Update="Microsoft.AspNetCore" Version="2.3.0" />
256+
<PackageReference Update="System.ServiceModel.Primitives" Version="6.2.0" />
257+
<PackageReference Update="Azure.Storage.Files.Shares" Version="12.21.0" />
258+
<PackageReference Update="Azure.Storage.Queues" Version="12.21.0" />
259+
<PackageReference Update="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1" />
260+
<PackageReference Update="Microsoft.Extensions.Http" Version="8.0.0" />
261+
<PackageReference Update="Microsoft.Extensions.Logging.Configuration" Version="8.0.1" />
262+
<PackageReference Update="System.Formats.Asn1" Version="8.0.2" />
263+
<PackageReference Update="System.Security.Cryptography.Pkcs" Version="8.0.1" />
264+
</ItemGroup>
265+
266+
<ItemGroup Condition="('$(IsWcfLibrary)' == 'true') AND ($(TargetFramework.StartsWith('net4')))">
267+
<PackageReference Update="Microsoft.Extensions.Configuration.UserSecrets" Version="2.2.0" />
268+
<PackageReference Update="Microsoft.Extensions.Http" Version="2.2.0" />
269+
<PackageReference Update="Microsoft.Extensions.Logging.Configuration" Version="2.2.0" />
270+
</ItemGroup>
271+
248272
<!--
249273
Build time packages
250274
All should have PrivateAssets="All" set so they don't become package dependencies
@@ -265,10 +289,6 @@
265289
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version ="3.9.0" PrivateAssets="all" />
266290
</ItemGroup>
267291

268-
<ItemGroup Condition="'$(IsGeneratorLibrary)' == 'true'">
269-
<PackageReference Update="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20250307.1" />
270-
</ItemGroup>
271-
272292
<!--
273293
Test/Sample/Perf/Stress project dependencies
274294
-->
@@ -353,7 +373,7 @@
353373
<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
354374
<PackageReference Update="Microsoft.Extensions.Configuration" Version="5.0.0" />
355375
<PackageReference Update="Microsoft.Extensions.Hosting" Version="8.0.1" />
356-
<PackageReference Update="Microsoft.Extensions.Logging.Configuration" Version="8.0.0-rc.1.23419.4" />
376+
<PackageReference Update="Microsoft.Extensions.Logging.Configuration" Version="8.0.1" />
357377
<PackageReference Update="Microsoft.Extensions.Logging.Console" Version="6.0.0"/>
358378
<PackageReference Update="Microsoft.Extensions.Primitives" Version="6.0.1"/>
359379
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="3.1.32" />
@@ -403,31 +423,11 @@
403423
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.2" />
404424
<PackageReference Update="xunit" Version="2.4.2" />
405425
</ItemGroup>
426+
406427
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
407428
<PackageDownload Update="NETStandard.Library.Ref" Version="[2.1.0]" />
408429
</ItemGroup>
409430

410-
<!-- IsWcfLibrary is set in "..\sdk\extension-wcf\Directory.Build.props". This property indicates that WCF/CoreWCF extensions project is being built.-->
411-
<ItemGroup Condition="'$(IsWcfLibrary)' == 'true'">
412-
<PackageReference Update="CoreWCF.Primitives" Version="[1.5.2,2.0)" />
413-
<PackageReference Update="CoreWCF.Queue" Version="[1.5.2,2.0)" />
414-
<PackageReference Update="System.IO.Pipelines" Version="8.0.0" />
415-
<PackageReference Update="Microsoft.AspNetCore" Version="2.1.7" />
416-
<PackageReference Update="System.ServiceModel.Primitives" Version="6.2.0" />
417-
<PackageReference Update="Azure.Storage.Files.Shares" Version="12.21.0" />
418-
<PackageReference Update="Azure.Storage.Queues" Version="12.21.0" />
419-
<PackageReference Update="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1" />
420-
<PackageReference Update="Microsoft.Extensions.Http" Version="8.0.0" />
421-
<PackageReference Update="Microsoft.Extensions.Logging.Configuration" Version="8.0.1" />
422-
<PackageReference Update="System.Formats.Asn1" Version="6.0.1" />
423-
<PackageReference Update="System.Security.Cryptography.Pkcs" Version="6.0.5" />
424-
</ItemGroup>
425-
<ItemGroup Condition="('$(IsWcfLibrary)' == 'true') AND ($(TargetFramework.StartsWith('net4')))">
426-
<PackageReference Update="Microsoft.Extensions.Configuration.UserSecrets" Version="2.1.1" />
427-
<PackageReference Update="Microsoft.Extensions.Http" Version="2.1.1" />
428-
<PackageReference Update="Microsoft.Extensions.Logging.Configuration" Version="2.1.1" />
429-
</ItemGroup>
430-
431431
<PropertyGroup>
432432
<TestProxyVersion>1.0.0-dev.20250221.1</TestProxyVersion>
433433
</PropertyGroup>

‎sdk/extension-wcf/Microsoft.CoreWCF.Azure.StorageQueues/src/Microsoft.CoreWCF.Azure.StorageQueues.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<PackageReference Include="Azure.Identity" />
2828
<PackageReference Include="Azure.Storage.Queues" />
2929
<PackageReference Include="CoreWCF.Queue" />
30+
<PackageReference Include="System.Formats.Asn1" />
3031
<PackageReference Include="System.IO.Pipelines" />
3132
</ItemGroup>
3233

‎sdk/extension-wcf/Microsoft.WCF.Azure.StorageQueues/src/Microsoft.WCF.Azure.StorageQueues.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<ItemGroup>
2020
<PackageReference Include="Azure.Identity" />
2121
<PackageReference Include="Azure.Storage.Queues" />
22+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" />
2223
<PackageReference Include="System.Formats.Asn1" />
2324
<PackageReference Include="System.Security.Cryptography.Pkcs" />
2425
<PackageReference Include="System.ServiceModel.Primitives" GeneratePathProperty="true" />

‎sdk/extension-wcf/Microsoft.WCF.Azure.StorageQueues/src/Microsoft/WCF/Azure/AzureClientCredentials.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4+
using System.IdentityModel.Selectors;
5+
using System.ServiceModel.Description;
46
using Azure;
57
using Azure.Core;
68
using Azure.Identity;
79
using Azure.Storage;
810
using Azure.Storage.Queues.Models;
9-
using Microsoft.WCF.Azure.StorageQueues;
10-
using System;
11-
using System.IdentityModel.Selectors;
12-
using System.ServiceModel.Description;
13-
using System.ServiceModel.Security;
1411

1512
namespace Microsoft.WCF.Azure
1613
{

0 commit comments

Comments
 (0)