Skip to content

Update AWS SDK to Preview 11 #205

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

Merged
merged 9 commits into from
Apr 1, 2025
Merged

Update AWS SDK to Preview 11 #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fa26c77
Update AWS SDK to Preview 11
GarrettBeatty Mar 26, 2025
9d18274
Change file
GarrettBeatty Mar 26, 2025
082217c
drop .net6
GarrettBeatty Mar 31, 2025
2671a19
Update f6aa1ac3-20e2-40f5-b214-288e18db8358.json
GarrettBeatty Mar 31, 2025
2b23f8a
Update f6aa1ac3-20e2-40f5-b214-288e18db8358.json
GarrettBeatty Mar 31, 2025
4d669ad
Update Amazon.Extensions.Configuration.SystemsManager.csproj
GarrettBeatty Mar 31, 2025
539c51e
Update f6aa1ac3-20e2-40f5-b214-288e18db8358.json
GarrettBeatty Mar 31, 2025
3d7f423
Update f6aa1ac3-20e2-40f5-b214-288e18db8358.json
GarrettBeatty Mar 31, 2025
ee63af3
update condition
GarrettBeatty Apr 1, 2025
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
13 changes: 13 additions & 0 deletions .autover/changes/f6aa1ac3-20e2-40f5-b214-288e18db8358.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"Projects": [
{
"Name": "Amazon.Extensions.Configuration.SystemsManager",
"Type": "Major",
"ChangelogMessages": [
"Update AWS SDK to Preview 11",
"Remove support for .NET 6",
"Remove support for netcoreapp3.1"
]
}
]
}
8 changes: 4 additions & 4 deletions ...nsions.Configuration.SystemsManager/Amazon.Extensions.Configuration.SystemsManager.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<!-- Included netstandard2.0 support for a .NET Framework use-case, see: https://github.com/aws/aws-dotnet-extensions-configuration/pull/150 -->
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
<AssemblyName>Amazon.Extensions.Configuration.SystemsManager</AssemblyName>
<RootNamespace>Amazon.Extensions.Configuration.SystemsManager</RootNamespace>
<OutputType>Library</OutputType>
Expand Down Expand Up @@ -44,9 +44,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.AppConfigData" Version="4.0.0-preview.8" />
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.0-preview.8" />
<PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="4.0.0-preview.8" />
<PackageReference Include="AWSSDK.AppConfigData" Version="4.0.0-preview.11" />
<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.0-preview.11" />
<PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="4.0.0-preview.11" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.*" />
<PackageReference Include="System.Text.Json" Condition=" '$(TargetFramework)' == 'netstandard2.0' " Version="8.0.5" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
Expand Down
2 changes: 1 addition & 1 deletion src/Amazon.Extensions.Configuration.SystemsManager/DefaultParameterProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public virtual string GetKey(Parameter parameter, string path)
var name = parameter.Name.StartsWith(path, StringComparison.OrdinalIgnoreCase)
? parameter.Name.Substring(path.Length)
: parameter.Name;
#if NETCOREAPP3_1_OR_GREATER
#if NET8_0_OR_GREATER
return name.TrimStart('/').Replace("/", KeyDelimiter, StringComparison.InvariantCulture);
#else
return name.TrimStart('/').Replace("/", KeyDelimiter);
Expand Down
2 changes: 1 addition & 1 deletion src/Amazon.Extensions.Configuration.SystemsManager/Internal/ServiceClientAppender.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public static void ServiceClientBeforeRequestEvent(object sender, RequestEventAr
if (e is WebServiceRequestEventArgs args)
{
if (args.Headers.ContainsKey(UserAgentHeader) &&
#if NETCOREAPP3_1_OR_GREATER
#if NET8_0_OR_GREATER
Copy link
Contributor Author

@GarrettBeatty GarrettBeatty Apr 1, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@normj /@philasmar i believe this is right based on https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/preprocessor-directives#remarks.

!args.Headers[UserAgentHeader].Contains(UserAgentSuffix, System.StringComparison.InvariantCulture)
#else
!args.Headers[UserAgentHeader].Contains(UserAgentSuffix)
Expand Down
6 changes: 3 additions & 3 deletions ...guration.SystemsManager.Integ/Amazon.Extensions.Configuration.SystemsManager.Integ.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.AppConfig" Version="4.0.0-preview.8" />
<PackageReference Include="AWSSDK.AppConfig" Version="4.0.0-preview.11" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="AWSSDK.SecurityToken" Version="4.0.0-preview.8" />
<PackageReference Include="AWSSDK.SecurityToken" Version="4.0.0-preview.11" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
Expand Down
1 change: 0 additions & 1 deletion test/Amazon.Extensions.Configuration.SystemsManager.Integ/AppConfigEndToEndTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using System.Text.Json;
using System.Threading.Tasks;

using Amazon;
using Amazon.AppConfig;
using Amazon.AppConfig.Model;
using Amazon.Extensions.NETCore.Setup;
Expand Down
2 changes: 1 addition & 1 deletion ...guration.SystemsManager.Tests/Amazon.Extensions.Configuration.SystemsManager.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down