From 36bf06af6fa7277a1bab2c18488432d6bdff215e Mon Sep 17 00:00:00 2001 From: Steven Giesel Date: Wed, 28 Jul 2021 09:55:14 +0200 Subject: [PATCH 01/10] Upgrade to .net6 --- Directory.Build.props | 1 + samples/BlazorServer/BlazorServer.csproj | 4 ++-- .../BlazorWebAssembly.csproj | 4 ++-- samples/bUnitExample/bUnitExample.csproj | 2 +- .../Blazored.LocalStorage.csproj | 19 ++++++++++++++++--- 5 files changed, 22 insertions(+), 8 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 28acef2..8cb23fe 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -4,6 +4,7 @@ 3.1.14 5.0.5 + 6.0.0-preview.6.21355.2 \ No newline at end of file diff --git a/samples/BlazorServer/BlazorServer.csproj b/samples/BlazorServer/BlazorServer.csproj index 3fdf36a..681d263 100644 --- a/samples/BlazorServer/BlazorServer.csproj +++ b/samples/BlazorServer/BlazorServer.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 @@ -12,4 +12,4 @@ - + \ No newline at end of file diff --git a/samples/BlazorWebAssembly/BlazorWebAssembly.csproj b/samples/BlazorWebAssembly/BlazorWebAssembly.csproj index 2526a94..85b7b01 100644 --- a/samples/BlazorWebAssembly/BlazorWebAssembly.csproj +++ b/samples/BlazorWebAssembly/BlazorWebAssembly.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 @@ -14,4 +14,4 @@ - + \ No newline at end of file diff --git a/samples/bUnitExample/bUnitExample.csproj b/samples/bUnitExample/bUnitExample.csproj index daeedab..b6f496a 100644 --- a/samples/bUnitExample/bUnitExample.csproj +++ b/samples/bUnitExample/bUnitExample.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 diff --git a/src/Blazored.LocalStorage/Blazored.LocalStorage.csproj b/src/Blazored.LocalStorage/Blazored.LocalStorage.csproj index 3605791..4e3c2e5 100644 --- a/src/Blazored.LocalStorage/Blazored.LocalStorage.csproj +++ b/src/Blazored.LocalStorage/Blazored.LocalStorage.csproj @@ -1,7 +1,7 @@  - netstandard2.1;net5.0 + netstandard2.1;net5.0;net6.0 Chris Sainty @@ -30,7 +30,7 @@ 3.0 - + @@ -42,6 +42,10 @@ + + + + @@ -62,4 +66,13 @@ - + + + + + + + + \ No newline at end of file From ae24e8cc12a1ed9afddf512664e79cf7bb13c00f Mon Sep 17 00:00:00 2001 From: Steven Giesel Date: Sun, 8 Aug 2021 10:17:58 +0200 Subject: [PATCH 02/10] Adopted github workflows to work with .net6 --- .github/workflows/ci-main.yml | 2 +- .github/workflows/ci-pr.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml index a178056..41c4aac 100644 --- a/.github/workflows/ci-main.yml +++ b/.github/workflows/ci-main.yml @@ -7,7 +7,7 @@ on: types: [ published ] env: - NETCORE_VERSION: '5.0.400' + NETCORE_VERSION: '6.0.100-preview.6.21355.2' DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true DOTNET_CLI_TELEMETRY_OPTOUT: true PROJECT_NAME: LocalStorage diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index 7777d9f..67c7cd3 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -5,7 +5,7 @@ on: branches: [ main ] env: - NETCORE_VERSION: '5.0.400' + NETCORE_VERSION: '6.0.100-preview.6.21355.2' PROJECT_NAME: Blazored.LocalStorage jobs: From 837b059953ab86afb45b4db63f5c45ccb4f9b828 Mon Sep 17 00:00:00 2001 From: Steven Giesel Date: Sun, 8 Aug 2021 10:23:26 +0200 Subject: [PATCH 03/10] TestExtensions uses .net6 as well --- .../Blazored.LocalStorage.TestExtensions.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Blazored.LocalStorage.TestExtensions/Blazored.LocalStorage.TestExtensions.csproj b/src/Blazored.LocalStorage.TestExtensions/Blazored.LocalStorage.TestExtensions.csproj index 24fdd2e..65ae496 100644 --- a/src/Blazored.LocalStorage.TestExtensions/Blazored.LocalStorage.TestExtensions.csproj +++ b/src/Blazored.LocalStorage.TestExtensions/Blazored.LocalStorage.TestExtensions.csproj @@ -1,7 +1,7 @@  - netstandard2.1;net5.0 + netstandard2.1;net5.0;net6.0 Chris Sainty From 59e84976c5ca44ee24d783b65dd65be77beb0fe3 Mon Sep 17 00:00:00 2001 From: Steven Giesel Date: Sun, 8 Aug 2021 10:28:48 +0200 Subject: [PATCH 04/10] Add LoggingAnalyzer workaround for TestExtensions --- .../Blazored.LocalStorage.TestExtensions.csproj | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/Blazored.LocalStorage.TestExtensions/Blazored.LocalStorage.TestExtensions.csproj b/src/Blazored.LocalStorage.TestExtensions/Blazored.LocalStorage.TestExtensions.csproj index 65ae496..d5a5a6e 100644 --- a/src/Blazored.LocalStorage.TestExtensions/Blazored.LocalStorage.TestExtensions.csproj +++ b/src/Blazored.LocalStorage.TestExtensions/Blazored.LocalStorage.TestExtensions.csproj @@ -50,4 +50,13 @@ + + + + + + + From 94022defc95e9779519c3d13c2bcc73bf3fa5c94 Mon Sep 17 00:00:00 2001 From: Steven Giesel Date: Sun, 8 Aug 2021 10:37:10 +0200 Subject: [PATCH 05/10] Use explicit setup --- .github/workflows/codeql-analysis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 67341dd..9eec19a 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -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-preview.6.21355.2' + # 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 From f1d07b96e9a1334fa3b5561a8878fd94c0c8df3a Mon Sep 17 00:00:00 2001 From: Steven Giesel Date: Sun, 8 Aug 2021 10:47:08 +0200 Subject: [PATCH 06/10] Bump test version project to .net6 --- .../Blazored.LocalStorage.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Blazored.LocalStorage.Tests/Blazored.LocalStorage.Tests.csproj b/tests/Blazored.LocalStorage.Tests/Blazored.LocalStorage.Tests.csproj index b8fb493..39b0049 100644 --- a/tests/Blazored.LocalStorage.Tests/Blazored.LocalStorage.Tests.csproj +++ b/tests/Blazored.LocalStorage.Tests/Blazored.LocalStorage.Tests.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 false From 531469dd34cd610244723ca88539aee2ce9080f9 Mon Sep 17 00:00:00 2001 From: Steven Giesel Date: Mon, 30 Aug 2021 08:47:08 +0200 Subject: [PATCH 07/10] Upgrade to Preview 7 --- .github/workflows/ci-main.yml | 2 +- .github/workflows/ci-pr.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml index 41c4aac..9faa560 100644 --- a/.github/workflows/ci-main.yml +++ b/.github/workflows/ci-main.yml @@ -7,7 +7,7 @@ on: types: [ published ] env: - NETCORE_VERSION: '6.0.100-preview.6.21355.2' + NETCORE_VERSION: '6.0.100-preview.7.21379.14' DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true DOTNET_CLI_TELEMETRY_OPTOUT: true PROJECT_NAME: LocalStorage diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index 67c7cd3..cc82b2c 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -5,7 +5,7 @@ on: branches: [ main ] env: - NETCORE_VERSION: '6.0.100-preview.6.21355.2' + NETCORE_VERSION: '6.0.100-preview.7.21379.14' PROJECT_NAME: Blazored.LocalStorage jobs: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 9eec19a..9276489 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -53,7 +53,7 @@ jobs: - uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0.100-preview.6.21355.2' + dotnet-version: '6.0.100-preview.7.21379.14' # 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) From fddeeebf6742436d0d7bfc9fde29ae821733daa4 Mon Sep 17 00:00:00 2001 From: Steven Giesel Date: Sat, 13 Nov 2021 16:31:19 +0100 Subject: [PATCH 08/10] Update to .net 6 RTM --- .github/workflows/ci-main.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- Directory.Build.props | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml index 9faa560..c410e1c 100644 --- a/.github/workflows/ci-main.yml +++ b/.github/workflows/ci-main.yml @@ -7,7 +7,7 @@ on: types: [ published ] env: - NETCORE_VERSION: '6.0.100-preview.7.21379.14' + NETCORE_VERSION: '6.0.100' DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true DOTNET_CLI_TELEMETRY_OPTOUT: true PROJECT_NAME: LocalStorage diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 9276489..5c22328 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -53,7 +53,7 @@ jobs: - uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0.100-preview.7.21379.14' + dotnet-version: '6.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) diff --git a/Directory.Build.props b/Directory.Build.props index 8cb23fe..8f64684 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -4,7 +4,7 @@ 3.1.14 5.0.5 - 6.0.0-preview.6.21355.2 + 6.0.0 \ No newline at end of file From 089934699ed70d0866e79bbb2df46835b043584f Mon Sep 17 00:00:00 2001 From: Steven Giesel Date: Sat, 13 Nov 2021 17:31:45 +0100 Subject: [PATCH 09/10] Update .github/workflows/ci-pr.yml Co-authored-by: Chris Sainty --- .github/workflows/ci-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index cc82b2c..8fbd145 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -5,7 +5,7 @@ on: branches: [ main ] env: - NETCORE_VERSION: '6.0.100-preview.7.21379.14' + NETCORE_VERSION: '6.0.100' PROJECT_NAME: Blazored.LocalStorage jobs: From fc626fd4de0e322a5515366f7194a40bbb076317 Mon Sep 17 00:00:00 2001 From: Steven Giesel Date: Sat, 4 Dec 2021 11:11:05 +0100 Subject: [PATCH 10/10] Remove Logging Analyzer for smaller than net6.0 --- .../Blazored.LocalStorage.TestExtensions.csproj | 4 ++-- src/Blazored.LocalStorage/Blazored.LocalStorage.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Blazored.LocalStorage.TestExtensions/Blazored.LocalStorage.TestExtensions.csproj b/src/Blazored.LocalStorage.TestExtensions/Blazored.LocalStorage.TestExtensions.csproj index d5a5a6e..2625cd7 100644 --- a/src/Blazored.LocalStorage.TestExtensions/Blazored.LocalStorage.TestExtensions.csproj +++ b/src/Blazored.LocalStorage.TestExtensions/Blazored.LocalStorage.TestExtensions.csproj @@ -53,10 +53,10 @@ - + - + \ No newline at end of file diff --git a/src/Blazored.LocalStorage/Blazored.LocalStorage.csproj b/src/Blazored.LocalStorage/Blazored.LocalStorage.csproj index 4e3c2e5..eb9ec4c 100644 --- a/src/Blazored.LocalStorage/Blazored.LocalStorage.csproj +++ b/src/Blazored.LocalStorage/Blazored.LocalStorage.csproj @@ -69,7 +69,7 @@ - +