Skip to content

Commit 1270c6c

Browse files
m-nashCopilot
andauthored
Remove Azure.Identity from cloudmachine projects (batch 7) (Azure#58463)
* Remove Azure.Identity from cloudmachine projects (batch 7) Adds per-package override of Azure.AI.Projects to 2.1.0-beta.1, which no longer transitively pulls Azure.Identity. The CPM version (2.0.0 GA) pulls Azure.Identity 1.20.0, conflicting with the type-forwards in Azure.Core 1.53. Once Azure.AI.Projects 2.1.0 GA ships, the override files should be cleaned up and the central version bumped. Identity types remain available via Azure.Core 1.53 type-forwards. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Address review: combine Azure.AI.Projects override into existing conditional ItemGroup Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Remove unused Azure.Provisioning.Deployment ref from Provisioning.Tests The package was referenced but never used in test code (no using statements, no API calls). It was the transitive source of Azure.Identity 1.12.0 that was causing CS0433 in CI after the src project's Azure.Identity ref was removed. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Add tracking issue link to Azure.AI.Projects override files (Azure#58510) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent b3c1cb4 commit 1270c6c

7 files changed

Lines changed: 38 additions & 4 deletions

File tree

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Project>
2+
<!--
3+
TEMPORARY: Override Azure.AI.Projects to the 2.1.0-beta.1 prerelease.
4+
The CPM version (2.0.0 GA) transitively pulls Azure.Identity 1.20.0,
5+
which conflicts with the Identity types now type-forwarded by
6+
Azure.Core 1.53. The 2.1.0-beta.1 package depends only on Azure.Core
7+
1.53 and does not pull Azure.Identity.
8+
9+
REMOVE THIS OVERRIDE once Azure.AI.Projects 2.1.0 GA ships and the
10+
central version in Directory.Packages.props is bumped.
11+
Tracking issue: https://github.com/Azure/azure-sdk-for-net/issues/58510
12+
-->
13+
<ItemGroup>
14+
<PackageVersion Update="Azure.AI.Projects" Version="2.1.0-beta.1" />
15+
</ItemGroup>
16+
</Project>

eng/centralpackagemanagement/overrides/Azure.Projects.Packages.props

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,18 @@
11
<Project>
2+
<!--
3+
TEMPORARY: Override Azure.AI.Projects to the 2.1.0-beta.1 prerelease.
4+
The CPM version (2.0.0 GA) transitively pulls Azure.Identity 1.20.0,
5+
which conflicts with the Identity types now type-forwarded by
6+
Azure.Core 1.53. The 2.1.0-beta.1 package depends only on Azure.Core
7+
1.53 and does not pull Azure.Identity.
8+
9+
REMOVE THIS OVERRIDE once Azure.AI.Projects 2.1.0 GA ships and the
10+
central version in Directory.Packages.props is bumped.
11+
Tracking issue: https://github.com/Azure/azure-sdk-for-net/issues/58510
12+
-->
13+
<ItemGroup>
14+
<PackageVersion Update="Azure.AI.Projects" Version="2.1.0-beta.1" />
15+
</ItemGroup>
216
<ItemGroup Condition="'$(IsTestProject)' == 'true'">
317
<PackageVersion Include="Azure.Provisioning.Deployment" Version="1.0.0-beta.2" />
418
</ItemGroup>

eng/centralpackagemanagement/overrides/Azure.Projects.Provisioning.Packages.props

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
<Project>
22
<ItemGroup Condition="$(MSBuildProjectName.Contains('Azure.Projects.Provisioning'))">
33
<PackageVersion Include="Azure.Provisioning.AppConfiguration" Version="1.0.0"/>
4+
<!--
5+
TEMPORARY: Override Azure.AI.Projects to the 2.1.0-beta.1 prerelease.
6+
Pulled in transitively via the Azure.Projects project reference. See
7+
Azure.Projects.Packages.props for full rationale. REMOVE once
8+
Azure.AI.Projects 2.1.0 GA ships.
9+
Tracking issue: https://github.com/Azure/azure-sdk-for-net/issues/58510
10+
-->
11+
<PackageVersion Update="Azure.AI.Projects" Version="2.1.0-beta.1" />
412
</ItemGroup>
513
<ItemGroup Condition="'$(IsTestProject)' == 'true'">
614
<PackageVersion Include="Azure.Provisioning.Deployment" Version="1.0.0-beta.2" />

sdk/cloudmachine/Azure.Projects.AI.Foundry/Azure.Projects.AI.Foundry.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
<ItemGroup>
1010
<PackageReference Include="Azure.AI.Projects" />
11-
<PackageReference Include="Azure.Identity" />
1211
<PackageReference Include="Azure.Provisioning" />
1312
<PackageReference Include="System.ClientModel" />
1413
</ItemGroup>

sdk/cloudmachine/Azure.Projects.Provisioning/src/Azure.Projects.Provisioning.csproj

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

1313
<ItemGroup>
14-
<PackageReference Include="Azure.Identity" />
1514
<PackageReference Include="Azure.Provisioning" />
1615
<PackageReference Include="Azure.Provisioning.KeyVault" />
1716
<PackageReference Include="Azure.Provisioning.Storage" />

sdk/cloudmachine/Azure.Projects.Provisioning/tests/Azure.Projects.Provisioning.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<PackageReference Include="NUnit3TestAdapter" />
1010
<PackageReference Include="Microsoft.NET.Test.Sdk" />
1111
<PackageReference Include="Azure.AI.OpenAI" />
12-
<PackageReference Include="Azure.Provisioning.Deployment" />
1312
<PackageReference Include="System.Memory.Data" />
1413
</ItemGroup>
1514

sdk/cloudmachine/Azure.Projects/src/Azure.Projects.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<ItemGroup>
1717
<PackageReference Include="Azure.Data.AppConfiguration" />
1818
<PackageReference Include="Azure.Core" />
19-
<PackageReference Include="Azure.Identity" />
2019
<PackageReference Include="Azure.Messaging.ServiceBus" />
2120
<PackageReference Include="Azure.Messaging.EventGrid" />
2221
<PackageReference Include="Azure.Storage.Blobs" />

0 commit comments

Comments
 (0)