Skip to content
This repository was archived by the owner on Dec 26, 2025. It is now read-only.

Upgrade to .net6 #157

Merged
chrissainty merged 11 commits into from
Dec 7, 2021
Merged

Upgrade to .net6 #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
36bf06a
Upgrade to .net6
linkdotnet Jul 28, 2021
ae24e8c
Adopted github workflows to work with .net6
linkdotnet Aug 8, 2021
837b059
TestExtensions uses .net6 as well
linkdotnet Aug 8, 2021
59e8497
Add LoggingAnalyzer workaround for TestExtensions
linkdotnet Aug 8, 2021
94022de
Use explicit setup
linkdotnet Aug 8, 2021
f1d07b9
Bump test version project to .net6
linkdotnet Aug 8, 2021
531469d
Upgrade to Preview 7
linkdotnet Aug 30, 2021
eaebe08
Merge branch 'main' into main
chrissainty Nov 13, 2021
fddeeeb
Update to .net 6 RTM
linkdotnet Nov 13, 2021
0899346
Update .github/workflows/ci-pr.yml
linkdotnet Nov 13, 2021
fc626fd
Remove Logging Analyzer for smaller than net6.0
linkdotnet Dec 4, 2021
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
2 changes: 1 addition & 1 deletion .github/workflows/ci-main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
types: [ published ]

env:
NETCORE_VERSION: '5.0.400'
NETCORE_VERSION: '6.0.100'
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches: [ main ]

env:
NETCORE_VERSION: '5.0.400'
NETCORE_VERSION: '6.0.100'
PROJECT_NAME: Blazored.LocalStorage

jobs:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ jobs:
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

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

Comment on lines +54 to +57

@chrissainty chrissainty Nov 13, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this need to be here?

@linkdotnet linkdotnet Nov 13, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm good catch.For the Preview version it was needed for sure because the autobuild of codeql does take the latest stable version. I'll check quickly

@linkdotnet linkdotnet Nov 13, 2021 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes it is needed @chrissainty
I removed it from one of my projects just to test see here

Also check the offical tracker: here

Currently they are only supporting .NET 5.
Only workaround is the global.json

Money quote

Running dotnet --info
  .NET SDK (reflecting any global.json):
   Version:   5.0.403
   Commit:    bf9d168ac2
  
  Runtime Environment:
   OS Name:     ubuntu
   OS Version:  20.04
   OS Platform: Linux
   RID:         ubuntu.20.04-x64
   Base Path:   /usr/share/dotnet/sdk/5.0.403/

# 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)
- name: Autobuild
Expand Down
1 change: 1 addition & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<PropertyGroup Label="Package Versions">
<DotNet3Version>3.1.14</DotNet3Version>
<DotNet5Version>5.0.5</DotNet5Version>
<DotNet6Version>6.0.0</DotNet6Version>
</PropertyGroup>

</Project>
4 changes: 2 additions & 2 deletions samples/BlazorServer/BlazorServer.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">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand All @@ -12,4 +12,4 @@
<ProjectReference Include="..\..\src\Blazored.LocalStorage\Blazored.LocalStorage.csproj" />
</ItemGroup>

</Project>
</Project>
4 changes: 2 additions & 2 deletions samples/BlazorWebAssembly/BlazorWebAssembly.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.BlazorWebAssembly">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand All @@ -14,4 +14,4 @@
<ProjectReference Include="..\..\src\Blazored.LocalStorage\Blazored.LocalStorage.csproj" />
</ItemGroup>

</Project>
</Project>
2 changes: 1 addition & 1 deletion samples/bUnitExample/bUnitExample.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.Razor">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
13 changes: 11 additions & 2 deletions src/Blazored.LocalStorage.TestExtensions/Blazored.LocalStorage.TestExtensions.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>netstandard2.1;net5.0</TargetFrameworks>
<TargetFrameworks>netstandard2.1;net5.0;net6.0</TargetFrameworks>

<Authors>Chris Sainty</Authors>
<Company></Company>
Expand Down Expand Up @@ -50,4 +50,13 @@
<None Include="..\Blazored.LocalStorage\Blazored.LocalStorage.snk" Link="Blazored.LocalStorage.snk" />
</ItemGroup>

</Project>
<!-- Microsoft.Extensions.Logging.Abstractions 6.0.0-preview.5.21301.5 introduced the analyzer which is not present
in .net5 or .netcore3.1 therefore we have to remove the analyzer otherwise the build will fail
-->
<Target Name="RemoveLoggingAnalyzer" BeforeTargets="CoreCompile" Condition="'$(TargetFramework)' != 'net6.0'">
<ItemGroup>
<Analyzer Remove="@(Analyzer)" Condition="%(FileName) == 'Microsoft.Extensions.Logging.Generators'" />
</ItemGroup>
</Target>

</Project>
19 changes: 16 additions & 3 deletions src/Blazored.LocalStorage/Blazored.LocalStorage.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.Razor">

<PropertyGroup>
<TargetFrameworks>netstandard2.1;net5.0</TargetFrameworks>
<TargetFrameworks>netstandard2.1;net5.0;net6.0</TargetFrameworks>

<Authors>Chris Sainty</Authors>
<Company></Company>
Expand Down Expand Up @@ -30,7 +30,7 @@
<RazorLangVersion>3.0</RazorLangVersion>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'net6.0'">
<SupportedPlatform Include="browser" />
</ItemGroup>

Expand All @@ -42,6 +42,10 @@
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(DotNet5Version)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(DotNet6Version)" />
</ItemGroup>

<ItemGroup>
<None Include="icon.png" Pack="true" PackagePath="\" />
</ItemGroup>
Expand All @@ -62,4 +66,13 @@
</AssemblyAttribute>
</ItemGroup>

</Project>
<!-- Microsoft.Extensions.Logging.Abstractions 6.0.0-preview.5.21301.5 introduced the analyzer which is not present
in .net5 or .netcore3.1 therefore we have to remove the analyzer otherwise the build will fail
-->
<Target Name="RemoveLoggingAnalyzer" BeforeTargets="CoreCompile" Condition="'$(TargetFramework)' != 'net6.0'">
<ItemGroup>
<Analyzer Remove="@(Analyzer)" Condition="%(FileName) == 'Microsoft.Extensions.Logging.Generators'" />
</ItemGroup>
</Target>

</Project>
2 changes: 1 addition & 1 deletion tests/Blazored.LocalStorage.Tests/Blazored.LocalStorage.Tests.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>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>

<IsPackable>false</IsPackable>

Expand Down