Skip to content

Commit b66855c

Browse files
authored
Don't attempt to install .NET 8 without explicit variable (#528)
With v1.3.0 not being fully released yet, attempting download of Net8 bits may fail if not explicitly setting v1.3.0-alpha in `installcredprovider.sh`. Update the variable check to avoid "default" downloads of .NET 8.
1 parent 5115052 commit b66855c

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

helpers/installcredprovider.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
REPO="Microsoft/artifacts-credprovider"
1212
NUGET_PLUGIN_DIR="$HOME/.nuget/plugins"
1313

14-
# determine whether we install default or Net6
14+
# .NET 6 is the default installation, attempt to install unless set to false.
1515
if [ -z ${USE_NET6_ARTIFACTS_CREDENTIAL_PROVIDER} ] || [ ${USE_NET6_ARTIFACTS_CREDENTIAL_PROVIDER} != "false" ]; then
1616
FILE="Microsoft.Net6.NuGet.CredentialProvider.tar.gz"
1717

@@ -22,7 +22,8 @@ if [ -z ${USE_NET6_ARTIFACTS_CREDENTIAL_PROVIDER} ] || [ ${USE_NET6_ARTIFACTS_CR
2222
exit 1
2323
;;
2424
esac
25-
elif [ -z ${USE_NET8_ARTIFACTS_CREDENTIAL_PROVIDER} ] || [ ${USE_NET8_ARTIFACTS_CREDENTIAL_PROVIDER} != "false" ]; then
25+
# Don't attempt to install .NET 8 without a set variable.
26+
elif [ ! -z ${USE_NET8_ARTIFACTS_CREDENTIAL_PROVIDER} ] && [ ${USE_NET8_ARTIFACTS_CREDENTIAL_PROVIDER} != "false" ]; then
2627
FILE="Microsoft.Net8.NuGet.CredentialProvider.tar.gz"
2728

2829
# throw if version starts < 1.3.0. (net8 not supported)
@@ -32,6 +33,7 @@ elif [ -z ${USE_NET8_ARTIFACTS_CREDENTIAL_PROVIDER} ] || [ ${USE_NET8_ARTIFACTS_
3233
exit 1
3334
;;
3435
esac
36+
# If .NET 6 is disabled and .NET 8 isn't explicitly enabled, fall back to the legacy .NET Framework.
3537
else
3638
FILE="Microsoft.NuGet.CredentialProvider.tar.gz"
3739
fi

0 commit comments

Comments
 (0)