Skip to content

Switch AWSSDK.Extensions.NETCore.Setup to use project reference #3348

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

Closed
normj wants to merge 1 commit into from
Closed

Switch AWSSDK.Extensions.NETCore.Setup to use project reference #3348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions extensions/src/AWSSDK.Extensions.NETCore.Setup/AWSSDK.Extensions.NETCore.Setup.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
<WarningsAsErrors>IL2026,IL2075</WarningsAsErrors>
<IsTrimmable>true</IsTrimmable>
</PropertyGroup>

Expand All @@ -39,7 +39,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.Core" Version="3.7.300" />
<ProjectReference Include="..\..\..\sdk\src\Core\AWSSDK.Core.NetStandard.csproj" />
</ItemGroup>

</Project>
19 changes: 15 additions & 4 deletions extensions/src/AWSSDK.Extensions.NETCore.Setup/AWSSDK.Extensions.NETCore.Setup.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,25 @@
<icon>images\AWSLogo.png</icon>

<dependencies>
<group>
<dependency id="AWSSDK.Core" version="3.7.300" />
<group targetFramework="netstandard2.0">
<dependency id="AWSSDK.Core" version="4.0.0.0-preview" />
<dependency id="Microsoft.Extensions.Configuration.Abstractions" version="2.0.0" />
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" />
<dependency id="Microsoft.Extensions.Logging.Abstractions" version="2.0.0" />
</group>

</dependencies>
<group targetFramework="netcoreapp3.1">
<dependency id="AWSSDK.Core" version="4.0.0.0-preview" />
<dependency id="Microsoft.Extensions.Configuration.Abstractions" version="2.0.0" />
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" />
<dependency id="Microsoft.Extensions.Logging.Abstractions" version="2.0.0" />
</group>
<group targetFramework="net8.0">
<dependency id="AWSSDK.Core" version="4.0.0.0-preview" />
<dependency id="Microsoft.Extensions.Configuration.Abstractions" version="2.0.0" />
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" />
<dependency id="Microsoft.Extensions.Logging.Abstractions" version="2.0.0" />
</group>
</dependencies>

</metadata>
<files>
Expand Down
7 changes: 4 additions & 3 deletions extensions/src/AWSSDK.Extensions.NETCore.Setup/ClientFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,12 +241,13 @@ private static ClientConfig CreateConfig(Type serviceInterfaceType, AWSOptions o
if (string.Equals(property.Name, "DefaultConfigurationMode", StringComparison.Ordinal))
continue;

// Skip setting RetryMode if it is set to legacy but the DefaultConfigurationMode is not legacy.
// Skip setting RetryMode if it is set to standard, the default mode, but the DefaultConfigurationMode
// on the new service config is not legacy.
// This will allow the retry mode to be configured from the DefaultConfiguration.
// This is a workaround to handle the inability to tell if RetryMode was explicitly set.
if (string.Equals(property.Name, "RetryMode", StringComparison.Ordinal) &&
defaultConfig.RetryMode == RequestRetryMode.Legacy &&
config.DefaultConfigurationMode != DefaultConfigurationMode.Legacy)
defaultConfig.RetryMode == RequestRetryMode.Standard &&
config.DefaultConfigurationMode != DefaultConfigurationMode.Standard)
continue;

singleArray[0] = property.GetMethod.Invoke(defaultConfig, emptyArray);
Expand Down
15 changes: 12 additions & 3 deletions extensions/src/AWSSDK.Extensions.NETCore.Setup/DefaultClientConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,9 @@
* permissions and limitations under the License.
*/
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;

using Amazon.Runtime;
using Amazon.Runtime.Endpoints;

namespace Amazon.Extensions.NETCore.Setup
{
Expand All @@ -27,6 +25,7 @@ namespace Amazon.Extensions.NETCore.Setup
internal class DefaultClientConfig : ClientConfig
{
public DefaultClientConfig()
: base(null)
{

}
Expand Down Expand Up @@ -54,5 +53,15 @@ public override string UserAgent
return null;
}
}

protected override void Initialize()
{
// Override the initialize method to avoid use with the null IDefaultConfigurationProvider
}

public override Endpoint DetermineServiceOperationEndpoint(ServiceOperationEndpointParameters parameters)
{
return null;
}
}
}