Skip to content

Commit 08a1675

Browse files
kailash-bkailash-b
committed
Upgrade to .NET 8
2 parents 0ab1562 + 8275296 commit 08a1675

File tree

14 files changed

+42
-22
lines changed

14 files changed

+42
-22
lines changed

‎.github/workflows/build.yml

+12-1
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,26 @@ jobs:
2020

2121
- name: Install .NET
2222
uses: actions/setup-dotnet@v3
23+
with:
24+
dotnet-version: '8.0.400'
2325

2426
- name: Install .NET Android and iOS workload
2527
run: dotnet workload install android ios maui
2628

29+
- name: List workloads
30+
run: dotnet workload list
31+
32+
- name: Update workloads
33+
run: dotnet workload update
34+
35+
- name: List workloads after update
36+
run: dotnet workload list
37+
2738
- name: Setup NuGet
2839
uses: nuget/setup-nuget@v1
2940

3041
- name: Restore NuGet
31-
run: nuget restore Auth0.OidcClient.All.sln
42+
run: dotnet restore Auth0.OidcClient.All.sln
3243

3344
- name: Setup MSBuild
3445
uses: microsoft/[email protected]

‎.github/workflows/nuget-release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_call:
55
inputs:
66
dotnet-version:
7-
default: '6.0.x'
7+
default: '8.0.x'
88
type: string
99
project-path:
1010
required: true

‎.github/workflows/rl-secure.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: Setup .NET
4545
uses: actions/setup-dotnet@v3
4646
with:
47-
dotnet-version: 6.0.x
47+
dotnet-version: 8.0.x
4848

4949
- uses: actions/download-artifact@v4
5050
with:

‎Auth0.OidcClient.All.sln

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Auth0.OidcClient.WinForms",
4646
EndProject
4747
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Auth0.OidcClient.WPF", "src\Auth0.OidcClient.WPF\Auth0.OidcClient.WPF.csproj", "{C3030559-6BD9-408C-BB21-6637D9883188}"
4848
EndProject
49-
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}"
49+
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}"
5050
EndProject
51-
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}"
51+
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}"
5252
EndProject
5353
Global
5454
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.404B",
3+
"version": "8.0.400",
44
"rollForward": "latestFeature"
55
}
6-
}
6+
}

‎src/Auth0.OidcClient.MAUI.Platforms.Windows/Auth0.OidcClient.MAUI.Platforms.Windows.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ImplicitUsings>enable</ImplicitUsings>
88

99
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.20348.0</SupportedOSPlatformVersion>
10-
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.20348.0</TargetPlatformMinVersion>
10+
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
1111
</PropertyGroup>
1212

1313
</Project>

‎src/Auth0.OidcClient.MAUI/Auth0.OidcClient.MAUI.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">34.0</SupportedOSPlatformVersion>
1313

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

1717

1818
<RootNamespace>Auth0.OidcClient</RootNamespace>

‎src/Auth0.OidcClient.UWP/Auth0.OidcClient.UWP.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
33
<PropertyGroup>
4-
<TargetFrameworks>uap10.0.20348.0</TargetFrameworks>
4+
<TargetFrameworks>uap10.0.19041.0</TargetFrameworks>
55
<RootNamespace>Auth0.OidcClient</RootNamespace>
66
<AssemblyName>Auth0.OidcClient</AssemblyName>
77
<AssemblyTitle>Auth0.OidcClient.UWP</AssemblyTitle>
@@ -12,8 +12,8 @@
1212
<DefaultLanguage>en-US</DefaultLanguage>
1313
<PlatformTarget>AnyCPU</PlatformTarget>
1414
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
15-
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.20348.0</TargetPlatformVersion>
16-
<TargetPlatformMinVersion>10.0.20348.0</TargetPlatformMinVersion>
15+
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
16+
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
1717
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
1818
<ErrorReport>prompt</ErrorReport>
1919
<WarningLevel>4</WarningLevel>

‎src/Auth0.OidcClient.iOS/Auth0.OidcClient.iOS.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
1313
<DefineConstants>$(DefineConstants);</DefineConstants>
1414
<LangVersion>default</LangVersion>
15-
<UserSecretsId>e271153b-0df2-4197-83a5-30cd3e05c2e3</UserSecretsId>
1615
</PropertyGroup>
1716
<PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
1817
<DebugType>portable</DebugType>

‎test/Auth0.OidcClient.MAUI.Platforms.Windows.UnitTests/Auth0.OidcClient.MAUI.Platforms.Windows.UnitTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<Nullable>enable</Nullable>
77
<IsPackable>false</IsPackable>
88
<IsTestProject>true</IsTestProject>
9+
<WindowsSdkPackageVersion>10.0.20348.38</WindowsSdkPackageVersion>
910
</PropertyGroup>
1011

1112
<ItemGroup>
@@ -29,5 +30,4 @@
2930
<ItemGroup>
3031
<ProjectReference Include="..\..\src\Auth0.OidcClient.MAUI.Platforms.Windows\Auth0.OidcClient.MAUI.Platforms.Windows.csproj" />
3132
</ItemGroup>
32-
3333
</Project>

‎test/UWP/Package.appxmanifest

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
3-
<Identity Name="e2787c3f-97ee-4dbd-b932-f3034873dd17" Publisher="CN=Auth0Test" Version="1.0.0.0" />
3+
<Identity Name="e2787c3f-97ee-4dbd-b932-f3034873dd17" Publisher="CN=Auth0test" Version="1.0.0.0" />
44
<mp:PhoneIdentity PhoneProductId="e2787c3f-97ee-4dbd-b932-f3034873dd17" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
55
<Properties>
66
<DisplayName>UWPTestApp</DisplayName>

‎test/UWP/UWP.csproj

+15-5
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@
1111
<AssemblyName>UWPTestApp</AssemblyName>
1212
<DefaultLanguage>en-US</DefaultLanguage>
1313
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
14-
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.20348.0</TargetPlatformVersion>
15-
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
14+
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
15+
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
1616
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
1717
<FileAlignment>512</FileAlignment>
1818
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
19-
<PackageCertificateKeyFile>UWP_TemporaryKey.pfx</PackageCertificateKeyFile>
20-
<PackageCertificateThumbprint>7A9E1B153ED9BCFE56FC2959315F0D0286C79F6F</PackageCertificateThumbprint>
19+
<PackageCertificateKeyFile>
20+
</PackageCertificateKeyFile>
21+
<PackageCertificateThumbprint>C13F885330EA8E8B6C408C346DBF6762795E3608</PackageCertificateThumbprint>
22+
<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
2123
</PropertyGroup>
2224
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
2325
<DebugSymbols>true</DebugSymbols>
@@ -90,7 +92,7 @@
9092
</PropertyGroup>
9193
<ItemGroup>
9294
<!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
93-
<None Include="project.json" />
95+
<None Include="project.json" />
9496
<None Include="UWP_TemporaryKey.pfx" />
9597
</ItemGroup>
9698
<ItemGroup>
@@ -137,6 +139,14 @@
137139
<Name>Auth0.OidcClient.UWP</Name>
138140
</ProjectReference>
139141
</ItemGroup>
142+
<ItemGroup>
143+
<PackageReference Include="IdentityModel.OidcClient">
144+
<Version>6.0.0</Version>
145+
</PackageReference>
146+
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
147+
<Version>6.2.12</Version>
148+
</PackageReference>
149+
</ItemGroup>
140150
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
141151
<VisualStudioVersion>14.0</VisualStudioVersion>
142152
</PropertyGroup>

‎test/UWP/UWP_TemporaryKey.pfx

38 Bytes
Binary file not shown.

‎test/UWP/project.json.txt renamed to ‎test/UWP/project.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"dependencies": {
3-
"IdentityModel.OidcClient": "5.2.1",
3+
"IdentityModel.OidcClient": "6.0.0",
44
"Microsoft.NETCore.UniversalWindowsPlatform": "6.2.12"
55
},
66
"frameworks": {
7-
"uap10.0.17763": {}
7+
"uap10.0.20348": {}
88
},
99
"runtimes": {
1010
"win10-arm": {},

0 commit comments

Comments
 (0)