Skip to content

Commit 8ee2d0d

Browse files
authored
Build storage extensions against a package reference (Azure#16153)
1 parent 39d988b commit 8ee2d0d

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

eng/Directory.Build.Data.targets

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,13 @@
119119
</PropertyGroup>
120120

121121
<ItemGroup Condition="'$(UseProjectReferenceToAzureClients)' == 'true'">
122-
<!-- Find all Azure projects -->
123-
<AzureProjects Include="$(RepoRoot)/sdk/*/Azure.*/src/Azure.*.csproj" ProjectPath="%(Identity)" />
122+
<!-- Find all non-management projects -->
123+
<AzureProjects Include="$(RepoRoot)/sdk/**/src/*.csproj" Exclude="$(RepoRoot)/sdk/**/src/*.Management.*.csproj" ProjectPath="%(Identity)" />
124124
<PossibleProjectsToConvert Include="@(AzureProjects -> '%(Filename)')"/>
125125

126126
<!-- Compute set of projects that intersect with the PackageReference's -->
127127
<_NotPackageReferences Include="@(PossibleProjectsToConvert)" Exclude="@(PackageReference)" />
128+
<_NotPackageReferences Include="@(ExcludeFromProjectReferenceToConversion)" />
128129
<ProjectsToConvert Include="@(PossibleProjectsToConvert)" Exclude="@(_NotPackageReferences)" />
129130

130131
<!-- Remove PackageReferences -->

sdk/keyvault/Microsoft.Azure.KeyVault/tests/TestFramework/Microsoft.Azure.KeyVault.TestFramework.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,7 @@
1313
<PackageReference Include="Microsoft.Azure.Management.ResourceManager" />
1414
<PackageReference Include="Microsoft.Extensions.Configuration" />
1515
<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
16+
17+
<ExcludeFromProjectReferenceToConversion Include="Microsoft.Azure.Graph.RBAC" />
1618
</ItemGroup>
1719
</Project>

sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Blobs/src/Microsoft.Azure.WebJobs.Extensions.Storage.Blobs.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="Microsoft.Azure.WebJobs" />
12+
<PackageReference Include="Microsoft.Extensions.Azure" VersionOverride="1.1.0-alpha.20201021.1" />
1213
</ItemGroup>
1314

1415
<ItemGroup>
@@ -18,7 +19,6 @@
1819

1920
<ItemGroup>
2021
<!-- TODO (kasobol-msft) change this to PackageReference when stable -->
21-
<ProjectReference Include="..\..\..\extensions\Microsoft.Extensions.Azure\src\Microsoft.Extensions.Azure.csproj" />
2222
<ProjectReference Include="..\..\Azure.Storage.Blobs\src\Azure.Storage.Blobs.csproj" />
2323
<ProjectReference Include="..\..\Azure.Storage.Queues\src\Azure.Storage.Queues.csproj" />
2424
</ItemGroup>

sdk/storage/Microsoft.Azure.WebJobs.Extensions.Storage.Queues/src/Microsoft.Azure.WebJobs.Extensions.Storage.Queues.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="Microsoft.Azure.WebJobs" />
12+
<PackageReference Include="Microsoft.Extensions.Azure" VersionOverride="1.1.0-alpha.20201021.1" />
1213
</ItemGroup>
1314

1415
<ItemGroup>
@@ -18,7 +19,6 @@
1819

1920
<ItemGroup>
2021
<!-- TODO (kasobol-msft) change this to PackageReference when stable -->
21-
<ProjectReference Include="..\..\..\extensions\Microsoft.Extensions.Azure\src\Microsoft.Extensions.Azure.csproj" />
2222
<ProjectReference Include="..\..\Azure.Storage.Queues\src\Azure.Storage.Queues.csproj" />
2323
</ItemGroup>
2424

0 commit comments

Comments
 (0)