From e08edf1498587c3f22b10e2c9f08d975c6cde1de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 12 Oct 2022 15:00:52 +0200 Subject: [PATCH 01/18] Upgrading setup-dotnet to v3 --- .github/actions/setup-dotnet/action.yml | 4 ++-- .github/workflows/build-and-test-orchard-core.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/setup-dotnet/action.yml b/.github/actions/setup-dotnet/action.yml index 16ee76ff9..b4be5fc0e 100644 --- a/.github/actions/setup-dotnet/action.yml +++ b/.github/actions/setup-dotnet/action.yml @@ -1,4 +1,4 @@ -name: Set up .NET +name: Set up .NET description: Sets up the .NET SDK. inputs: @@ -23,6 +23,6 @@ runs: "DOTNET_CLI_TELEMETRY_OPTOUT=true" >> $Env:GITHUB_ENV $Env:DOTNET_CLI_TELEMETRY_OPTOUT = "true" - 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..2c5d6fd9d 100644 --- a/.github/workflows/build-and-test-orchard-core.yml +++ b/.github/workflows/build-and-test-orchard-core.yml @@ -94,7 +94,7 @@ jobs: submodules: 'recursive' - name: Set up .NET - uses: Lombiq/GitHub-Actions/.github/actions/setup-dotnet@dev + uses: Lombiq/GitHub-Actions/.github/actions/setup-dotnet@issue/OSOE-396 with: dotnet-version: ${{ inputs.dotnet-version }} From 22bf62435b0ee335a4b93f55c2a7802c59faa919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 12 Oct 2022 15:14:34 +0200 Subject: [PATCH 02/18] Perhaps we used the wrong syntax for wildcard .NET versions? --- .github/actions/setup-dotnet/action.yml | 2 +- .github/workflows/build-and-test-orchard-core.yml | 2 +- .github/workflows/build-dotnet.yml | 2 +- .github/workflows/deploy-to-azure-app-service.yml | 2 +- .github/workflows/publish-nuget.yml | 2 +- .github/workflows/test-analysis-failure.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/actions/setup-dotnet/action.yml b/.github/actions/setup-dotnet/action.yml index b4be5fc0e..512bee130 100644 --- a/.github/actions/setup-dotnet/action.yml +++ b/.github/actions/setup-dotnet/action.yml @@ -4,7 +4,7 @@ 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: diff --git a/.github/workflows/build-and-test-orchard-core.yml b/.github/workflows/build-and-test-orchard-core.yml index 2c5d6fd9d..5bc73afc0 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 From b8759a4837801c0df2fd4f7f717f3523431fa911 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 12 Oct 2022 15:18:44 +0200 Subject: [PATCH 03/18] What about hard-coded versions? --- .github/actions/setup-dotnet/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-dotnet/action.yml b/.github/actions/setup-dotnet/action.yml index 512bee130..9d0d84783 100644 --- a/.github/actions/setup-dotnet/action.yml +++ b/.github/actions/setup-dotnet/action.yml @@ -25,4 +25,4 @@ runs: - name: Set up .NET uses: actions/setup-dotnet@v3 with: - dotnet-version: ${{ inputs.dotnet-version }} + dotnet-version: '6.0.x' From c70d8e31c4cf684fbe1c5c2af3020872bd3248b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 12 Oct 2022 15:20:48 +0200 Subject: [PATCH 04/18] Revert "What about hard-coded versions?" This reverts commit b8759a4837801c0df2fd4f7f717f3523431fa911. --- .github/actions/setup-dotnet/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-dotnet/action.yml b/.github/actions/setup-dotnet/action.yml index 9d0d84783..512bee130 100644 --- a/.github/actions/setup-dotnet/action.yml +++ b/.github/actions/setup-dotnet/action.yml @@ -25,4 +25,4 @@ runs: - name: Set up .NET uses: actions/setup-dotnet@v3 with: - dotnet-version: '6.0.x' + dotnet-version: ${{ inputs.dotnet-version }} From 48624a277960e688af11d292acc89c6fdbff306c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 12 Oct 2022 16:04:21 +0200 Subject: [PATCH 05/18] Perhaps setup-dotnet v3.0.1 will work as expected? --- .github/actions/setup-dotnet/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-dotnet/action.yml b/.github/actions/setup-dotnet/action.yml index 512bee130..556851aef 100644 --- a/.github/actions/setup-dotnet/action.yml +++ b/.github/actions/setup-dotnet/action.yml @@ -23,6 +23,6 @@ runs: "DOTNET_CLI_TELEMETRY_OPTOUT=true" >> $Env:GITHUB_ENV $Env:DOTNET_CLI_TELEMETRY_OPTOUT = "true" - name: Set up .NET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v3.0.1 with: dotnet-version: ${{ inputs.dotnet-version }} From f57312fd6f4cfc52665401cd59726318dc55e3a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 12 Oct 2022 16:15:25 +0200 Subject: [PATCH 06/18] Adding installed SDK-checking logic --- ...Get-DotNetSdkVersionIsAlreadyInstalled.ps1 | 36 +++++++++++++++++++ .github/actions/setup-dotnet/action.yml | 10 +++++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 .github/actions/setup-dotnet/Get-DotNetSdkVersionIsAlreadyInstalled.ps1 diff --git a/.github/actions/setup-dotnet/Get-DotNetSdkVersionIsAlreadyInstalled.ps1 b/.github/actions/setup-dotnet/Get-DotNetSdkVersionIsAlreadyInstalled.ps1 new file mode 100644 index 000000000..97e1a3be7 --- /dev/null +++ b/.github/actions/setup-dotnet/Get-DotNetSdkVersionIsAlreadyInstalled.ps1 @@ -0,0 +1,36 @@ +param +( + $DotNetVersion +) + +$isExactMatch = !$DotNetVersion.Contains('x') +$requestedVersion = New-Object "System.Version" $DotNetVersion.Replace('x', '0') + +if ($isExactMatch) +{ + Write-Output "Checking if the exact version $requestedVersion of the .NET SDK is installed." +} +else +{ + Write-Output "Checking if the minimum version $requestedVersion of the .NET SDK is installed." +} + +$sdks = dotnet --list-sdks + +foreach ($sdk in $sdks) +{ + $versionPart = $sdk.Split(' ')[0] + Write-Output $versionPart + $version = New-Object "System.Version" $versionPart + + if ($isExactMatch -and $requestedVersion -eq $version) + { + return $true + } + elseif (!$isExactMatch -and $version.Major -eq $requestedVersion.Major -and $version -ge $requestedVersion) + { + return $true + } +} + +return $false diff --git a/.github/actions/setup-dotnet/action.yml b/.github/actions/setup-dotnet/action.yml index 556851aef..3894b36c3 100644 --- a/.github/actions/setup-dotnet/action.yml +++ b/.github/actions/setup-dotnet/action.yml @@ -10,7 +10,7 @@ inputs: 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,15 @@ runs: "DOTNET_CLI_TELEMETRY_OPTOUT=true" >> $Env:GITHUB_ENV $Env:DOTNET_CLI_TELEMETRY_OPTOUT = "true" + + - name: Check if .NET Version Already Installed + shell: pwsh + run: | + $isDotNetSdkVersionAlreadyInstalled = ${{ github.action_path }}/Get-DotNetSdkVersionIsAlreadyInstalled.ps1 + "IS_DOTNET_SDK_VERSION_ALREADY_INSTALLED=$isDotNetSdkVersionAlreadyInstalled" >> $Env:GITHUB_ENV + - name: Set up .NET uses: actions/setup-dotnet@v3.0.1 + if: env.IS_DOTNET_SDK_VERSION_ALREADY_INSTALLED != 'True' with: dotnet-version: ${{ inputs.dotnet-version }} From d402735b9cc4a4810305614de6552c757c4fdd3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 12 Oct 2022 16:17:02 +0200 Subject: [PATCH 07/18] Missing parameter --- .github/actions/setup-dotnet/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/setup-dotnet/action.yml b/.github/actions/setup-dotnet/action.yml index 3894b36c3..f181a3003 100644 --- a/.github/actions/setup-dotnet/action.yml +++ b/.github/actions/setup-dotnet/action.yml @@ -26,8 +26,8 @@ runs: - name: Check if .NET Version Already Installed shell: pwsh run: | - $isDotNetSdkVersionAlreadyInstalled = ${{ github.action_path }}/Get-DotNetSdkVersionIsAlreadyInstalled.ps1 - "IS_DOTNET_SDK_VERSION_ALREADY_INSTALLED=$isDotNetSdkVersionAlreadyInstalled" >> $Env:GITHUB_ENV + $isInstalled = ${{ github.action_path }}/Get-DotNetSdkVersionIsAlreadyInstalled.ps1 ${{ inputs.dotnet-version }} + "IS_DOTNET_SDK_VERSION_ALREADY_INSTALLED=$isInstalled" >> $Env:GITHUB_ENV - name: Set up .NET uses: actions/setup-dotnet@v3.0.1 From 675e55baf494310f13f65d36463b6e84be359840 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 12 Oct 2022 16:19:00 +0200 Subject: [PATCH 08/18] Removing debug code --- .../setup-dotnet/Get-DotNetSdkVersionIsAlreadyInstalled.ps1 | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/setup-dotnet/Get-DotNetSdkVersionIsAlreadyInstalled.ps1 b/.github/actions/setup-dotnet/Get-DotNetSdkVersionIsAlreadyInstalled.ps1 index 97e1a3be7..4066cf0d1 100644 --- a/.github/actions/setup-dotnet/Get-DotNetSdkVersionIsAlreadyInstalled.ps1 +++ b/.github/actions/setup-dotnet/Get-DotNetSdkVersionIsAlreadyInstalled.ps1 @@ -20,7 +20,6 @@ $sdks = dotnet --list-sdks foreach ($sdk in $sdks) { $versionPart = $sdk.Split(' ')[0] - Write-Output $versionPart $version = New-Object "System.Version" $versionPart if ($isExactMatch -and $requestedVersion -eq $version) From 855f35e8b5303d6cea2ea659db42359bdf823ca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 12 Oct 2022 16:20:14 +0200 Subject: [PATCH 09/18] setup-dotnet actually handles locally installed versions --- ...Get-DotNetSdkVersionIsAlreadyInstalled.ps1 | 35 ------------------- .github/actions/setup-dotnet/action.yml | 8 ----- 2 files changed, 43 deletions(-) delete mode 100644 .github/actions/setup-dotnet/Get-DotNetSdkVersionIsAlreadyInstalled.ps1 diff --git a/.github/actions/setup-dotnet/Get-DotNetSdkVersionIsAlreadyInstalled.ps1 b/.github/actions/setup-dotnet/Get-DotNetSdkVersionIsAlreadyInstalled.ps1 deleted file mode 100644 index 4066cf0d1..000000000 --- a/.github/actions/setup-dotnet/Get-DotNetSdkVersionIsAlreadyInstalled.ps1 +++ /dev/null @@ -1,35 +0,0 @@ -param -( - $DotNetVersion -) - -$isExactMatch = !$DotNetVersion.Contains('x') -$requestedVersion = New-Object "System.Version" $DotNetVersion.Replace('x', '0') - -if ($isExactMatch) -{ - Write-Output "Checking if the exact version $requestedVersion of the .NET SDK is installed." -} -else -{ - Write-Output "Checking if the minimum version $requestedVersion of the .NET SDK is installed." -} - -$sdks = dotnet --list-sdks - -foreach ($sdk in $sdks) -{ - $versionPart = $sdk.Split(' ')[0] - $version = New-Object "System.Version" $versionPart - - if ($isExactMatch -and $requestedVersion -eq $version) - { - return $true - } - elseif (!$isExactMatch -and $version.Major -eq $requestedVersion.Major -and $version -ge $requestedVersion) - { - return $true - } -} - -return $false diff --git a/.github/actions/setup-dotnet/action.yml b/.github/actions/setup-dotnet/action.yml index f181a3003..b0c64068f 100644 --- a/.github/actions/setup-dotnet/action.yml +++ b/.github/actions/setup-dotnet/action.yml @@ -22,15 +22,7 @@ runs: "DOTNET_CLI_TELEMETRY_OPTOUT=true" >> $Env:GITHUB_ENV $Env:DOTNET_CLI_TELEMETRY_OPTOUT = "true" - - - name: Check if .NET Version Already Installed - shell: pwsh - run: | - $isInstalled = ${{ github.action_path }}/Get-DotNetSdkVersionIsAlreadyInstalled.ps1 ${{ inputs.dotnet-version }} - "IS_DOTNET_SDK_VERSION_ALREADY_INSTALLED=$isInstalled" >> $Env:GITHUB_ENV - - name: Set up .NET uses: actions/setup-dotnet@v3.0.1 - if: env.IS_DOTNET_SDK_VERSION_ALREADY_INSTALLED != 'True' with: dotnet-version: ${{ inputs.dotnet-version }} From bc6305faa599f8d8042e1a5a873368ff59c364b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 12 Oct 2022 16:20:26 +0200 Subject: [PATCH 10/18] Code styling --- .github/actions/setup-dotnet/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/setup-dotnet/action.yml b/.github/actions/setup-dotnet/action.yml index b0c64068f..9999dec8b 100644 --- a/.github/actions/setup-dotnet/action.yml +++ b/.github/actions/setup-dotnet/action.yml @@ -22,6 +22,7 @@ runs: "DOTNET_CLI_TELEMETRY_OPTOUT=true" >> $Env:GITHUB_ENV $Env:DOTNET_CLI_TELEMETRY_OPTOUT = "true" + - name: Set up .NET uses: actions/setup-dotnet@v3.0.1 with: From 8e7f0047c2f4be9194d7576c40ce89c2aed46ce6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 12 Oct 2022 16:20:55 +0200 Subject: [PATCH 11/18] Testing local installation --- .github/actions/setup-dotnet/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-dotnet/action.yml b/.github/actions/setup-dotnet/action.yml index 9999dec8b..e07454e8d 100644 --- a/.github/actions/setup-dotnet/action.yml +++ b/.github/actions/setup-dotnet/action.yml @@ -26,4 +26,4 @@ runs: - name: Set up .NET uses: actions/setup-dotnet@v3.0.1 with: - dotnet-version: ${{ inputs.dotnet-version }} + dotnet-version: 6.0.401 From 1eded6960e0b038bdc40d18658d0f591ad05ca05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 12 Oct 2022 16:21:16 +0200 Subject: [PATCH 12/18] Maybe we can just use v3 --- .github/actions/setup-dotnet/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-dotnet/action.yml b/.github/actions/setup-dotnet/action.yml index e07454e8d..ef272c700 100644 --- a/.github/actions/setup-dotnet/action.yml +++ b/.github/actions/setup-dotnet/action.yml @@ -24,6 +24,6 @@ runs: $Env:DOTNET_CLI_TELEMETRY_OPTOUT = "true" - name: Set up .NET - uses: actions/setup-dotnet@v3.0.1 + uses: actions/setup-dotnet@v3 with: dotnet-version: 6.0.401 From 9212e0cfe97322424699d3466fab7ea2398af5dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 12 Oct 2022 16:26:31 +0200 Subject: [PATCH 13/18] Revert "Testing local installation" This reverts commit 8e7f0047c2f4be9194d7576c40ce89c2aed46ce6. --- .github/actions/setup-dotnet/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-dotnet/action.yml b/.github/actions/setup-dotnet/action.yml index ef272c700..e011b485f 100644 --- a/.github/actions/setup-dotnet/action.yml +++ b/.github/actions/setup-dotnet/action.yml @@ -26,4 +26,4 @@ runs: - name: Set up .NET uses: actions/setup-dotnet@v3 with: - dotnet-version: 6.0.401 + dotnet-version: ${{ inputs.dotnet-version }} From 2525d0fb36145c0c482d7aec367731fafd9b7e16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 12 Oct 2022 16:28:16 +0200 Subject: [PATCH 14/18] Testing with wildcard version where the latest is installed --- .github/actions/setup-dotnet/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-dotnet/action.yml b/.github/actions/setup-dotnet/action.yml index e011b485f..15e660865 100644 --- a/.github/actions/setup-dotnet/action.yml +++ b/.github/actions/setup-dotnet/action.yml @@ -26,4 +26,4 @@ runs: - name: Set up .NET uses: actions/setup-dotnet@v3 with: - dotnet-version: ${{ inputs.dotnet-version }} + dotnet-version: 5.0.x From e1d41ed899a1aa63f32e6b5eb25d66bbd406e56c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 12 Oct 2022 16:30:22 +0200 Subject: [PATCH 15/18] Revert "Testing with wildcard version where the latest is installed" This reverts commit 2525d0fb36145c0c482d7aec367731fafd9b7e16. --- .github/actions/setup-dotnet/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-dotnet/action.yml b/.github/actions/setup-dotnet/action.yml index 15e660865..e011b485f 100644 --- a/.github/actions/setup-dotnet/action.yml +++ b/.github/actions/setup-dotnet/action.yml @@ -26,4 +26,4 @@ runs: - name: Set up .NET uses: actions/setup-dotnet@v3 with: - dotnet-version: 5.0.x + dotnet-version: ${{ inputs.dotnet-version }} From 1b8ae7ebfe85b15dba0926f9bcf0deed4b31aa05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Wed, 12 Oct 2022 16:33:41 +0200 Subject: [PATCH 16/18] Docs --- .github/actions/setup-dotnet/action.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/actions/setup-dotnet/action.yml b/.github/actions/setup-dotnet/action.yml index e011b485f..6b92b6ce8 100644 --- a/.github/actions/setup-dotnet/action.yml +++ b/.github/actions/setup-dotnet/action.yml @@ -23,6 +23,9 @@ 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@v3 with: From bf59e9a20785940591b05df6c98a05340de0bbf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= Date: Fri, 14 Oct 2022 01:17:53 +0200 Subject: [PATCH 17/18] Remove issue branch references from the workflows. --- .github/workflows/build-and-test-orchard-core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test-orchard-core.yml b/.github/workflows/build-and-test-orchard-core.yml index 5bc73afc0..0c6522d66 100644 --- a/.github/workflows/build-and-test-orchard-core.yml +++ b/.github/workflows/build-and-test-orchard-core.yml @@ -94,7 +94,7 @@ jobs: submodules: 'recursive' - name: Set up .NET - uses: Lombiq/GitHub-Actions/.github/actions/setup-dotnet@issue/OSOE-396 + uses: Lombiq/GitHub-Actions/.github/actions/setup-dotnet@dev with: dotnet-version: ${{ inputs.dotnet-version }} From ba499a46e7fdbc34aafdf0c422bb47c6e33d4a23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= Date: Fri, 14 Oct 2022 01:18:54 +0200 Subject: [PATCH 18/18] Update .github/actions/setup-dotnet/action.yml --- .github/actions/setup-dotnet/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-dotnet/action.yml b/.github/actions/setup-dotnet/action.yml index 6b92b6ce8..dc0cb7e89 100644 --- a/.github/actions/setup-dotnet/action.yml +++ b/.github/actions/setup-dotnet/action.yml @@ -10,7 +10,7 @@ inputs: 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: