diff --git a/.github/Github.csproj b/.github/Github.csproj index 88122bf31..1aefdbaef 100644 --- a/.github/Github.csproj +++ b/.github/Github.csproj @@ -1,5 +1,2 @@ - - net6.0 - diff --git a/.github/workflows/format_repositories.yml b/.github/workflows/format_repositories.yml index f1fe2d81a..627480639 100644 --- a/.github/workflows/format_repositories.yml +++ b/.github/workflows/format_repositories.yml @@ -14,10 +14,10 @@ jobs: path: csharpier - uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0.300' + dotnet-version: '7.0.100' - uses: actions/checkout@v2 with: repository: belav/csharpier-repos path: csharpier-repos - run: dotnet build csharpier/Src/CSharpier.Cli/CSharpier.Cli.csproj -c release - - run: dotnet csharpier/Src/CSharpier.Cli/bin/release/net6.0/dotnet-csharpier.dll csharpier-repos --skip-write + - run: dotnet csharpier/Src/CSharpier.Cli/bin/release/net7.0/dotnet-csharpier.dll csharpier-repos --skip-write diff --git a/.github/workflows/publish_nuget.yml b/.github/workflows/publish_nuget.yml index c9d208f88..ac858773e 100644 --- a/.github/workflows/publish_nuget.yml +++ b/.github/workflows/publish_nuget.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0.300' + dotnet-version: '7.0.100' - run: dotnet test Src/CSharpier.Tests/CSharpier.Tests.csproj publish-nuget: runs-on: ubuntu-latest @@ -23,7 +23,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0.300' + dotnet-version: '7.0.100' - name: Publish CSharpier.Core library on version change uses: alirezanet/publish-nuget@v3.0.4 with: diff --git a/.github/workflows/validate_pull_request.yml b/.github/workflows/validate_pull_request.yml index 0f0b9b142..b8c87850d 100644 --- a/.github/workflows/validate_pull_request.yml +++ b/.github/workflows/validate_pull_request.yml @@ -10,7 +10,9 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0.300' + dotnet-version: | + 7.0.100 + 6.0.300 - run: | dotnet build CSharpier.sln -c release dotnet test CSharpier.sln -c release @@ -21,7 +23,9 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0.300' + dotnet-version: | + 7.0.100 + 6.0.300 - run: | dotnet tool restore dotnet csharpier . --check @@ -32,6 +36,8 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0.300' + dotnet-version: | + 7.0.100 + 6.0.300 - run: | dotnet build Src/CSharpier.MsBuild/CSharpier.MsBuild.csproj diff --git a/CSharpier.Build.props b/CSharpier.Build.props index 8ca7e8ac8..ee11499c2 100644 --- a/CSharpier.Build.props +++ b/CSharpier.Build.props @@ -4,18 +4,7 @@ MIT https://github.com/belav/csharpier git - 10 - enable CSharpier is an opinionated code formatter for c#. logo.png - - CS8032 - - NU5104 - - - true - - \ No newline at end of file + diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 000000000..81415fd84 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,17 @@ + + + net7.0 + 10 + enable + enable + + CS8032 + + NU5104 + + + + true + + diff --git a/Dockerfile b/Dockerfile index 232208584..403f877b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/sdk:6.0.300 AS build +FROM mcr.microsoft.com/dotnet/sdk:7.0.100 AS build RUN apt-get update && \ apt-get install curl gnupg -yq && \ diff --git a/Docs/Docs.csproj b/Docs/Docs.csproj index ce77a8367..ce4f3edb4 100644 --- a/Docs/Docs.csproj +++ b/Docs/Docs.csproj @@ -1,7 +1,4 @@ - - net6.0 - CHANGELOG.md diff --git a/Scripts/Scripts.csproj b/Scripts/Scripts.csproj index 88122bf31..1aefdbaef 100644 --- a/Scripts/Scripts.csproj +++ b/Scripts/Scripts.csproj @@ -1,5 +1,2 @@ - - net6.0 - diff --git a/Src/CSharpier.Benchmarks/CSharpier.Benchmarks.csproj b/Src/CSharpier.Benchmarks/CSharpier.Benchmarks.csproj index ecc918864..eda5fa7ae 100644 --- a/Src/CSharpier.Benchmarks/CSharpier.Benchmarks.csproj +++ b/Src/CSharpier.Benchmarks/CSharpier.Benchmarks.csproj @@ -2,7 +2,6 @@ Exe - net6.0 diff --git a/Src/CSharpier.Cli.Tests/CSharpier.Cli.Tests.csproj b/Src/CSharpier.Cli.Tests/CSharpier.Cli.Tests.csproj index d66ada3f4..dede720df 100644 --- a/Src/CSharpier.Cli.Tests/CSharpier.Cli.Tests.csproj +++ b/Src/CSharpier.Cli.Tests/CSharpier.Cli.Tests.csproj @@ -1,9 +1,6 @@ - net6.0 - enable - false diff --git a/Src/CSharpier.Cli/CSharpier.Cli.csproj b/Src/CSharpier.Cli/CSharpier.Cli.csproj index 59c6677e8..ba7965dc2 100644 --- a/Src/CSharpier.Cli/CSharpier.Cli.csproj +++ b/Src/CSharpier.Cli/CSharpier.Cli.csproj @@ -4,9 +4,8 @@ Exe CSharpier dotnet-csharpier - net6.0 + net6.0;net7.0 true - enable diff --git a/Src/CSharpier.FakeGenerators/CSharpier.FakeGenerators.csproj b/Src/CSharpier.FakeGenerators/CSharpier.FakeGenerators.csproj index a4df7a2aa..0da542e55 100644 --- a/Src/CSharpier.FakeGenerators/CSharpier.FakeGenerators.csproj +++ b/Src/CSharpier.FakeGenerators/CSharpier.FakeGenerators.csproj @@ -2,9 +2,6 @@ Exe - net6.0 - enable - enable diff --git a/Src/CSharpier.Generators/CSharpier.Generators.csproj b/Src/CSharpier.Generators/CSharpier.Generators.csproj index 9d6fe4db6..2ab4429dc 100644 --- a/Src/CSharpier.Generators/CSharpier.Generators.csproj +++ b/Src/CSharpier.Generators/CSharpier.Generators.csproj @@ -1,7 +1,7 @@ - net6.0;netstandard2.0 + net6.0;net7.0;netstandard2.0 true true 10 diff --git a/Src/CSharpier.MsBuild/CSharpier.MsBuild.csproj b/Src/CSharpier.MsBuild/CSharpier.MsBuild.csproj index 970a3a997..0ac2cecfd 100644 --- a/Src/CSharpier.MsBuild/CSharpier.MsBuild.csproj +++ b/Src/CSharpier.MsBuild/CSharpier.MsBuild.csproj @@ -6,7 +6,7 @@ and CSharpier.MSBuild just calls csharpier via command line so targeting other frameworks seems unnecessary --> - netstandard2.0 + netstandard2.0 CSharpier.MsBuild true ../CSharpier.Cli/bin/$(Configuration)/net6.0 diff --git a/Src/CSharpier.MsBuild/MsBuild.csproj b/Src/CSharpier.MsBuild/MsBuild.csproj index 87fa1063b..15711aaa8 100644 --- a/Src/CSharpier.MsBuild/MsBuild.csproj +++ b/Src/CSharpier.MsBuild/MsBuild.csproj @@ -1,7 +1,4 @@ - - net6.0 - diff --git a/Src/CSharpier.Playground/CSharpier.Playground.csproj b/Src/CSharpier.Playground/CSharpier.Playground.csproj index aed76510d..813674b7f 100644 --- a/Src/CSharpier.Playground/CSharpier.Playground.csproj +++ b/Src/CSharpier.Playground/CSharpier.Playground.csproj @@ -1,12 +1,14 @@ - net6.0 + + $(TargetFrameworks) true Latest false ClientApp\ $(DefaultItemExcludes);$(SpaRoot)node_modules\** + disable diff --git a/Src/CSharpier.Tests.Generators/CSharpier.Tests.Generators.csproj b/Src/CSharpier.Tests.Generators/CSharpier.Tests.Generators.csproj index 55d702503..a7203314b 100644 --- a/Src/CSharpier.Tests.Generators/CSharpier.Tests.Generators.csproj +++ b/Src/CSharpier.Tests.Generators/CSharpier.Tests.Generators.csproj @@ -1,7 +1,6 @@ - net6.0 true true SYSLIB0013 diff --git a/Src/CSharpier.Tests/CSharpier.Tests.csproj b/Src/CSharpier.Tests/CSharpier.Tests.csproj index 1e14d52aa..a1b01c2fc 100644 --- a/Src/CSharpier.Tests/CSharpier.Tests.csproj +++ b/Src/CSharpier.Tests/CSharpier.Tests.csproj @@ -1,10 +1,10 @@ - net6.0 false CSharpier.Tests true + disable diff --git a/Src/CSharpier.VisualStudio/CSharpier.VisualStudio/CSharpier.VisualStudio.csproj b/Src/CSharpier.VisualStudio/CSharpier.VisualStudio/CSharpier.VisualStudio.csproj index d0be09d01..90ef3558b 100644 --- a/Src/CSharpier.VisualStudio/CSharpier.VisualStudio/CSharpier.VisualStudio.csproj +++ b/Src/CSharpier.VisualStudio/CSharpier.VisualStudio/CSharpier.VisualStudio.csproj @@ -4,7 +4,6 @@ 17.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) 8 - enable diff --git a/Src/CSharpier.VisualStudio/CSharpier.VisualStudio2019/CSharpier.VisualStudio2019.csproj b/Src/CSharpier.VisualStudio/CSharpier.VisualStudio2019/CSharpier.VisualStudio2019.csproj index 63008cd56..ceeb25e1e 100644 --- a/Src/CSharpier.VisualStudio/CSharpier.VisualStudio2019/CSharpier.VisualStudio2019.csproj +++ b/Src/CSharpier.VisualStudio/CSharpier.VisualStudio2019/CSharpier.VisualStudio2019.csproj @@ -4,7 +4,6 @@ 16.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) 8 - enable diff --git a/Src/CSharpier/CSharpier.csproj b/Src/CSharpier/CSharpier.csproj index d97c8f6f6..d130ea357 100644 --- a/Src/CSharpier/CSharpier.csproj +++ b/Src/CSharpier/CSharpier.csproj @@ -2,9 +2,8 @@ CSharpier.Core - net6.0;netstandard2.0 + net6.0;net7.0;netstandard2.0 CSharpier - enable true diff --git a/Src/SyntaxFinder/SyntaxFinder.csproj b/Src/SyntaxFinder/SyntaxFinder.csproj index 1e4d4456f..df51d6bb1 100644 --- a/Src/SyntaxFinder/SyntaxFinder.csproj +++ b/Src/SyntaxFinder/SyntaxFinder.csproj @@ -2,9 +2,6 @@ Exe - net6.0 - 10 - enable diff --git a/global.json b/global.json index 3aa4b2bd1..70e3dcc50 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "6.0.300" + "version": "7.0.100" } -} \ No newline at end of file +}