Skip to content

Commit

Permalink
Upgrade to .NET 9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
IEvangelist committed Nov 14, 2024
1 parent c616aee commit 315a0c9
Show file tree
Hide file tree
Showing 44 changed files with 55 additions and 551 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
default: 'Manual build'

env:
DOTNET_VERSION: '8.0.x' # set this to the dot net version to use
DOTNET_VERSION: '9.0.x' # set this to the dot net version to use

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ on:
default: 'Manual build'

env:
DOTNET_VERSION: '8.0.x' # set this to the dot net version to use
DOTNET_VERSION: '9.0.x' # set this to the dot net version to use

jobs:
analyze:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- '**.csproj'

env:
DOTNET_VERSION: '8.0.x' # set this to the dot net version to use
DOTNET_VERSION: '9.0.x' # set this to the dot net version to use

jobs:
validate:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
dotnet-version: 9.0.x

- name: Restore dependencies
run: |
Expand Down
7 changes: 2 additions & 5 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFramework>net9.0</TargetFramework>
<LangVersion>preview</LangVersion>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
Expand All @@ -10,10 +10,7 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

<PropertyGroup>
<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
<IsAotCompatible>true</IsAotCompatible>
</PropertyGroup>

</Project>
26 changes: 12 additions & 14 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,26 +1,24 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<RuntimeVersion>8.0.1</RuntimeVersion>
<AspNetCoreVersion>8.0.0</AspNetCoreVersion>
</PropertyGroup>
<ItemGroup>
<!-- Source -->
<PackageVersion Include="Microsoft.Extensions.Http" Version="$(RuntimeVersion)" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.10.0" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(RuntimeVersion)" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageVersion Include="System.Net.Http.Json" Version="$(RuntimeVersion)" />
<PackageVersion Include="System.Net.Http.Json" Version="9.0.0" />
<PackageVersion Include="MinVer" Version="6.0.0" />
<!-- Samples -->
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.10" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.10" />
<PackageVersion Include="Microsoft.Authentication.WebAssembly.Msal" Version="8.0.10" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.10" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.10" />
<PackageVersion Include="Microsoft.Identity.Web" Version="3.2.2" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.9.0" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" />
<PackageVersion Include="Microsoft.Authentication.WebAssembly.Msal" Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.0" />
<PackageVersion Include="Microsoft.Identity.Web" Version="3.3.1" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="7.0.0" />
<!-- Tests -->
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageVersion Include="xunit" Version="2.9.2" />
Expand Down
14 changes: 0 additions & 14 deletions HaveIBeenPwned.sln
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HaveIBeenPwned.MinimalApi",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HaveIBeenPwned.Client.Abstractions", "src\HaveIBeenPwned.Client.Abstractions\HaveIBeenPwned.Client.Abstractions.csproj", "{9C452881-7278-455B-A47F-105FA05DEACE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HaveIBeenPwned.BlazorApp.Client", "samples\HaveIBeenPwned.BlazorApp\Client\HaveIBeenPwned.BlazorApp.Client.csproj", "{545FF986-D9A1-4EAD-8022-F4A7D4AF9938}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HaveIBeenPwned.BlazorApp.Server", "samples\HaveIBeenPwned.BlazorApp\Server\HaveIBeenPwned.BlazorApp.Server.csproj", "{74857A8E-6DA4-43CC-BB55-F019E1AAE397}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HaveIBeenPwned.Client.PollyExtensions", "src\HaveIBeenPwned.Client.PollyExtensions\HaveIBeenPwned.Client.PollyExtensions.csproj", "{13901B13-2A98-4115-AB0A-5C206711EFBC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HaveIBeenPwned.Client.AbstractionsTests", "tests\HaveIBeenPwned.Client.AbstractionsTests\HaveIBeenPwned.Client.AbstractionsTests.csproj", "{7A84DA2F-60D0-4297-9566-E0E08E3F9A93}"
Expand Down Expand Up @@ -72,14 +68,6 @@ Global
{9C452881-7278-455B-A47F-105FA05DEACE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9C452881-7278-455B-A47F-105FA05DEACE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9C452881-7278-455B-A47F-105FA05DEACE}.Release|Any CPU.Build.0 = Release|Any CPU
{545FF986-D9A1-4EAD-8022-F4A7D4AF9938}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{545FF986-D9A1-4EAD-8022-F4A7D4AF9938}.Debug|Any CPU.Build.0 = Debug|Any CPU
{545FF986-D9A1-4EAD-8022-F4A7D4AF9938}.Release|Any CPU.ActiveCfg = Release|Any CPU
{545FF986-D9A1-4EAD-8022-F4A7D4AF9938}.Release|Any CPU.Build.0 = Release|Any CPU
{74857A8E-6DA4-43CC-BB55-F019E1AAE397}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{74857A8E-6DA4-43CC-BB55-F019E1AAE397}.Debug|Any CPU.Build.0 = Debug|Any CPU
{74857A8E-6DA4-43CC-BB55-F019E1AAE397}.Release|Any CPU.ActiveCfg = Release|Any CPU
{74857A8E-6DA4-43CC-BB55-F019E1AAE397}.Release|Any CPU.Build.0 = Release|Any CPU
{13901B13-2A98-4115-AB0A-5C206711EFBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{13901B13-2A98-4115-AB0A-5C206711EFBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{13901B13-2A98-4115-AB0A-5C206711EFBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -106,8 +94,6 @@ Global
{D9FEEEE8-1621-46C0-AE64-6E1BF9DF4C8A} = {3044EDD9-13CF-47A3-8589-A7B84AEFE0C1}
{1CA5C0A6-14DC-4665-8B3F-9245CC485CB6} = {3044EDD9-13CF-47A3-8589-A7B84AEFE0C1}
{9C452881-7278-455B-A47F-105FA05DEACE} = {033A7DA8-9E54-4C45-9674-1FA069A1D587}
{545FF986-D9A1-4EAD-8022-F4A7D4AF9938} = {3044EDD9-13CF-47A3-8589-A7B84AEFE0C1}
{74857A8E-6DA4-43CC-BB55-F019E1AAE397} = {3044EDD9-13CF-47A3-8589-A7B84AEFE0C1}
{13901B13-2A98-4115-AB0A-5C206711EFBC} = {033A7DA8-9E54-4C45-9674-1FA069A1D587}
{7A84DA2F-60D0-4297-9566-E0E08E3F9A93} = {6B93FD23-7EC5-4866-82BC-5C091FA6589B}
{6BFF5F8C-B5C6-4724-BEC8-5CFD16492BE4} = {6B93FD23-7EC5-4866-82BC-5C091FA6589B}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Then you can require any of the available DI-ready types:

### Without dependency injection

If you're not using the DI approach, simply instaniate `PwnedClient` with your API key and use it as you see fit.
If you're not using the DI approach, simply instantiate `PwnedClient` with your API key and use it as you see fit.

```csharp
IPwnedClient client = new PwnedClient("<API Key>");
Expand Down
2 changes: 1 addition & 1 deletion samples/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net9.0</TargetFrameworks>
<LangVersion>preview</LangVersion>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
11 changes: 0 additions & 11 deletions samples/HaveIBeenPwned.BlazorApp/Client/App.razor

This file was deleted.

This file was deleted.

13 changes: 0 additions & 13 deletions samples/HaveIBeenPwned.BlazorApp/Client/Pages/Counter.razor

This file was deleted.

6 changes: 0 additions & 6 deletions samples/HaveIBeenPwned.BlazorApp/Client/Pages/FetchData.razor

This file was deleted.

5 changes: 0 additions & 5 deletions samples/HaveIBeenPwned.BlazorApp/Client/Pages/Index.razor

This file was deleted.

12 changes: 0 additions & 12 deletions samples/HaveIBeenPwned.BlazorApp/Client/Program.cs

This file was deleted.

56 changes: 0 additions & 56 deletions samples/HaveIBeenPwned.BlazorApp/Client/Shared/MainLayout.razor

This file was deleted.

This file was deleted.

10 changes: 0 additions & 10 deletions samples/HaveIBeenPwned.BlazorApp/Client/_Imports.razor

This file was deleted.

Loading

0 comments on commit 315a0c9

Please sign in to comment.