Skip to content

Commit d33316e

Browse files
zhiyuanliang-mszhiyuanliang-ms
authored
Merge pull request #695 from Azure/zhiyuanliang/upgrade-dependency
Drop .net 6 & Upgrade dependency
1 parent e7ca517 commit d33316e

File tree

9 files changed

+29
-29
lines changed

9 files changed

+29
-29
lines changed

‎build/install-dotnet.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Installs .NET 6 and .NET 8 for CI/CD environment
1+
# Installs .NET 8 and .NET 9 for CI/CD environment
22
# see: https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-install-script#examples
33

44
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
55

6-
&([scriptblock]::Create((Invoke-WebRequest -UseBasicParsing 'https://dot.net/v1/dotnet-install.ps1'))) -Channel 6.0
7-
86
&([scriptblock]::Create((Invoke-WebRequest -UseBasicParsing 'https://dot.net/v1/dotnet-install.ps1'))) -Channel 8.0
7+
8+
&([scriptblock]::Create((Invoke-WebRequest -UseBasicParsing 'https://dot.net/v1/dotnet-install.ps1'))) -Channel 9.0

‎examples/ConsoleAppWithFailOver/ConsoleAppWithFailOver.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Azure.Identity" Version="1.12.0" />
9+
<PackageReference Include="Azure.Identity" Version="1.15.0" />
1010
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
1111
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
1212
</ItemGroup>

‎src/Microsoft.Azure.AppConfiguration.AspNetCore/Microsoft.Azure.AppConfiguration.AspNetCore.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="..\..\build\NugetProperties.props" />
33

44
<PropertyGroup>
5-
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
5+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
66
<Description>Microsoft.Azure.AppConfiguration.AspNetCore allows developers to use Microsoft Azure App Configuration service as a configuration source in their applications. This package adds additional features for ASP.NET Core applications to the existing package Microsoft.Extensions.Configuration.AzureAppConfiguration.</Description>
77
<SignAssembly>true</SignAssembly>
88
<DelaySign>false</DelaySign>

‎src/Microsoft.Azure.AppConfiguration.Functions.Worker/Microsoft.Azure.AppConfiguration.Functions.Worker.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="..\..\build\NugetProperties.props" />
33

44
<PropertyGroup>
5-
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
5+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
66
<Description>Microsoft.Azure.AppConfiguration.Functions.Worker allows developers to use the Microsoft Azure App Configuration service as a configuration source in their applications. This package adds additional features to the existing package Microsoft.Extensions.Configuration.AzureAppConfiguration for .NET Azure Functions running in an isolated process.</Description>
77
<SignAssembly>true</SignAssembly>
88
<DelaySign>false</DelaySign>

‎src/Microsoft.Extensions.Configuration.AzureAppConfiguration/Microsoft.Extensions.Configuration.AzureAppConfiguration.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
</PropertyGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Azure.Data.AppConfiguration" Version="1.6.0" />
19-
<PackageReference Include="Azure.Messaging.EventGrid" Version="4.7.0" />
20-
<PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.6.0" />
18+
<PackageReference Include="Azure.Data.AppConfiguration" Version="1.6.1" />
19+
<PackageReference Include="Azure.Messaging.EventGrid" Version="5.0.0" />
20+
<PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.8.0" />
2121
<PackageReference Include="DnsClient" Version="1.7.0" />
22-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.36" />
22+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.19" />
2323
<PackageReference Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
24-
<PackageReference Include="Microsoft.Extensions.Azure" Version="1.7.6" />
25-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
26-
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
27-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
24+
<PackageReference Include="Microsoft.Extensions.Azure" Version="1.12.0" />
25+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
26+
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
27+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
2828
</ItemGroup>
2929

3030
<PropertyGroup>

‎tests/Tests.AzureAppConfiguration.AspNetCore/Tests.AzureAppConfiguration.AspNetCore.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55
<LangVersion>8.0</LangVersion>
66
<DelaySign>false</DelaySign>
77
<SignAssembly>true</SignAssembly>
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
13+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
1515
<PackageReference Include="Moq" Version="4.20.70" />
1616
<PackageReference Include="xunit" Version="2.7.0" />

‎tests/Tests.AzureAppConfiguration.Functions.Worker/Tests.AzureAppConfiguration.Functions.Worker.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55
<LangVersion>8.0</LangVersion>
66
<DelaySign>false</DelaySign>
77
<SignAssembly>true</SignAssembly>
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
13+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
1515
<PackageReference Include="Moq" Version="4.20.70" />
1616
<PackageReference Include="xunit" Version="2.7.0" />

‎tests/Tests.AzureAppConfiguration/Integration/IntegrationTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1941,7 +1941,7 @@ await _configClient.SetConfigurationSettingAsync(
19411941
Assert.Contains(RequestTracingConstants.TimeWindowFilter, requestInspector.CorrelationContextHeaders.Last());
19421942
Assert.Contains(RequestTracingConstants.CustomFilter, requestInspector.CorrelationContextHeaders.Last());
19431943
Assert.Contains(RequestTracingConstants.FeatureFlagMaxVariantsKey, requestInspector.CorrelationContextHeaders.Last());
1944-
Assert.Contains($"{RequestTracingConstants.FeatureManagementVersionKey}=4.0.0", requestInspector.CorrelationContextHeaders.Last());
1944+
Assert.Contains($"{RequestTracingConstants.FeatureManagementVersionKey}=4.3.0", requestInspector.CorrelationContextHeaders.Last());
19451945
}
19461946

19471947
[Fact]

‎tests/Tests.AzureAppConfiguration/Tests.AzureAppConfiguration.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net48;net6.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net48;net8.0;net9.0</TargetFrameworks>
55
<LangVersion>8.0</LangVersion>
66
<DelaySign>false</DelaySign>
77
<SignAssembly>true</SignAssembly>
@@ -11,15 +11,15 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Azure.Identity" Version="1.12.0" />
15-
<PackageReference Include="Azure.ResourceManager" Version="1.13.0" />
16-
<PackageReference Include="Azure.ResourceManager.AppConfiguration" Version="1.1.0" />
17-
<PackageReference Include="Azure.ResourceManager.KeyVault" Version="1.3.1" />
18-
<PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.7.0" />
14+
<PackageReference Include="Azure.Identity" Version="1.15.0" />
15+
<PackageReference Include="Azure.ResourceManager" Version="1.13.2" />
16+
<PackageReference Include="Azure.ResourceManager.AppConfiguration" Version="1.4.1" />
17+
<PackageReference Include="Azure.ResourceManager.KeyVault" Version="1.3.2" />
18+
<PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.8.0" />
1919
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
20-
<PackageReference Include="Microsoft.FeatureManagement" Version="4.0.0" />
20+
<PackageReference Include="Microsoft.FeatureManagement" Version="4.3.0" />
2121
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
22-
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
22+
<PackageReference Include="System.Linq.Async" Version="6.0.3" />
2323
<PackageReference Include="Moq" Version="4.20.70" />
2424
<PackageReference Include="xunit" Version="2.7.0" />
2525
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">

0 commit comments

Comments
 (0)