From efae313345643bd5e91d314ef3460cd3c1770820 Mon Sep 17 00:00:00 2001 From: James Turner Date: Mon, 26 Dec 2022 17:30:05 +1030 Subject: [PATCH] Misc build updates (#324) * Update test targets * Embed symbols * Fix build shield in readme * Remove release-drafter * Add GitHub changelog config * Remove dependabot * Updated changelog label * Update step name in build * Remove AppVeyor builds --- .appveyor.yml | 16 ------- .github/dependabot.yml | 7 --- .github/release-drafter.yml | 36 --------------- .github/release.yml | 20 +++++++++ .github/workflows/build.yml | 7 ++- .github/workflows/release-drafter.yml | 14 ------ MongoFramework.sln | 5 +-- README.md | 2 +- src/Directory.Build.props | 45 +++++++++---------- .../MongoFramework.Tests.csproj | 2 +- 10 files changed, 49 insertions(+), 105 deletions(-) delete mode 100644 .appveyor.yml delete mode 100644 .github/dependabot.yml delete mode 100644 .github/release-drafter.yml create mode 100644 .github/release.yml delete mode 100644 .github/workflows/release-drafter.yml diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 6995f4ef..00000000 --- a/.appveyor.yml +++ /dev/null @@ -1,16 +0,0 @@ -version: 'Build {build}' -image: Visual Studio 2022 -skip_branch_with_pr: true - -services: - - mongodb - -build_script: - - ps: dotnet restore - - ps: dotnet build --no-restore -c Release - - ps: dotnet test --no-restore /p:SkipBuildVersioning=true - - ps: dotnet pack --no-build -c Release /p:PackageOutputPath=build-artifacts - -test: false -artifacts: - - path: '**\build-artifacts\*' diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index aec207e4..00000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,7 +0,0 @@ -version: 2 -updates: -- package-ecosystem: nuget - directory: "/" - schedule: - interval: daily - open-pull-requests-limit: 10 diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml deleted file mode 100644 index ea0ea333..00000000 --- a/.github/release-drafter.yml +++ /dev/null @@ -1,36 +0,0 @@ -name-template: '$RESOLVED_VERSION' -tag-template: '$RESOLVED_VERSION' -categories: - - title: '🚀 Features' - labels: - - 'feature' - - 'enhancement' - - title: '🐛 Bug Fixes' - labels: - - 'bug' - - 'bugfix' - - title: '🧰 Maintenance' - label: - - 'dependencies' - - 'maintenance' -change-template: '- $TITLE by @$AUTHOR (#$NUMBER)' -change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks. -version-resolver: - major: - labels: - - 'major' - minor: - labels: - - 'minor' - patch: - labels: - - 'patch' - default: patch -template: | - ## Changes - - $CHANGES - - ## 👨🏼‍💻 Contributors - - $CONTRIBUTORS \ No newline at end of file diff --git a/.github/release.yml b/.github/release.yml new file mode 100644 index 00000000..e9a251ab --- /dev/null +++ b/.github/release.yml @@ -0,0 +1,20 @@ +changelog: + exclude: + labels: + - ignore-for-release + categories: + - title: ⚠ Breaking Changes + labels: + - breaking-change + - title: Features and Improvements + labels: + - enhancement + - title: Bug Fixes + labels: + - bug + - title: Dependency Updates + labels: + - dependencies + - title: Other Changes + labels: + - "*" \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3d5f7caa..2a96f20c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -65,13 +65,12 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Setup dotnet 3.1 5.0 6.0 + - name: Setup dotnet SDK uses: actions/setup-dotnet@v1 with: dotnet-version: | - 3.1.x - 5.0.x 6.0.x + 7.0.x - name: Install dependencies run: dotnet restore - name: Build @@ -143,5 +142,5 @@ jobs: uses: actions/download-artifact@v2 with: name: 'ubuntu-latest' - - name: 'Upload NuGet package and symbols' + - name: 'Upload NuGet package' run: dotnet nuget push *.nupkg --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{secrets.NUGET_API_KEY}} diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml deleted file mode 100644 index a1705349..00000000 --- a/.github/workflows/release-drafter.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: Release Drafter - -on: - push: - branches: - - main - -jobs: - update_release_draft: - runs-on: ubuntu-latest - steps: - - uses: release-drafter/release-drafter@v5 - env: - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} \ No newline at end of file diff --git a/MongoFramework.sln b/MongoFramework.sln index ac8efd75..c2d3fd2f 100644 --- a/MongoFramework.sln +++ b/MongoFramework.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.28803.352 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.33209.295 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoFramework", "src\MongoFramework\MongoFramework.csproj", "{D871CD75-CC1E-4482-934F-42E74B2BF255}" EndProject @@ -21,7 +21,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9CBF5A6D EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "global", "global", "{BA117612-DD9B-4296-8F56-5D790AB07D72}" ProjectSection(SolutionItems) = preProject - .appveyor.yml = .appveyor.yml .codecov.yml = .codecov.yml .editorconfig = .editorconfig .gitignore = .gitignore diff --git a/README.md b/README.md index ad24a0c0..0af58c50 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # MongoFramework An "Entity Framework"-like interface for MongoDB -![Build](https://img.shields.io/github/workflow/status/TurnerSoftware/mongoframework/Build) +![Build](https://img.shields.io/github/actions/workflow/status/TurnerSoftware/mongoframework/build.yml?branch=main) [![Codecov](https://img.shields.io/codecov/c/github/turnersoftware/mongoframework/main.svg)](https://codecov.io/gh/TurnerSoftware/MongoFramework) [![NuGet](https://img.shields.io/nuget/v/MongoFramework.svg)](https://www.nuget.org/packages/MongoFramework/) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/62fa31c90bf94f3d8e201b9684a7a4ca)](https://www.codacy.com/app/Turnerj/MongoFramework) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index ee9eaa14..3f23cd34 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,32 +1,31 @@ - - MongoFramework + + MongoFramework - Turner Software + Turner Software - $(AssemblyName) - true - MIT - icon.png - https://github.com/TurnerSoftware/MongoFramework - mongo;mongodb;data;database;orm + $(AssemblyName) + true + MIT + icon.png + https://github.com/TurnerSoftware/MongoFramework + mongo;mongodb;data;database;orm - - true - true - true - snupkg + + true + true + embedded - Latest - - - - - + Latest + + + + + - - - + + + \ No newline at end of file diff --git a/tests/MongoFramework.Tests/MongoFramework.Tests.csproj b/tests/MongoFramework.Tests/MongoFramework.Tests.csproj index 8abba6d4..56b438df 100644 --- a/tests/MongoFramework.Tests/MongoFramework.Tests.csproj +++ b/tests/MongoFramework.Tests/MongoFramework.Tests.csproj @@ -3,7 +3,7 @@ MongoFramework.Tests MongoFramework.Tests - net461;net48;netcoreapp3.1;net5.0;net6.0 + net461;net48;net6.0;net7.0 false