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

Jump to bottom

Target .NET Framework 4.6.2 instead of 4.5.2 #687

Merged
merged 3 commits into from
Dec 21, 2023
Merged

Target .NET Framework 4.6.2 instead of 4.5.2 #687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fed586c
Target .NET Framework 4.6.2 instead of 4.5.2
frederikprijck Dec 20, 2023
4a6e60f
Merge branch 'master' into chore/bump-dotnet-framework
frederikprijck Dec 21, 2023
7dd7a0d
Merge branch 'master' into chore/bump-dotnet-framework
frederikprijck Dec 21, 2023
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 src/Auth0.AuthenticationApi/Auth0.AuthenticationApi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<AssemblyTitle>Auth0.AuthenticationApi</AssemblyTitle>
<AssemblyName>Auth0.AuthenticationApi</AssemblyName>
<PackageId>Auth0.AuthenticationApi</PackageId>
<TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
<NetStandardImplicitPackageVersion>2.0.3</NetStandardImplicitPackageVersion>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\build\Auth0NetStrongName.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Auth0.Core\Auth0.Core.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net452'">
<ItemGroup Condition="'$(TargetFramework)'=='net462'">
<Reference Include="System.Net.Http" />
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Auth0.AuthenticationApi/HttpClientAuthenticationConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ private static HttpContent CreateFormUrlEncodedContent(IDictionary<string, strin

private static string CreateAgentString()
{
#if NET452
var target = "NET452";
#if NET462
var target = "NET462";
#endif
#if NETSTANDARD2_0
var target = "NETSTANDARD2.0";
Expand Down
4 changes: 2 additions & 2 deletions src/Auth0.Core/Auth0.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<AssemblyTitle>Auth0.Core</AssemblyTitle>
<AssemblyName>Auth0.Core</AssemblyName>
<PackageId>Auth0.Core</PackageId>
<TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
<NetStandardImplicitPackageVersion>2.0.3</NetStandardImplicitPackageVersion>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\build\Auth0NetStrongName.snk</AssemblyOriginatorKeyFile>
Expand All @@ -15,7 +15,7 @@
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net452'">
<ItemGroup Condition="'$(TargetFramework)'=='net462'">
<Reference Include="System.Net.Http" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/Auth0.ManagementApi/Auth0.ManagementApi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<AssemblyTitle>Auth0.ManagementApi</AssemblyTitle>
<AssemblyName>Auth0.ManagementApi</AssemblyName>
<PackageId>Auth0.ManagementApi</PackageId>
<TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
<NetStandardImplicitPackageVersion>2.0.3</NetStandardImplicitPackageVersion>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\build\Auth0NetStrongName.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Auth0.Core\Auth0.Core.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net452'">
<ItemGroup Condition="'$(TargetFramework)'=='net462'">
<Reference Include="System.Net.Http" />
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Auth0.ManagementApi/ManagementApiClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,8 @@ public void Dispose()

private static string CreateAgentString()
{
#if NET452
var target = "NET452";
#if NET462
var target = "NET462";
#endif
#if NETSTANDARD2_0
var target = "NETSTANDARD2.0";
Expand Down