From 333aac2d4cea98ed5d98a1c9d8be4869a6b430f5 Mon Sep 17 00:00:00 2001 From: GGG Date: Sat, 1 Apr 2023 00:44:53 +0000 Subject: [PATCH 1/4] Remove .NET Core 3.1. .NET Core 3.1 is now EOL. --- build/LibraryProject.props | 2 +- docs/docfx.json | 2 +- .../Test/Utilities/Loretta.CodeAnalysis.Test.Utilities.csproj | 2 +- .../Lua/Test/Portable/Loretta.CodeAnalysis.Lua.UnitTests.csproj | 2 +- .../Utilities/Loretta.CodeAnalysis.Lua.Test.Utilities.csproj | 2 +- src/InternalBenchmarks/Loretta.InternalBenchmarks.csproj | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/LibraryProject.props b/build/LibraryProject.props index 93cfd429..d391d005 100644 --- a/build/LibraryProject.props +++ b/build/LibraryProject.props @@ -3,7 +3,7 @@ - net6.0;netcoreapp3.1;netstandard2.0 + net6.0;netstandard2.0 net6.0 Library en-US diff --git a/docs/docfx.json b/docs/docfx.json index d5100d33..c9609d56 100644 --- a/docs/docfx.json +++ b/docs/docfx.json @@ -25,7 +25,7 @@ "globalNamespaceId": "Loretta.CodeAnalysis", "filter": "unwanted-filter.yml", "properties": { - "TargetFramework": "netcoreapp3.1", + "TargetFramework": "net6.0", "DocGen": "true" }, "disableGitFeatures": false, diff --git a/src/Compilers/Core/Test/Utilities/Loretta.CodeAnalysis.Test.Utilities.csproj b/src/Compilers/Core/Test/Utilities/Loretta.CodeAnalysis.Test.Utilities.csproj index 200a827b..b697d198 100644 --- a/src/Compilers/Core/Test/Utilities/Loretta.CodeAnalysis.Test.Utilities.csproj +++ b/src/Compilers/Core/Test/Utilities/Loretta.CodeAnalysis.Test.Utilities.csproj @@ -6,7 +6,7 @@ Library - net6.0;netcoreapp3.1;netstandard2.0;net472 + net6.0;netstandard2.0;net472 net6.0 true diff --git a/src/Compilers/Lua/Test/Portable/Loretta.CodeAnalysis.Lua.UnitTests.csproj b/src/Compilers/Lua/Test/Portable/Loretta.CodeAnalysis.Lua.UnitTests.csproj index 25b07176..b22a34f4 100644 --- a/src/Compilers/Lua/Test/Portable/Loretta.CodeAnalysis.Lua.UnitTests.csproj +++ b/src/Compilers/Lua/Test/Portable/Loretta.CodeAnalysis.Lua.UnitTests.csproj @@ -7,7 +7,7 @@ - net6.0;netcoreapp3.1;$(TargetFrameworks) + net6.0;$(TargetFrameworks) net6.0 diff --git a/src/Compilers/Lua/Test/Utilities/Loretta.CodeAnalysis.Lua.Test.Utilities.csproj b/src/Compilers/Lua/Test/Utilities/Loretta.CodeAnalysis.Lua.Test.Utilities.csproj index 5660a34f..502ed18b 100644 --- a/src/Compilers/Lua/Test/Utilities/Loretta.CodeAnalysis.Lua.Test.Utilities.csproj +++ b/src/Compilers/Lua/Test/Utilities/Loretta.CodeAnalysis.Lua.Test.Utilities.csproj @@ -4,7 +4,7 @@ Library - net6.0;netcoreapp3.1;netstandard2.0;net472 + net6.0;netstandard2.0;net472 net6.0 diff --git a/src/InternalBenchmarks/Loretta.InternalBenchmarks.csproj b/src/InternalBenchmarks/Loretta.InternalBenchmarks.csproj index 52c4158f..66158d87 100644 --- a/src/InternalBenchmarks/Loretta.InternalBenchmarks.csproj +++ b/src/InternalBenchmarks/Loretta.InternalBenchmarks.csproj @@ -4,7 +4,7 @@ Exe - net7.0;net6.0;netcoreapp3.1 + net7.0;net6.0 latest false false From 70e840f7a5ae8ebee61d3fd64197350d62f06c8f Mon Sep 17 00:00:00 2001 From: GGG Date: Sat, 1 Apr 2023 00:54:51 +0000 Subject: [PATCH 2/4] Package cleanup and upgrades. Since we no longer have .NET Core 3.1, we can leave some of the packages only on .NET Standard. --- build/LibraryProject.props | 2 +- .../Core/Portable/Loretta.CodeAnalysis.csproj | 12 ++++++++---- .../Lua/Portable/Loretta.CodeAnalysis.Lua.csproj | 6 +++++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/build/LibraryProject.props b/build/LibraryProject.props index d391d005..13333d89 100644 --- a/build/LibraryProject.props +++ b/build/LibraryProject.props @@ -49,7 +49,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Compilers/Core/Portable/Loretta.CodeAnalysis.csproj b/src/Compilers/Core/Portable/Loretta.CodeAnalysis.csproj index 4f19a28c..a61b35d1 100644 --- a/src/Compilers/Core/Portable/Loretta.CodeAnalysis.csproj +++ b/src/Compilers/Core/Portable/Loretta.CodeAnalysis.csproj @@ -18,17 +18,21 @@ true - + + - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/src/Compilers/Lua/Portable/Loretta.CodeAnalysis.Lua.csproj b/src/Compilers/Lua/Portable/Loretta.CodeAnalysis.Lua.csproj index bd6d1528..f1272ffa 100644 --- a/src/Compilers/Lua/Portable/Loretta.CodeAnalysis.Lua.csproj +++ b/src/Compilers/Lua/Portable/Loretta.CodeAnalysis.Lua.csproj @@ -23,8 +23,12 @@ - + + + + + From 74fc64f053512833f51503cf4b573ce74b127789 Mon Sep 17 00:00:00 2001 From: GGG Date: Sat, 1 Apr 2023 01:00:06 +0000 Subject: [PATCH 3/4] Remove .NET Core 3.1 from GHA workflows. --- .github/workflows/build-and-test.yml | 9 +-------- .github/workflows/build-docs.yml | 6 +----- .github/workflows/nigthly-publish.yml | 6 +----- .github/workflows/stable-publish.yml | 6 +----- 4 files changed, 4 insertions(+), 23 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 95cd32be..3aa78b1d 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -22,24 +22,17 @@ jobs: matrix: include: - os: ubuntu-latest - installDir: /usr/share/dotnet - os: windows-latest - installDir: C:\Program Files\dotnet - os: macos-latest - installDir: /Users/runner/.dotnet steps: - name: Checkout uses: actions/checkout@v3 - name: Setup .NET - uses: actions/setup-dotnet@v2 + uses: actions/setup-dotnet@v3 with: dotnet-version: | - 3.1.x 6.0.x 7.0.x - include-prerelease: True - env: - DOTNET_INSTALL_DIR: ${{ matrix.installDir }} - name: Install dependencies run: dotnet restore - name: Build diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index f26023dc..bf3c43eb 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -22,15 +22,11 @@ jobs: submodules: recursive - name: Setup .NET - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v3 with: dotnet-version: | - 3.1.x 6.0.x 7.0.x - include-prerelease: True - env: - DOTNET_INSTALL_DIR: C:\Program Files\dotnet - name: Setup DocFX uses: crazy-max/ghaction-chocolatey@v1 diff --git a/.github/workflows/nigthly-publish.yml b/.github/workflows/nigthly-publish.yml index 27c2d307..bcf7b753 100644 --- a/.github/workflows/nigthly-publish.yml +++ b/.github/workflows/nigthly-publish.yml @@ -54,15 +54,11 @@ jobs: uses: actions/checkout@v3 - name: Setup .NET - uses: actions/setup-dotnet@v2 + uses: actions/setup-dotnet@v3 with: dotnet-version: | - 3.1.x 6.0.x 7.0.x - include-prerelease: True - env: - DOTNET_INSTALL_DIR: C:\Program Files\dotnet - name: Install dependencies run: dotnet restore diff --git a/.github/workflows/stable-publish.yml b/.github/workflows/stable-publish.yml index 1b4bfa0d..7a79b0a0 100644 --- a/.github/workflows/stable-publish.yml +++ b/.github/workflows/stable-publish.yml @@ -19,15 +19,11 @@ jobs: uses: actions/checkout@v3 - name: Setup .NET - uses: actions/setup-dotnet@v2 + uses: actions/setup-dotnet@v3 with: dotnet-version: | - 3.1.x 6.0.x 7.0.x - include-prerelease: True - env: - DOTNET_INSTALL_DIR: C:\Program Files\dotnet - name: Install dependencies run: dotnet restore From 5c19e3e265064727ae5958d65b86d6e6a035dbd0 Mon Sep 17 00:00:00 2001 From: GGG Date: Sat, 1 Apr 2023 01:03:57 +0000 Subject: [PATCH 4/4] Document .NET Core 3.1 removal. --- CHANGES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 16d6369a..87b2b0f9 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fixed `ContainedScopes` not being populated. - Fixed NormalizeWhitespace not inserting spaces between expression list arguments. +### Removed +- .NET Core 3.1 support has been removed as .NET Core 3.1 has officially hit EOL. + ## v0.2.10 ### Added - Added the following new `SyntaxFactory` overloads to partially restore compatibility with pre-typed-lua era: