Skip to content

Upgrade to .Net 10 #251

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Upgrade to .Net 10 #251

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
52 changes: 33 additions & 19 deletions BCrypt.Net.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29709.97
# Visual Studio Version 18
VisualStudioVersion = 18.0.11205.157 d18.0
MinimumVisualStudioVersion = 15.0.26228.4
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BCrypt.Net", "src\BCrypt.Net\BCrypt.Net.csproj", "{CD69F016-5940-4FCA-BCA1-9D1D87C6F873}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests", "tests\UnitTests\BCrypt.Net.UnitTests.csproj", "{2078EB7B-7EDF-4B65-80F7-DB4D92E08CCD}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BCrypt.Net.UnitTests", "tests\UnitTests\BCrypt.Net.UnitTests.csproj", "{2078EB7B-7EDF-4B65-80F7-DB4D92E08CCD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build-tools", "build-tools", "{6F3D5F8B-CD73-474C-BA79-D4A17E9F106D}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
Dockerfile = Dockerfile
Directory.Packages.props = Directory.Packages.props
Dockerfile = Dockerfile
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Benchmark", "benchmark\BCryptNet.BenchMarks.csproj", "{E75AA3B8-BF28-4366-B5C6-14AF342290C3}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BCryptNet.BenchMarks", "benchmark\BCryptNet.BenchMarks.csproj", "{E75AA3B8-BF28-4366-B5C6-14AF342290C3}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{DBAB6D93-7DE4-4A70-89E7-1EE784C1A466}"
EndProject
Expand All @@ -26,59 +26,73 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BCrypt.Net.IdentityExtensio
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "github", "github", "{93729F4E-5F15-4769-8385-19176C7AAA2C}"
ProjectSection(SolutionItems) = preProject
.github\dependabot.yml = .github\dependabot.yml
.github\ISSUE_TEMPLATE\bug_report.md = .github\ISSUE_TEMPLATE\bug_report.md
.github\ISSUE_TEMPLATE\docs-issue.md = .github\ISSUE_TEMPLATE\docs-issue.md
.github\ISSUE_TEMPLATE\feature_request.md = .github\ISSUE_TEMPLATE\feature_request.md
.github\stale.yml = .github\stale.yml
.github\workflows\ci-build.yml = .github\workflows\ci-build.yml
.github\workflows\ci-manual-build-test-sign.yml = .github\workflows\ci-manual-build-test-sign.yml
.github\workflows\codeql-analysis.yml = .github\workflows\codeql-analysis.yml
.github\dependabot.yml = .github\dependabot.yml
.github\workflows\dependency-review.yml = .github\workflows\dependency-review.yml
.github\ISSUE_TEMPLATE\docs-issue.md = .github\ISSUE_TEMPLATE\docs-issue.md
.github\ISSUE_TEMPLATE\feature_request.md = .github\ISSUE_TEMPLATE\feature_request.md
.github\workflows\generate-publish-docs.yml = .github\workflows\generate-publish-docs.yml
.github\workflows\markdown-link-check.yml = .github\workflows\markdown-link-check.yml
.github\stale.yml = .github\stale.yml
.github\workflows\upload-coverage-report.yml = .github\workflows\upload-coverage-report.yml
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
CodeQL|Any CPU = CodeQL|Any CPU
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
CodeQL|Any CPU = CodeQL|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{CD69F016-5940-4FCA-BCA1-9D1D87C6F873}.CodeQL|Any CPU.ActiveCfg = CodeQL|Any CPU
{CD69F016-5940-4FCA-BCA1-9D1D87C6F873}.CodeQL|Any CPU.Build.0 = CodeQL|Any CPU
{CD69F016-5940-4FCA-BCA1-9D1D87C6F873}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CD69F016-5940-4FCA-BCA1-9D1D87C6F873}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CD69F016-5940-4FCA-BCA1-9D1D87C6F873}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CD69F016-5940-4FCA-BCA1-9D1D87C6F873}.Release|Any CPU.Build.0 = Release|Any CPU
{CD69F016-5940-4FCA-BCA1-9D1D87C6F873}.CodeQL|Any CPU.ActiveCfg = CodeQL|Any CPU
{CD69F016-5940-4FCA-BCA1-9D1D87C6F873}.CodeQL|Any CPU.Build.0 = CodeQL|Any CPU
{2078EB7B-7EDF-4B65-80F7-DB4D92E08CCD}.CodeQL|Any CPU.ActiveCfg = Debug|Any CPU
{2078EB7B-7EDF-4B65-80F7-DB4D92E08CCD}.CodeQL|Any CPU.Build.0 = Debug|Any CPU
{2078EB7B-7EDF-4B65-80F7-DB4D92E08CCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2078EB7B-7EDF-4B65-80F7-DB4D92E08CCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E75AA3B8-BF28-4366-B5C6-14AF342290C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E75AA3B8-BF28-4366-B5C6-14AF342290C3}.Release|Any CPU.Build.0 = Release|Any CPU
{2078EB7B-7EDF-4B65-80F7-DB4D92E08CCD}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{2078EB7B-7EDF-4B65-80F7-DB4D92E08CCD}.Release|Any CPU.Build.0 = Debug|Any CPU
{E75AA3B8-BF28-4366-B5C6-14AF342290C3}.CodeQL|Any CPU.ActiveCfg = Debug|Any CPU
{E75AA3B8-BF28-4366-B5C6-14AF342290C3}.CodeQL|Any CPU.Build.0 = Debug|Any CPU
{E75AA3B8-BF28-4366-B5C6-14AF342290C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E75AA3B8-BF28-4366-B5C6-14AF342290C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E75AA3B8-BF28-4366-B5C6-14AF342290C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E75AA3B8-BF28-4366-B5C6-14AF342290C3}.Release|Any CPU.Build.0 = Release|Any CPU
{A24DEBF7-6ED9-4774-B67F-7A0EE18125C5}.CodeQL|Any CPU.ActiveCfg = Debug|Any CPU
{A24DEBF7-6ED9-4774-B67F-7A0EE18125C5}.CodeQL|Any CPU.Build.0 = Debug|Any CPU
{A24DEBF7-6ED9-4774-B67F-7A0EE18125C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A24DEBF7-6ED9-4774-B67F-7A0EE18125C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A24DEBF7-6ED9-4774-B67F-7A0EE18125C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A24DEBF7-6ED9-4774-B67F-7A0EE18125C5}.Release|Any CPU.Build.0 = Release|Any CPU
{CE412A71-A08D-4263-8960-664827DA526B}.CodeQL|Any CPU.ActiveCfg = Debug|Any CPU
{CE412A71-A08D-4263-8960-664827DA526B}.CodeQL|Any CPU.Build.0 = Debug|Any CPU
{CE412A71-A08D-4263-8960-664827DA526B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CE412A71-A08D-4263-8960-664827DA526B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CE412A71-A08D-4263-8960-664827DA526B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CE412A71-A08D-4263-8960-664827DA526B}.Release|Any CPU.Build.0 = Release|Any CPU
{70440057-8D4E-41B0-8DF7-8A67B4C0EE28}.CodeQL|Any CPU.ActiveCfg = CodeQL|Any CPU
{70440057-8D4E-41B0-8DF7-8A67B4C0EE28}.CodeQL|Any CPU.Build.0 = CodeQL|Any CPU
{70440057-8D4E-41B0-8DF7-8A67B4C0EE28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{70440057-8D4E-41B0-8DF7-8A67B4C0EE28}.Debug|Any CPU.Build.0 = Debug|Any CPU
{70440057-8D4E-41B0-8DF7-8A67B4C0EE28}.Release|Any CPU.ActiveCfg = Release|Any CPU
{70440057-8D4E-41B0-8DF7-8A67B4C0EE28}.Release|Any CPU.Build.0 = Release|Any CPU
{70440057-8D4E-41B0-8DF7-8A67B4C0EE28}.CodeQL|Any CPU.ActiveCfg = CodeQL|Any CPU
{70440057-8D4E-41B0-8DF7-8A67B4C0EE28}.CodeQL|Any CPU.Build.0 = CodeQL|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {D5ADD1E2-61BB-4575-B5D8-78FB549A4DBC}
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{A24DEBF7-6ED9-4774-B67F-7A0EE18125C5} = {DBAB6D93-7DE4-4A70-89E7-1EE784C1A466}
{CE412A71-A08D-4263-8960-664827DA526B} = {DBAB6D93-7DE4-4A70-89E7-1EE784C1A466}
{93729F4E-5F15-4769-8385-19176C7AAA2C} = {6F3D5F8B-CD73-474C-BA79-D4A17E9F106D}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {D5ADD1E2-61BB-4575-B5D8-78FB549A4DBC}
EndGlobalSection
EndGlobal
5 changes: 5 additions & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@
<PackageVersion Include="System.Text.RegularExpressions" Version="[4.3,)" />
<PackageVersion Include="System.Memory" Version="[4.6,)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<PackageVersion Include="Microsoft.AspNetCore.DataProtection" Version="[10.0,)" />
<PackageVersion Include="Microsoft.Extensions.Identity.Core" Version="[10.0,)" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="[10.0,)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageVersion Include="Microsoft.AspNetCore.DataProtection" Version="[9.0,)" />
<PackageVersion Include="Microsoft.Extensions.Identity.Core" Version="[9.0,)" />
Expand Down
2 changes: 1 addition & 1 deletion benchmark/BCryptNet.BenchMarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<RootNamespace>BCryptNet.BenchMarks</RootNamespace>
<AssemblyName>BCryptNet.BenchMarks</AssemblyName>
<OutputType>Exe</OutputType>
<TargetFrameworks>net48;net9.0</TargetFrameworks>
<TargetFrameworks>net48;net10.0</TargetFrameworks>
<ServerGarbageCollection>true</ServerGarbageCollection>
<Configurations>Release;Debug</Configurations>
<Platforms>AnyCPU</Platforms>
Expand Down
14 changes: 7 additions & 7 deletions examples/Api/WebApi/WebApi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UserSecretsId>aspnet-WebApi-45D99850-F294-4CA1-8E1B-72AFB991E4F2</UserSecretsId>
Expand All @@ -21,11 +21,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="[9.0,)"/>
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="[9.0,)"/>
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="[9.0,)"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="[9.0,)"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="[9.0,)"/>
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="[10.0,)"/>
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="[10.0,)"/>
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="[10.0,)"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="[10.0,)"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="[10.0,)"/>
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion examples/ConsoleApp/ExampleConsoleApp/ExampleConsoleApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<OutputType>Exe</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion src/BCrypt.Net.IdentityExtensions/BCrypt.Net.IdentityExtensions.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">
<PropertyGroup>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<AssemblyTitle>BCrypt.Net-Next - Identity Extensions</AssemblyTitle>
<AssemblyName>BCrypt.Net.IdentityExtensions</AssemblyName>
<RootNamespace>BCryptNet</RootNamespace>
Expand Down
4 changes: 2 additions & 2 deletions src/BCrypt.Net/BCrypt.Net.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0;netstandard2.1;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard2.0;netstandard2.1;net462;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0;netstandard2.1;net8.0;net9.0;net10.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard2.0;netstandard2.1;net462;net8.0;net9.0;net10.0</TargetFrameworks>

<AssemblyTitle>BCrypt.Net-Next</AssemblyTitle>
<AssemblyName>BCrypt.Net-Next</AssemblyName>
Expand Down
2 changes: 1 addition & 1 deletion tests/UnitTests/BCrypt.Net.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<AssemblyName>BCrypt.Net.UnitTests</AssemblyName>
<RootNamespace>BCryptNet.UnitTests</RootNamespace>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Configurations>Debug</Configurations>
<LangVersion>default</LangVersion>

Expand Down