diff --git a/.github/actions/setup-dotnet/action.yml b/.github/actions/setup-dotnet/action.yml index 16ee76ff9..dc0cb7e89 100644 --- a/.github/actions/setup-dotnet/action.yml +++ b/.github/actions/setup-dotnet/action.yml @@ -1,16 +1,16 @@ -name: Set up .NET +name: Set up .NET description: Sets up the .NET SDK. inputs: dotnet-version: required: false - default: 6.0.* + default: 6.0.x description: Version of the .NET SDK to set up. runs: using: "composite" steps: - - name: Set environment variables + - name: Set Environment Variables shell: pwsh run: | # This ceremony is needed to make the env vars available in subsequent steps too, see: @@ -22,7 +22,11 @@ runs: "DOTNET_CLI_TELEMETRY_OPTOUT=true" >> $Env:GITHUB_ENV $Env:DOTNET_CLI_TELEMETRY_OPTOUT = "true" + + # setup-dotnet won't install a version if it is already preinstalled on the VM. Note that it checks the latest + # released .NET version for wildcard versions. So, e.g. with 6.0.x specified it'll still install 6.0.402 if the VM + # only has 6.0.401. See: https://github.com/actions/setup-dotnet/issues/284#issuecomment-1276250960. - name: Set up .NET - uses: actions/setup-dotnet@v2 + uses: actions/setup-dotnet@v3 with: dotnet-version: ${{ inputs.dotnet-version }} diff --git a/.github/workflows/build-and-test-orchard-core.yml b/.github/workflows/build-and-test-orchard-core.yml index 40d3bc6fb..0c6522d66 100644 --- a/.github/workflows/build-and-test-orchard-core.yml +++ b/.github/workflows/build-and-test-orchard-core.yml @@ -15,7 +15,7 @@ on: dotnet-version: required: false type: string - default: 6.0.* + default: 6.0.x description: Version of the .NET SDK to set up. build-directory: required: false diff --git a/.github/workflows/build-dotnet.yml b/.github/workflows/build-dotnet.yml index 6d4b8e2ac..48efe76a5 100644 --- a/.github/workflows/build-dotnet.yml +++ b/.github/workflows/build-dotnet.yml @@ -15,7 +15,7 @@ on: dotnet-version: required: false type: string - default: 6.0.* + default: 6.0.x description: Version of the .NET SDK to set up. build-directory: required: false diff --git a/.github/workflows/deploy-to-azure-app-service.yml b/.github/workflows/deploy-to-azure-app-service.yml index a8fa9560a..721c3fee3 100644 --- a/.github/workflows/deploy-to-azure-app-service.yml +++ b/.github/workflows/deploy-to-azure-app-service.yml @@ -20,7 +20,7 @@ on: dotnet-version: required: false type: string - default: 6.0.* + default: 6.0.x description: Version of the .NET SDK to set up. build-directory: required: false diff --git a/.github/workflows/publish-nuget.yml b/.github/workflows/publish-nuget.yml index d1f517051..d0c448432 100644 --- a/.github/workflows/publish-nuget.yml +++ b/.github/workflows/publish-nuget.yml @@ -16,7 +16,7 @@ on: dotnet-version: required: false type: string - default: 6.0.* + default: 6.0.x description: Version of the .NET SDK to set up. timeout-minutes: required: false diff --git a/.github/workflows/test-analysis-failure.yml b/.github/workflows/test-analysis-failure.yml index 3aa8a92ae..e64b1790f 100644 --- a/.github/workflows/test-analysis-failure.yml +++ b/.github/workflows/test-analysis-failure.yml @@ -16,7 +16,7 @@ on: dotnet-version: required: false type: string - default: 6.0.* + default: 6.0.x description: Version of the .NET SDK to set up. build-directory: required: false