Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[EngSys] Bump extensions package references #47365

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

[EngSys] Bump extensions package references #47365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fe52e0d
[EngSys] Bump extensions package references
jsquire Nov 27, 2024
5c4c70c
Bump AsyncInterfaces just for extensions packages
jsquire Nov 27, 2024
d818448
Updating all extension-focused dependencies to latest supported version
jsquire Dec 10, 2024
683e067
Rolling back Microsoft.AspNetCore.Http to unsupported version due to …
jsquire Dec 10, 2024
5f088dc
Fixing type reference.
jsquire Dec 10, 2024
826b7e2
Adding reference due to a type shifting packages.
jsquire Dec 10, 2024
b7d7287
Updating extensions logging overrides.
jsquire Dec 11, 2024
8d6f9e3
Updating test matrix to remove .NET 6 which is end-of-life and includ…
jsquire Dec 11, 2024
c864fba
Update snippet generator to net8.0 version
jsquire Dec 12, 2024
039ea74
Updating tools
jsquire Dec 12, 2024
fc0e8f3
Bumping SDK version
jsquire Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"Azure.Sdk.Tools.SnippetGenerator": {
"version": "1.0.0-dev.20230124.1",
"version": "1.0.0-dev.20241212.1",
"commands": [
"snippet-generator"
]
Expand Down
67 changes: 35 additions & 32 deletions eng/Packages.Data.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,28 +215,31 @@
<PackageReference Update="Microsoft.Azure.SignalR.Management" Version="1.25.2" />
<PackageReference Update="Microsoft.Azure.SignalR.Protocols" Version="1.25.2" />
<PackageReference Update="Microsoft.Azure.SignalR.Serverless.Protocols" Version="1.10.0" />
<PackageReference Update="Microsoft.Azure.WebJobs" Version="3.0.37" />
<PackageReference Update="Microsoft.Azure.WebJobs.Sources" Version="3.0.37" PrivateAssets="All"/>
<PackageReference Update="Microsoft.Azure.WebJobs.Extensions.Rpc" Version="3.0.37" />
<PackageReference Update="Microsoft.Azure.WebJobs.Host.Storage" Version="5.0.0" />
<PackageReference Update="Microsoft.Azure.WebJobs" Version="3.0.41" />
<PackageReference Update="Microsoft.Azure.WebJobs.Sources" Version="3.0.41" PrivateAssets="All"/>
<PackageReference Update="Microsoft.Azure.WebJobs.Extensions.Rpc" Version="3.0.41" />
<PackageReference Update="Microsoft.Azure.WebJobs.Host.Storage" Version="5.0.1" />
<PackageReference Update="Microsoft.Spatial" Version="7.5.3" />
<PackageReference Update="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>

<!-- Packages intended for Extensions libraries only -->
<ItemGroup Condition="'$(IsExtensionClientLibrary)' == 'true'">
<PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="3.1.32" />
<PackageReference Update="Microsoft.AspNetCore.Http" Version="2.1.22" />
<PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="8.0.11" />
<PackageReference Update="Microsoft.AspNetCore.Http" Version="2.2.2" /> <!-- End of life. Cannot use latest supported (2.1.34) due to Functions dependencies -->
<PackageReference Update="Microsoft.AspNetCore.Http.Connections" Version="1.0.15" />
<PackageReference Update="Microsoft.Azure.Functions.Extensions" Version="1.0.0" />
<PackageReference Update="Microsoft.Azure.Functions.Worker.Extensions.Abstractions" Version="1.1.0" />
<PackageReference Update="Microsoft.Extensions.Azure" Version="1.7.6" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.0" />
<PackageReference Update="Microsoft.Extensions.Configuration" Version="2.1.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="2.1.0" />
<PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="2.1.0" />
<PackageReference Update="Microsoft.Extensions.Options" Version="2.1.0" />
<PackageReference Update="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
<PackageReference Update="Microsoft.Azure.Functions.Worker.Extensions.Abstractions" Version="1.3.0" />
<PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
<PackageReference Update="Microsoft.Extensions.Azure" Version="1.9.0" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
<PackageReference Update="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
<PackageReference Update="Microsoft.Extensions.Logging" Version="8.0.1" />
<PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
<PackageReference Update="Microsoft.Extensions.Options" Version="8.0.2" />
</ItemGroup>

<!--
Expand Down Expand Up @@ -301,13 +304,13 @@
<PackageReference Update="FsCheck.Xunit" Version="2.14.0" />
<PackageReference Update="Microsoft.ApplicationInsights" Version="2.20.0" />
<PackageReference Update="Microsoft.Azure.ApplicationInsights.Query" Version="1.0.0" />
<PackageReference Update="Microsoft.AspNetCore" Version="2.2.0" />
<PackageReference Update="Microsoft.AspNetCore.Mvc.Testing" Version="2.2.0" />
<PackageReference Update="Microsoft.AspNetCore" Version="2.1.7" />
<PackageReference Update="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.11" />
<PackageReference Update="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.3" />
<PackageReference Update="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.1.25" />
<PackageReference Update="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Version="2.1.40" />
<PackageReference Update="Microsoft.AspNetCore.Server.WebListener" Version="1.1.4" />
<PackageReference Update="Microsoft.AspNetCore.Http" Version="2.2.2" />
<PackageReference Update="Microsoft.AspNetCore.Server.WebListener" Version="1.1.4" /> <!-- End of life, used only by Batch -->
<PackageReference Update="Microsoft.AspNetCore.Http" Version="2.2.2" /> <!-- End of life. Cannot use latest supported (2.1.34) due to Functions dependencies -->
<PackageReference Update="Microsoft.Azure.Core.Spatial" Version="1.0.0" />
<PackageReference Update="Microsoft.Azure.Core.NewtonsoftJson" Version="1.0.0" />
<PackageReference Update="Microsoft.Azure.Devices" Version="1.38.2" />
Expand All @@ -334,21 +337,21 @@
<PackageReference Update="Microsoft.Azure.Storage.Queue" Version="11.1.7" />
<PackageReference Update="Microsoft.Azure.Test.HttpRecorder" Version="[1.13.3, 2.0.0)" />
<PackageReference Update="Microsoft.Azure.WebJobs.Extensions" Version="5.0.0" />
<PackageReference Update="Microsoft.Azure.WebJobs.Extensions.Http" Version="3.0.2" />
<PackageReference Update="Microsoft.Azure.WebJobs.Extensions.Http" Version="3.2.0" />
<PackageReference Update="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Update="Microsoft.Data.SqlClient" Version="5.1.3" />
<PackageReference Update="Microsoft.Extensions.Azure" Version="1.7.6" />
<PackageReference Update="Microsoft.Extensions.Azure" Version="1.9.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="2.1.10" />
<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
<PackageReference Update="Microsoft.Extensions.Configuration" Version="5.0.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
<PackageReference Update="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Update="Microsoft.Extensions.Hosting" Version="8.0.1" />
<PackageReference Update="Microsoft.Extensions.Logging.Configuration" Version="8.0.0-rc.1.23419.4" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="3.1.32" />
<PackageReference Update="Microsoft.Extensions.Logging.Configuration" Version="8.0.1" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageReference Update="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
<PackageReference Update="Microsoft.Graph" Version="5.57.0" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Update="Microsoft.NET.Sdk.Functions" Version="4.2.0" />
<PackageReference Update="Microsoft.NET.Sdk.Functions" Version="4.6.0" />
<PackageReference Update="Microsoft.Rest.ClientRuntime" Version="[2.3.24, 3.0.0)" />
<PackageReference Update="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="[2.4.1]" />
<PackageReference Update="Microsoft.Rest.ClientRuntime.Azure.TestFramework" Version="[1.7.7, 2.0.0)" />
Expand Down Expand Up @@ -403,14 +406,14 @@
<PackageReference Update="System.ServiceModel.Primitives" Version="6.2.0" />
<PackageReference Update="Azure.Storage.Files.Shares" Version="12.18.0" />
<PackageReference Update="Azure.Storage.Queues" Version="12.18.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
<PackageReference Update="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageReference Update="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1" />
<PackageReference Update="Microsoft.Extensions.Http" Version="8.0.1" />
<PackageReference Update="Microsoft.Extensions.Logging.Configuration" Version="8.0.1" />
</ItemGroup>
<ItemGroup Condition="('$(IsWcfLibrary)' == 'true') AND ($(TargetFramework.StartsWith('net4')))">
<PackageReference Update="Microsoft.Extensions.Configuration.UserSecrets" Version="2.1.1" />
<PackageReference Update="Microsoft.Extensions.Http" Version="2.1.1" />
<PackageReference Update="Microsoft.Extensions.Logging.Configuration" Version="2.1.1" />
<PackageReference Update="Microsoft.Extensions.Http" Version="8.0.1" />
<PackageReference Update="Microsoft.Extensions.Logging.Configuration" Version="8.0.1" />
</ItemGroup>

<PropertyGroup>
Expand Down
8 changes: 4 additions & 4 deletions eng/pipelines/templates/stages/platform-matrix.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
},
"matrix": {
"Agent": {
"Ubuntu-20.04_NET6.0": {
"Ubuntu-20.04_NET9.0": {
"OSVmImage": "env:LINUXVMIMAGE",
"Pool": "env:LINUXPOOL",
"TestTargetFramework": "net6.0"
"TestTargetFramework": "net9.0"
},
"Ubuntu-20.04_NET8.0": {
"OSVmImage": "env:LINUXVMIMAGE",
Expand All @@ -25,10 +25,10 @@
"Pool": "env:WINDOWSPOOL",
"TestTargetFramework": "net8.0"
},
"MacOS_NET6.0": {
"MacOS_NET9.0": {
"OSVmImage": "env:MACVMIMAGE",
"Pool": "env:MACPOOL",
"TestTargetFramework": "net6.0"
"TestTargetFramework": "net9.0"
},
"MacOS_NET8.0": {
"OSVmImage": "env:MACVMIMAGE",
Expand Down
6 changes: 3 additions & 3 deletions eng/pipelines/templates/steps/install-dotnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ steps:
inputs:
useGlobalJson: true
performMultiLevelLookup: true
- task: UseDotNet@2 # We need .NET 6 for azure-sdk-tools and the .NET 6 tests
- task: UseDotNet@2 # We need .NET for the .NET 9 tests
condition: and(succeeded(), ne(variables['Agent.OS'], 'Windows_NT')) # Windows supports MultiLevelLookup and doesn't need explicit framework installation
displayName: 'Use .NET 6.0 SDK'
displayName: 'Use .NET 9.0 SDK'
retryCountOnTaskFailure: 3
inputs:
# AspNetCore runtime pack can't be installed outside of SDK and we need it for integration tests
packageType: sdk
performMultiLevelLookup: true
version: "6.0.x"
version: "9.0.x"
- task: Cache@2
inputs:
key: 'nuget | "$(Agent.OS)" | $(Build.SourcesDirectory)/eng/Packages.Data.props | ${{parameters.NuGetCacheKey}}'
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"Microsoft.Build.Traversal": "3.2.0"
},
"sdk": {
"version": "8.0.100",
"version": "9.0.101",
"rollForward": "feature"
}
}
2 changes: 1 addition & 1 deletion ...Jobs.Extensions.EventHubs/tests/Microsoft.Azure.WebJobs.Extensions.EventHubs.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<ItemGroup>
<PackageReference Include="Azure.ResourceManager.EventHubs" />
<PackageReference Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" VersionOverride="3.0.27" />
<PackageReference Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" VersionOverride="3.0.41" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
Expand Down
4 changes: 2 additions & 2 deletions ...pNetCore.DataProtection.Blobs/src/Azure.Extensions.AspNetCore.DataProtection.Blobs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

<ItemGroup>
<PackageReference Include="Azure.Core" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection" VersionOverride="8.0.11" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" VersionOverride="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
<PackageReference Include="Azure.Storage.Blobs" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion ....DataProtection.Blobs/tests/Azure.Extensions.AspNetCore.DataProtection.Blobs.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<PackageReference Include="NUnit" />
<PackageReference Include="NUnit3TestAdapter" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" VersionOverride="8.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
<PackageReference Include="Moq" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions ...AspNetCore.DataProtection.Keys/src/Azure.Extensions.AspNetCore.DataProtection.Keys.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

<ItemGroup>
<PackageReference Include="Azure.Core" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection" VersionOverride="8.0.11" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" VersionOverride="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
<PackageReference Include="Azure.Security.KeyVault.Keys" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...re.DataProtection.Keys/tests/Azure.Extensions.AspNetCore.DataProtection.Keys.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<PackageReference Include="NUnit" />
<PackageReference Include="NUnit3TestAdapter" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" VersionOverride="8.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
<PackageReference Include="Moq" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...Jobs.Extensions.Clients/samples/Microsoft.Azure.WebJobs.Extensions.Clients.Samples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<RequiredTargetFrameworks>net6.0</RequiredTargetFrameworks>
<RequiredTargetFrameworks>net8.0</RequiredTargetFrameworks>
<TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>
<AzureFunctionsVersion>v3</AzureFunctionsVersion>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions sdk/extensions/Microsoft.Azure.WebJobs.Extensions.Clients/tests/AzureClientAttributeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ public void Run([AzureClient("Connection")] TestClient testClient)
}
}

[TestCase("Connection")]
[TestCase("AzureWebJobsConnection")]
//[TestCase("Connection")]
//[TestCase("AzureWebJobsConnection")]
[TestCase("ConnectionStrings:Connection")]
public async Task CreatesClientUsingConnectionString(string keyName)
{
Expand Down
6 changes: 4 additions & 2 deletions sdk/extensions/Microsoft.Extensions.Azure/src/Microsoft.Extensions.Azure.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@
<ItemGroup>
<PackageReference Include="Azure.Identity" />
<PackageReference Include="Azure.Core" />
<PackageReference Include="Microsoft.Extensions.Logging" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" VersionOverride="8.0.2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
<PackageReference Include="Microsoft.Extensions.Options" />
<PackageReference Include="Microsoft.Extensions.Configuration" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" VersionOverride="8.0.0" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion sdk/extensions/Microsoft.Extensions.Azure/tests/Microsoft.Extensions.Azure.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" VersionOverride="8.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="System.Net.WebSockets.Client" />
<PackageReference Include="System.ValueTuple" />
Expand Down
10 changes: 2 additions & 8 deletions sdk/resourcemanager/Azure.ResourceManager/tests/Azure.ResourceManager.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,8 @@

<ItemGroup>
<PackageReference Include="Azure.Identity" />

<!-- TEMP: Override until central version is bumped to mitigate project reference CI error -->
<PackageReference Include="Microsoft.Extensions.Azure" VersionOverride="1.9.0" />

<!-- TEMP: Overrides until central packages bumped, needed for new extensions -->
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" VersionOverride="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" VersionOverride="8.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" VersionOverride="8.0.2" />
<PackageReference Include="Microsoft.Extensions.Azure" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions ...age.Scenario.Tests/tests/Microsoft.Azure.WebJobs.Extensions.Storage.Scenario.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>
Expand All @@ -5,8 +5,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore" VersionOverride="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" VersionOverride="2.1.0"/>
<PackageReference Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" VersionOverride="3.0.34" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing"/>
<PackageReference Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" VersionOverride="3.0.41" />
<PackageReference Include="Microsoft.Azure.WebJobs.Host.Storage" />
</ItemGroup>

Expand Down
Loading