Skip to content

Commit

Permalink
[NET6] Don't export the XA_TLS_PROVIDER envvar (#6182)
Browse files Browse the repository at this point in the history
Fixes: #6140

`XA_TLS_PROVIDER` environment variable was used to set the TLS provider
for HttpClient in "legacy" Xamarin.Android.  NET6 and newer no longer
use that variable, so we can stop exporting it.
  • Loading branch information
grendello committed Aug 16, 2021
1 parent 400fb5a commit 4b72d31
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
Expand Up @@ -72,6 +72,7 @@ public class GeneratePackageManagerJava : AndroidTask
public string TlsProvider { get; set; }
public string AndroidSequencePointsMode { get; set; }
public bool EnableSGenConcurrent { get; set; }
public bool UsingAndroidNETSdk { get; set; }

[Output]
public string BuildId { get; set; }
Expand Down Expand Up @@ -206,8 +207,10 @@ void AddEnvironment ()
}
if (lineToWrite.StartsWith ("XA_HTTP_CLIENT_HANDLER_TYPE=", StringComparison.Ordinal))
haveHttpMessageHandler = true;
if (lineToWrite.StartsWith ("XA_TLS_PROVIDER=", StringComparison.Ordinal))

if (!UsingAndroidNETSdk && lineToWrite.StartsWith ("XA_TLS_PROVIDER=", StringComparison.Ordinal))
haveTlsProvider = true;

if (lineToWrite.StartsWith ("mono.enable_assembly_preload=", StringComparison.Ordinal)) {
int idx = lineToWrite.IndexOf ('=');
uint val;
Expand Down Expand Up @@ -243,7 +246,7 @@ void AddEnvironment ()
AddEnvironmentVariable ("XA_HTTP_CLIENT_HANDLER_TYPE", HttpClientHandlerType.Trim ());
}

if (!haveTlsProvider) {
if (!UsingAndroidNETSdk && !haveTlsProvider) {
if (TlsProvider == null)
AddEnvironmentVariable (defaultTlsProvider[0], defaultTlsProvider[1]);
else
Expand Down
Expand Up @@ -1596,6 +1596,7 @@ because xbuild doesn't support framework reference assemblies.
BoundExceptionType="$(AndroidBoundExceptionType)"
InstantRunEnabled="$(_InstantRunEnabled)"
RuntimeConfigBinFilePath="$(_BinaryRuntimeConfigPath)"
UsingAndroidNETSdk="$(UsingAndroidNETSdk)"
>
<Output TaskParameter="BuildId" PropertyName="_XamarinBuildId" />
</GeneratePackageManagerJava>
Expand Down

0 comments on commit 4b72d31

Please sign in to comment.