diff --git a/.github/workflows/formatting-and-tests.yml b/.github/workflows/formatting-and-tests.yml index 2cc6f24..f9845ec 100644 --- a/.github/workflows/formatting-and-tests.yml +++ b/.github/workflows/formatting-and-tests.yml @@ -16,12 +16,10 @@ jobs: steps: - name: Cloning repo - uses: actions/checkout@v2 - with: - fetch-depth: 0 + uses: actions/checkout@v4 - name: Set up Dotnet - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v4 - name: Install dependencies run: dotnet restore @@ -45,7 +43,7 @@ jobs: steps: - name: Cloning repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 submodules: recursive @@ -53,7 +51,9 @@ jobs: - name: Set up Dotnet ${{ matrix.dotnet-version }} uses: actions/setup-dotnet@v3 with: - dotnet-version: ${{ matrix.dotnet-version }} + dotnet-version: | + 6.0.x + ${{ matrix.dotnet-version }} - name: Run Tests # bafflingly adding the below debugging echo / version statements got the workflow to pass diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6aceb81..4324c49 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,6 +9,7 @@ env: DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1 DOTNET_NOLOGO: true NuGetDirectory: ${{ github.workspace }}/nuget + DOTNET_VERSION: 7.0.x defaults: run: @@ -25,6 +26,8 @@ jobs: # Install the .NET SDK indicated in the global.json file - name: Setup .NET uses: actions/setup-dotnet@v4 + with: + dotnet-version: ${{ env.DOTNET_VERSION }} # Create the NuGet package in the folder from the environment variable NuGetDirectory - run: dotnet pack --configuration Release --output ${{ env.NuGetDirectory }} @@ -47,6 +50,8 @@ jobs: # Install the .NET SDK indicated in the global.json file - name: Setup .NET uses: actions/setup-dotnet@v4 + with: + dotnet-version: ${{ env.DOTNET_VERSION }} # Download the NuGet package created in the previous job - uses: actions/download-artifact@v4 @@ -78,6 +83,8 @@ jobs: # Install the .NET SDK indicated in the global.json file - name: Setup .NET Core uses: actions/setup-dotnet@v4 + with: + dotnet-version: ${{ env.DOTNET_VERSION }} # Publish all NuGet packages to NuGet.org - name: Publish NuGet package diff --git a/global.json b/global.json deleted file mode 100644 index 47c521e..0000000 --- a/global.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "sdk": { - "version": "7.0.304", - "rollForward": "latestFeature" - } -} \ No newline at end of file