diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index de41fc51..7992e649 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,20 +19,19 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-dotnet@v4 with: - dotnet-version: | - 6.0.x + dotnet-version: | 8.0.x global-json-file: global.json - name: Test run: dotnet test -c Release --logger GitHubActions - + - name: Test - Compiled run: dotnet test --configuration Release --logger GitHubActions /p:Compiled=true - name: Pack run: | - PACKAGE_PATH="${GITHUB_WORKSPACE}/artifacts" + PACKAGE_PATH="${GITHUB_WORKSPACE}/artifacts" dotnet pack --property:PackageOutputPath=$PACKAGE_PATH --configuration Release -p:PackageVersion=$GITHUB_RUN_NUMBER -p:ContinuousIntegrationBuild=True - name: Publish on MyGet diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 55262588..4ab87574 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -24,14 +24,13 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-dotnet@v4 with: - dotnet-version: | - 6.0.x + dotnet-version: | 8.0.x global-json-file: global.json - name: Version run: dotnet --version - + - name: Test run: dotnet test -c Release --logger GitHubActions diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f8962902..9ce98676 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -2,7 +2,7 @@ name: Publish on: push: - tags: + tags: - v* jobs: @@ -17,8 +17,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-dotnet@v4 with: - dotnet-version: | - 6.0.x + dotnet-version: | 8.0.x global-json-file: global.json @@ -31,7 +30,7 @@ jobs: arrTag=(${GITHUB_REF//\// }) VERSION="${arrTag[2]}" VERSION="${VERSION//v}" - PACKAGE_PATH="${GITHUB_WORKSPACE}/artifacts" + PACKAGE_PATH="${GITHUB_WORKSPACE}/artifacts" echo "$VERSION" dotnet pack --property:PackageOutputPath=$PACKAGE_PATH --configuration Release -p:Version=$VERSION -p:ContinuousIntegrationBuild=True diff --git a/Fluid.MvcViewEngine/Fluid.MvcViewEngine.csproj b/Fluid.MvcViewEngine/Fluid.MvcViewEngine.csproj index 25b741f0..33c284bb 100644 --- a/Fluid.MvcViewEngine/Fluid.MvcViewEngine.csproj +++ b/Fluid.MvcViewEngine/Fluid.MvcViewEngine.csproj @@ -1,7 +1,7 @@  - net6.0;net8.0;net9.0 + net8.0;net9.0 latest logo_64x64.png true @@ -20,10 +20,6 @@ - - - - diff --git a/Fluid.Tests/Fluid.Tests.csproj b/Fluid.Tests/Fluid.Tests.csproj index ab590806..54ef3b80 100644 --- a/Fluid.Tests/Fluid.Tests.csproj +++ b/Fluid.Tests/Fluid.Tests.csproj @@ -1,7 +1,7 @@  - net6.0;net8.0;net9.0 + net8.0;net9.0 latest $(DefineConstants);COMPILED false diff --git a/Fluid.ViewEngine/Fluid.ViewEngine.csproj b/Fluid.ViewEngine/Fluid.ViewEngine.csproj index 12c9dffd..64cf8fbc 100644 --- a/Fluid.ViewEngine/Fluid.ViewEngine.csproj +++ b/Fluid.ViewEngine/Fluid.ViewEngine.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net6.0;net8.0;net9.0 + netstandard2.0;net8.0;net9.0 latest true logo_64x64.png diff --git a/Fluid/Fluid.csproj b/Fluid/Fluid.csproj index 9f060f9a..51f6b415 100644 --- a/Fluid/Fluid.csproj +++ b/Fluid/Fluid.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net6.0;net8.0;net9.0 + netstandard2.0;net8.0;net9.0 true latest true @@ -12,8 +12,6 @@ logo_64x64.png true true - - $(NoWarn);CS1591;NETSDK1138 latest-Recommended $(NoWarn);CA1016 @@ -40,17 +38,12 @@ - + - - - - - diff --git a/Versions.props b/Versions.props index 5413d4f5..ee4633d2 100644 --- a/Versions.props +++ b/Versions.props @@ -5,11 +5,6 @@ 6.0.1 - - 8.0.5 - 6.0.1 - - 8.0.0