diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 7ee2c1e..423c5c8 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -18,17 +18,21 @@ jobs: fail-fast: false matrix: os: [ ubuntu-latest, windows-latest ] - net: [ 5.0.x ] runs-on: ${{ matrix.os }} steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - - name: Setup .NET ${{ matrix.net }} - uses: actions/setup-dotnet@v1 + - name: Setup .NET 5.0 # Needed for ExportAnnotations + uses: actions/setup-dotnet@v2 with: - dotnet-version: ${{ matrix.net }} + dotnet-version: 5.0.x + + - name: Setup .NET 6.0 + uses: actions/setup-dotnet@v2 + with: + dotnet-version: 6.0.x - name: Restore dependencies run: dotnet restore diff --git a/.github/workflows/define-labels.yml b/.github/workflows/define-labels.yml index 7510dcd..2b34819 100644 --- a/.github/workflows/define-labels.yml +++ b/.github/workflows/define-labels.yml @@ -9,9 +9,9 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Update repository labels - uses: lannonbr/issue-label-manager-action@3.0.0 + uses: lannonbr/issue-label-manager-action@3.0.1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/label-pull-requests.yml b/.github/workflows/label-pull-requests.yml index de2fc13..a526451 100644 --- a/.github/workflows/label-pull-requests.yml +++ b/.github/workflows/label-pull-requests.yml @@ -10,14 +10,14 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Update repository labels - uses: lannonbr/issue-label-manager-action@3.0.0 + uses: lannonbr/issue-label-manager-action@3.0.1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Assign labels to pull request - uses: actions/labeler@v3 + uses: actions/labeler@v4 with: repo-token: "${{ secrets.GITHUB_TOKEN }}" \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props index 18abbd9..38a5de6 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,4 @@  - - - - + diff --git a/Directory.Build.targets b/Directory.Build.targets index 15b0fe2..98af971 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -2,6 +2,6 @@ - + diff --git a/Directory.Packages.props b/Directory.Packages.props index 8553ce3..5ed1532 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,11 +1,11 @@ - + - - - + + + diff --git a/global.json b/global.json new file mode 100644 index 0000000..da4a3d0 --- /dev/null +++ b/global.json @@ -0,0 +1,9 @@ +{ + "sdk": { + "version": "6.0.0", + "rollForward": "latestMinor", + "allowPrerelease": false + }, + "msbuild-sdks": { + "Buildvana.Sdk": "1.0.0-alpha.15" +}}