From 111bf8d9a31f0daed964fa11289e096e3ea05cd2 Mon Sep 17 00:00:00 2001 From: Benito Palacios Sanchez Date: Sun, 11 Feb 2024 11:02:15 +0100 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8FUpgrade=20to=20stable=20Yarhl?= =?UTF-8?q?=20and=20bump=20build=20system?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .config/dotnet-tools.json | 2 +- .editorconfig | 3 +++ .github/workflows/build-and-release.yml | 4 ++-- .github/workflows/build.yml | 6 +++--- .github/workflows/deploy.yml | 6 +++--- .gitignore | 1 + build/orchestrator/BuildSystem.csproj | 2 +- nuget.config | 6 ------ src/Directory.Packages.props | 2 +- src/nuget.config | 16 ---------------- 10 files changed, 15 insertions(+), 33 deletions(-) delete mode 100644 nuget.config delete mode 100644 src/nuget.config diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index aa4d6ea..282ad84 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -21,7 +21,7 @@ ] }, "docfx": { - "version": "2.74.0", + "version": "2.75.2", "commands": [ "docfx" ] diff --git a/.editorconfig b/.editorconfig index 1240ae0..1b269f4 100644 --- a/.editorconfig +++ b/.editorconfig @@ -241,6 +241,7 @@ dotnet_diagnostic.CA1303.severity = none # We don't translate exception and log dotnet_diagnostic.SA1025.severity = none # Allow spaces in comments to structure info dotnet_diagnostic.IDE0045.severity = suggestion # Simplify ifs dotnet_diagnostic.IDE0046.severity = suggestion # Simplify ifs +dotnet_diagnostic.IDE0057.severity = suggestion # Slice can be simplified ### StyleCop dotnet_diagnostic.SA1101.severity = none # Do not force to prefix local calls with 'this' @@ -263,6 +264,8 @@ dotnet_diagnostic.CA1305.severity = none # No culture method for quick test code dotnet_diagnostic.CA1307.severity = none # No culture method for quick test code dotnet_diagnostic.SA0001.severity = none # Disable documentation dotnet_diagnostic.SA1600.severity = none # Disable documentation +dotnet_diagnostic.SA1601.severity = none # Disable documentation +dotnet_diagnostic.SA1602.severity = none # Disable documentation dotnet_diagnostic.SA1201.severity = none # Allow enums inside classes dotnet_diagnostic.S1144.severity = none # Remove unused setter dotnet_diagnostic.S2094.severity = none # Remove empty class diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 3c99362..a830429 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -15,7 +15,7 @@ jobs: name: "Build" uses: ./.github/workflows/build.yml with: - dotnet_version: '8.0.100' + dotnet_version: '8.0.101' # Preview release on push to main only # Stable release on version tag push only @@ -25,7 +25,7 @@ jobs: needs: build uses: ./.github/workflows/deploy.yml with: - dotnet_version: '8.0.100' + dotnet_version: '8.0.101' azure_nuget_feed: 'https://pkgs.dev.azure.com/SceneGate/SceneGate/_packaging/SceneGate-Preview/nuget/v3/index.json' secrets: nuget_preview_token: "az" # Dummy values as we use Azure DevOps only - Replace with your token for nuget.org diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f32f5d9..2454a48 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: fetch-depth: 0 # We need full history for version number - name: "Setup .NET SDK" - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: ${{ inputs.dotnet_version }} @@ -42,7 +42,7 @@ jobs: - name: "Publish artifacts to CI" if: ${{ matrix.is_main_build }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "Artifacts" retention-days: 7 @@ -52,6 +52,6 @@ jobs: - name: Publish docs artifact to CI if: ${{ matrix.is_main_build }} - uses: actions/upload-pages-artifact@v2 + uses: actions/upload-pages-artifact@v3 with: path: build/artifacts/docs diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 7039796..55b91e1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -32,7 +32,7 @@ jobs: steps: - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v2 + uses: actions/deploy-pages@v4 push_artifacts: name: "Artifacts" @@ -44,13 +44,13 @@ jobs: fetch-depth: 0 # We need full history for version number - name: "Download artifacts" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: "Artifacts" path: "./build/artifacts/" - name: "Setup .NET SDK" - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: ${{ inputs.dotnet_version }} diff --git a/.gitignore b/.gitignore index 39688a1..521ea78 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ build/temp/ # IDEs .vs/ *.csproj.user +*.DotSettings.user launchSettings.json # Test results diff --git a/build/orchestrator/BuildSystem.csproj b/build/orchestrator/BuildSystem.csproj index 560a707..a633649 100644 --- a/build/orchestrator/BuildSystem.csproj +++ b/build/orchestrator/BuildSystem.csproj @@ -11,7 +11,7 @@ - + diff --git a/nuget.config b/nuget.config deleted file mode 100644 index 95e879e..0000000 --- a/nuget.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 52763bd..a9e201b 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -1,7 +1,7 @@ - + diff --git a/src/nuget.config b/src/nuget.config deleted file mode 100644 index aa3d281..0000000 --- a/src/nuget.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - -