Skip to content

Commit

Permalink
Added .NET 8 target (#238)
Browse files Browse the repository at this point in the history
* Updated projects to target net8

* Added new interactive server project and updated CI bits

* Added nullable reference types
  • Loading branch information
chrissainty committed Feb 10, 2024
1 parent e038a08 commit 1b1d9eb
Show file tree
Hide file tree
Showing 67 changed files with 519 additions and 1,283 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:
types: [ published ]

env:
NETCORE_VERSION: '7.0.x'
OUTPUT_DIR: 'net7.0'
NETCORE_VERSION: '8.0.x'
OUTPUT_DIR: 'net8.0'
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
DOTNET_CLI_TELEMETRY_OPTOUT: true
PROJECT_NAME: LocalStorage
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches: [ main ]

env:
NETCORE_VERSION: '7.0.100'
NETCORE_VERSION: '8.0.100'
PROJECT_NAME: Blazored.LocalStorage

jobs:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -53,7 +53,7 @@ jobs:

- uses: actions/setup-dotnet@v1
with:
dotnet-version: '7.0.100'
dotnet-version: '8.0.100'

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
Expand All @@ -72,4 +72,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
31 changes: 16 additions & 15 deletions Blazored.LocalStorage.sln
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{F20B
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorWebAssembly", "samples\BlazorWebAssembly\BlazorWebAssembly.csproj", "{D6953CE0-6AD5-434C-99AA-7FF1E26724D4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorServer", "samples\BlazorServer\BlazorServer.csproj", "{767D657A-5410-4714-9477-99929D3FF709}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9170D7A9-70CE-48E3-88A3-F11D2983103E}"
ProjectSection(SolutionItems) = preProject
.github\workflows\ci-main.yml = .github\workflows\ci-main.yml
.github\workflows\ci-pr.yml = .github\workflows\ci-pr.yml
README.md = README.md
.github\workflows\release-drafter.yml = .github\workflows\release-drafter.yml
Directory.Build.props = Directory.Build.props
.github\workflows\codeql-analysis.yml = .github\workflows\codeql-analysis.yml
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{B82A5126-EE01-4B4D-B642-F954B6E4E695}"
Expand All @@ -28,6 +27,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bUnitExample", "samples\bUn
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blazored.LocalStorage.TestExtensions", "src\Blazored.LocalStorage.TestExtensions\Blazored.LocalStorage.TestExtensions.csproj", "{650F351B-06A0-4D65-8A55-C9FF8D5BC177}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InteractiveServer", "samples\InteractiveServer\InteractiveServer.csproj", "{8AC00DB6-28AF-4EA5-BB4E-9A393F574575}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -62,18 +63,6 @@ Global
{D6953CE0-6AD5-434C-99AA-7FF1E26724D4}.Release|x64.Build.0 = Release|Any CPU
{D6953CE0-6AD5-434C-99AA-7FF1E26724D4}.Release|x86.ActiveCfg = Release|Any CPU
{D6953CE0-6AD5-434C-99AA-7FF1E26724D4}.Release|x86.Build.0 = Release|Any CPU
{767D657A-5410-4714-9477-99929D3FF709}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{767D657A-5410-4714-9477-99929D3FF709}.Debug|Any CPU.Build.0 = Debug|Any CPU
{767D657A-5410-4714-9477-99929D3FF709}.Debug|x64.ActiveCfg = Debug|Any CPU
{767D657A-5410-4714-9477-99929D3FF709}.Debug|x64.Build.0 = Debug|Any CPU
{767D657A-5410-4714-9477-99929D3FF709}.Debug|x86.ActiveCfg = Debug|Any CPU
{767D657A-5410-4714-9477-99929D3FF709}.Debug|x86.Build.0 = Debug|Any CPU
{767D657A-5410-4714-9477-99929D3FF709}.Release|Any CPU.ActiveCfg = Release|Any CPU
{767D657A-5410-4714-9477-99929D3FF709}.Release|Any CPU.Build.0 = Release|Any CPU
{767D657A-5410-4714-9477-99929D3FF709}.Release|x64.ActiveCfg = Release|Any CPU
{767D657A-5410-4714-9477-99929D3FF709}.Release|x64.Build.0 = Release|Any CPU
{767D657A-5410-4714-9477-99929D3FF709}.Release|x86.ActiveCfg = Release|Any CPU
{767D657A-5410-4714-9477-99929D3FF709}.Release|x86.Build.0 = Release|Any CPU
{5A6A013E-325D-4A5F-B2FA-659B4FD2BDBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5A6A013E-325D-4A5F-B2FA-659B4FD2BDBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5A6A013E-325D-4A5F-B2FA-659B4FD2BDBC}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -110,15 +99,27 @@ Global
{650F351B-06A0-4D65-8A55-C9FF8D5BC177}.Release|x64.Build.0 = Release|Any CPU
{650F351B-06A0-4D65-8A55-C9FF8D5BC177}.Release|x86.ActiveCfg = Release|Any CPU
{650F351B-06A0-4D65-8A55-C9FF8D5BC177}.Release|x86.Build.0 = Release|Any CPU
{8AC00DB6-28AF-4EA5-BB4E-9A393F574575}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8AC00DB6-28AF-4EA5-BB4E-9A393F574575}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8AC00DB6-28AF-4EA5-BB4E-9A393F574575}.Debug|x64.ActiveCfg = Debug|Any CPU
{8AC00DB6-28AF-4EA5-BB4E-9A393F574575}.Debug|x64.Build.0 = Debug|Any CPU
{8AC00DB6-28AF-4EA5-BB4E-9A393F574575}.Debug|x86.ActiveCfg = Debug|Any CPU
{8AC00DB6-28AF-4EA5-BB4E-9A393F574575}.Debug|x86.Build.0 = Debug|Any CPU
{8AC00DB6-28AF-4EA5-BB4E-9A393F574575}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8AC00DB6-28AF-4EA5-BB4E-9A393F574575}.Release|Any CPU.Build.0 = Release|Any CPU
{8AC00DB6-28AF-4EA5-BB4E-9A393F574575}.Release|x64.ActiveCfg = Release|Any CPU
{8AC00DB6-28AF-4EA5-BB4E-9A393F574575}.Release|x64.Build.0 = Release|Any CPU
{8AC00DB6-28AF-4EA5-BB4E-9A393F574575}.Release|x86.ActiveCfg = Release|Any CPU
{8AC00DB6-28AF-4EA5-BB4E-9A393F574575}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{D6953CE0-6AD5-434C-99AA-7FF1E26724D4} = {F20B2AAB-FB71-4A1C-82FE-F1750B922BF6}
{767D657A-5410-4714-9477-99929D3FF709} = {F20B2AAB-FB71-4A1C-82FE-F1750B922BF6}
{5A6A013E-325D-4A5F-B2FA-659B4FD2BDBC} = {B82A5126-EE01-4B4D-B642-F954B6E4E695}
{10F6FB83-3135-4B73-B0EB-D008A31AE8FA} = {F20B2AAB-FB71-4A1C-82FE-F1750B922BF6}
{8AC00DB6-28AF-4EA5-BB4E-9A393F574575} = {F20B2AAB-FB71-4A1C-82FE-F1750B922BF6}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {2B91883F-A85A-49EB-A9C1-ABD567A9375E}
Expand Down
1 change: 1 addition & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<PropertyGroup Label="Package Versions">
<DotNet6Version>6.0.0</DotNet6Version>
<DotNet7Version>7.0.0</DotNet7Version>
<DotNet8Version>8.0.0</DotNet8Version>
</PropertyGroup>

</Project>
12 changes: 0 additions & 12 deletions samples/BlazorServer/App.razor

This file was deleted.

17 changes: 0 additions & 17 deletions samples/BlazorServer/BlazorServer.csproj

This file was deleted.

42 changes: 0 additions & 42 deletions samples/BlazorServer/Pages/Error.cshtml

This file was deleted.

32 changes: 0 additions & 32 deletions samples/BlazorServer/Pages/Error.cshtml.cs

This file was deleted.

9 changes: 0 additions & 9 deletions samples/BlazorServer/Pages/_Host.cshtml

This file was deleted.

32 changes: 0 additions & 32 deletions samples/BlazorServer/Pages/_Layout.cshtml

This file was deleted.

17 changes: 0 additions & 17 deletions samples/BlazorServer/Shared/MainLayout.razor

This file was deleted.

27 changes: 0 additions & 27 deletions samples/BlazorServer/Shared/NavMenu.razor

This file was deleted.

62 changes: 0 additions & 62 deletions samples/BlazorServer/Shared/NavMenu.razor.css

This file was deleted.

9 changes: 0 additions & 9 deletions samples/BlazorServer/appsettings.Development.json

This file was deleted.

Loading

0 comments on commit 1b1d9eb

Please sign in to comment.