From 8c4c132960a352dd72de843cdf3330df4544091c Mon Sep 17 00:00:00 2001 From: Jan Nielsen Date: Fri, 14 Mar 2025 16:41:50 +0100 Subject: [PATCH 1/2] update csproj to target automapper 14 --- AutoMapper.Data.Tests/AutoMapper.Data.Tests.csproj | 8 ++++---- AutoMapper.Data/AutoMapper.Data.csproj | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/AutoMapper.Data.Tests/AutoMapper.Data.Tests.csproj b/AutoMapper.Data.Tests/AutoMapper.Data.Tests.csproj index c39d8a6..6c4acf5 100644 --- a/AutoMapper.Data.Tests/AutoMapper.Data.Tests.csproj +++ b/AutoMapper.Data.Tests/AutoMapper.Data.Tests.csproj @@ -3,7 +3,7 @@ AutoMapper.Data.Tests Class Library Jimmy Bogard - net7.0 + net9.0 portable AutoMapper.Data.Tests AutoMapper.Data.Tests @@ -22,9 +22,9 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive + + all + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/AutoMapper.Data/AutoMapper.Data.csproj b/AutoMapper.Data/AutoMapper.Data.csproj index 6feb77b..47a245f 100644 --- a/AutoMapper.Data/AutoMapper.Data.csproj +++ b/AutoMapper.Data/AutoMapper.Data.csproj @@ -2,10 +2,10 @@ ADO.NET extensions for AutoMapper - 8.0.0 + 9.0.0 true Jimmy Bogard - net6.0 + net8.0 AutoMapper.Data AutoMapper.Data AutoMapper @@ -25,7 +25,7 @@ - + From 0fa55074fdb667bd20a57af5f3607c9ab636d688 Mon Sep 17 00:00:00 2001 From: Jan Nielsen Date: Fri, 14 Mar 2025 16:53:25 +0100 Subject: [PATCH 2/2] update workflows to be "same" as in the base repo --- .github/workflows/ci.yml | 11 ++++++++--- .github/workflows/lock.yml | 33 +++++++++++++++++++++++++++++++++ .github/workflows/release.yml | 9 ++++++--- 3 files changed, 47 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/lock.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4affec2..5b63e69 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,14 +7,19 @@ on: pull_request: branches: - master +permissions: + contents: read +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true jobs: build: strategy: fail-fast: false - runs-on: windows-2022 + runs-on: windows-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Build and Test @@ -27,7 +32,7 @@ jobs: run: ./Push.ps1 shell: pwsh - name: Artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: artifacts path: artifacts/**/* diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml new file mode 100644 index 0000000..c76bec7 --- /dev/null +++ b/.github/workflows/lock.yml @@ -0,0 +1,33 @@ +name: 'Lock threads' + +on: + schedule: + - cron: '0 0 * * 0' + workflow_dispatch: + +permissions: + contents: read + +jobs: + lock: + permissions: + issues: write # for dessant/lock-threads to lock issues + pull-requests: write # for dessant/lock-threads to lock PRs + discussions: write # for dessant/lock-threads to lock discussions + runs-on: ubuntu-latest + steps: + - uses: dessant/lock-threads@v5 + with: + issue-inactive-days: 31 + pr-inactive-days: 31 + discussion-inactive-days: 31 + issue-comment: > + This issue has been automatically locked since there + has not been any recent activity after it was closed. + Please open a new issue for related bugs. + pr-comment: > + This pull request has been automatically locked since there + has not been any recent activity after it was closed. + discussion-comment: > + This discussion has been automatically locked since there + has not been any recent activity after it was closed. diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 30b8486..8086baa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,14 +4,17 @@ on: push: tags: - '*.*.*' +permissions: + contents: read + jobs: build: strategy: fail-fast: false - runs-on: windows-2022 + runs-on: windows-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Build and Test @@ -30,7 +33,7 @@ jobs: run: ./Push.ps1 shell: pwsh - name: Artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: artifacts path: artifacts/**/*