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

Feature/dotnet 8 upgrade #337

Merged
merged 1 commit into from
Dec 3, 2024
Merged

Feature/dotnet 8 upgrade #337

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
12 changes: 10 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,24 @@ jobs:

- name: Install .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.0.404'

- name: Install .NET Android and iOS workload
run: dotnet workload install android ios maui
run: dotnet workload install android ios maui --version 8.0.404

- name: workload update version
run: dotnet workload update --version 8.0.404

- name: Dotnet framework and workload versions
run: dotnet --info

- name: Setup NuGet
uses: nuget/setup-nuget@v1

- name: Restore NuGet
run: nuget restore Auth0.OidcClient.All.sln

- name: Setup MSBuild
uses: microsoft/setup-msbuild@v1.1

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nuget-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_call:
inputs:
dotnet-version:
default: '6.0.x'
default: '8.0.x'
type: string
project-path:
required: true
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,11 @@ jobs:

- name: Install .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.0.404'

- name: Install .NET Android and iOS workload
run: dotnet workload install android ios maui
run: dotnet workload install android ios maui --version 8.0.404

- name: Setup NuGet
uses: nuget/setup-nuget@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rl-secure.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x
dotnet-version: '8.0.404'

- uses: actions/download-artifact@v4
with:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/snyk.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,11 @@ jobs:

- name: Install .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.0.404'

- name: Install .NET Android and iOS workload
run: dotnet workload install android ios maui
run: dotnet workload install android ios maui --version 8.0.404

- name: Setup NuGet
uses: nuget/setup-nuget@v1
Expand Down
4 changes: 2 additions & 2 deletions Auth0.OidcClient.All.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Auth0.OidcClient.WinForms",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Auth0.OidcClient.WPF", "src\Auth0.OidcClient.WPF\Auth0.OidcClient.WPF.csproj", "{C3030559-6BD9-408C-BB21-6637D9883188}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Auth0.OidcClient.MAUI.Platforms.Windows.UnitTests", "test\Auth0.OidcClient.MAUI.Platforms.Windows.UnitTests\Auth0.OidcClient.MAUI.Platforms.Windows.UnitTests.csproj", "{5DB6D1AB-3252-4833-B97F-1194502F01BF}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Auth0.OidcClient.MAUI.Platforms.Windows.UnitTests", "test\Auth0.OidcClient.MAUI.Platforms.Windows.UnitTests\Auth0.OidcClient.MAUI.Platforms.Windows.UnitTests.csproj", "{5DB6D1AB-3252-4833-B97F-1194502F01BF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Auth0.OidcClient.MAUI.Platforms.Windows", "src\Auth0.OidcClient.MAUI.Platforms.Windows\Auth0.OidcClient.MAUI.Platforms.Windows.csproj", "{5B9F23A7-E4B7-4FB7-B7DC-F208176799D1}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Auth0.OidcClient.MAUI.Platforms.Windows", "src\Auth0.OidcClient.MAUI.Platforms.Windows\Auth0.OidcClient.MAUI.Platforms.Windows.csproj", "{5B9F23A7-E4B7-4FB7-B7DC-F208176799D1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
10 changes: 5 additions & 5 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "6.0.417",
"rollForward": "latestFeature"
}
}
"sdk": {
"version": "8.0.404",
"rollForward": "latestFeature"
}
}
2 changes: 1 addition & 1 deletion src/Auth0.OidcClient.AndroidX/Auth0.OidcClient.AndroidX.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Xamarin.Legacy.Sdk/0.2.0-alpha4">
<PropertyGroup>
<TargetFrameworks>MonoAndroid12.0;net6.0-android</TargetFrameworks>
<TargetFrameworks>MonoAndroid12.0;net8.0-android</TargetFrameworks>
<RootNamespace>Auth0.OidcClient</RootNamespace>
<AssemblyName>Auth0.OidcClient</AssemblyName>
<Product>Auth0.OidcClient</Product>
Expand Down
4 changes: 2 additions & 2 deletions src/Auth0.OidcClient.MAUI.Platforms.Windows/Auth0.OidcClient.MAUI.Platforms.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0-windows10.0.19041.0</TargetFrameworks>
<TargetFrameworks>net8.0-windows10.0.20348.0</TargetFrameworks>
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings>

<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.20348.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
</PropertyGroup>

Expand Down
14 changes: 7 additions & 7 deletions src/Auth0.OidcClient.MAUI/Auth0.OidcClient.MAUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net6.0-windows10.0.19041.0</TargetFrameworks>
<TargetFrameworks>net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.20348.0</TargetFrameworks>
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings>

<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">13.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">29.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">16.4.7142</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">16.4.7142</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">33.0.95</SupportedOSPlatformVersion>

<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.20348.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>


Expand All @@ -28,7 +28,7 @@
<ItemGroup>
<PackageReference Include="IdentityModel.OidcClient" Version="5.2.1" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows10.0.19041.0'">
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows10.0.20348.0'">
<ProjectReference Include="..\Auth0.OidcClient.MAUI.Platforms.Windows\Auth0.OidcClient.MAUI.Platforms.Windows.csproj" />
</ItemGroup>
<ItemGroup>
Expand Down
12 changes: 6 additions & 6 deletions src/Auth0.OidcClient.UWP/Auth0.OidcClient.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
<PropertyGroup>
<TargetFrameworks>uap10.0.16299</TargetFrameworks>
<TargetFrameworks>uap10.0.19041.0</TargetFrameworks>
<RootNamespace>Auth0.OidcClient</RootNamespace>
<AssemblyName>Auth0.OidcClient</AssemblyName>
<AssemblyTitle>Auth0.OidcClient.UWP</AssemblyTitle>
Expand All @@ -11,15 +11,15 @@
<Version>3.4.1</Version>
<DefaultLanguage>en-US</DefaultLanguage>
<PlatformTarget>AnyCPU</PlatformTarget>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\build\Auth0OidcClientStrongName.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
Expand All @@ -32,7 +32,7 @@
<Optimize>true</Optimize>
<DocumentationFile>bin\Release\Auth0.OidcClient.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Auth0.OidcClient.Core\Auth0.OidcClient.Core.csproj">
<Project>{1F79DB59-F3A8-45B7-972B-ECD15259D1C9}</Project>
<Name>Auth0.OidcClient.Core</Name>
Expand Down
2 changes: 1 addition & 1 deletion src/Auth0.OidcClient.WPF/Auth0.OidcClient.WPF.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.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>net462;netcoreapp3.1;net6.0-windows</TargetFrameworks>
<TargetFrameworks>net462;netcoreapp3.1;net8.0-windows</TargetFrameworks>
<OutputType>library</OutputType>
<RootNamespace>Auth0.OidcClient</RootNamespace>
<AssemblyName>Auth0.OidcClient</AssemblyName>
Expand Down
2 changes: 1 addition & 1 deletion src/Auth0.OidcClient.WinForms/Auth0.OidcClient.WinForms.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.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>net462;netcoreapp3.1;net6.0-windows</TargetFrameworks>
<TargetFrameworks>net462;netcoreapp3.1;net8.0-windows</TargetFrameworks>
<OutputType>Library</OutputType>
<RootNamespace>Auth0.OidcClient</RootNamespace>
<AssemblyName>Auth0.OidcClient</AssemblyName>
Expand Down
4 changes: 2 additions & 2 deletions src/Auth0.OidcClient.iOS/Auth0.OidcClient.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Xamarin.Legacy.Sdk/0.2.0-alpha4">
<PropertyGroup>
<TargetFrameworks>xamarin.ios10;net6.0-ios</TargetFrameworks>
<TargetFrameworks>xamarin.ios10;net8.0-ios</TargetFrameworks>
<RootNamespace>Auth0.OidcClient</RootNamespace>
<AssemblyName>Auth0.OidcClient</AssemblyName>
<AssemblyTitle>Auth0.OidcClient.iOS</AssemblyTitle>
Expand All @@ -11,7 +11,7 @@
<NeutralLanguage>en</NeutralLanguage>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<DefineConstants>$(DefineConstants);</DefineConstants>
<LangVersion>default</LangVersion>
<LangVersion>default</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
<DebugType>portable</DebugType>
Expand Down
2 changes: 1 addition & 1 deletion test/Android/Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
Loading
Loading