Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix UseManagedNtlm linker substitutions #90957

Merged
merged 5 commits into from
Aug 29, 2023
Merged

Fix UseManagedNtlm linker substitutions #90957

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f6da616
Fix UseManagedNtlm linker Substitutions
filipnavara Aug 22, 2023
2107cc4
Revert unnecessary changes, document _UseManagedNtlm switch
filipnavara Aug 24, 2023
4fd3c9f
Set _UseManagedNtlm in NativeAOT integration
filipnavara Aug 24, 2023
0714937
Revert unnecessary change, move default values for trimming propertie…
filipnavara Aug 24, 2023
367cd8d
Fix build
filipnavara Aug 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/libraries/System.Net.Security/src/ILLink/ILLink.Substitutions.Linux.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<linker>
<assembly fullname="System.Net.Security">
<type fullname="System.Net.NegotiateAuthenticationPal">
<method signature="System.Boolean get_UseManagedNtlm()" feature="System.Net.Security.UseManagedNtlm" featurevalue="false" featuredefault="true" body="stub" value="false" />
</type>
</assembly>
</linker>
0 ...urity/src/ILLink/ILLink.Substitutions.xml → ...c/ILLink/ILLink.Substitutions.OSXLike.xml
View file
Open in desktop
Copy link
Contributor

@teo-tsirpanis teo-tsirpanis Aug 22, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about you call it ILLink.Substitutions.Apple.xml? OSXLike does not exist in any other file.

(misclicked Approve 😅)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have no strong preference on this, but Apple sounds good. There's at least one other case where OSX is used for both macOS and iOS.

File renamed without changes.
4 changes: 3 additions & 1 deletion src/libraries/System.Net.Security/src/System.Net.Security.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<UseManagedNtlm Condition="'$(TargetPlatformIdentifier)' == 'android' or '$(TargetPlatformIdentifier)' == 'tvos'">true</UseManagedNtlm>
<DefineConstants Condition="'$(UseAndroidCrypto)' == 'true' or '$(UseAppleCrypto)' == 'true'">$(DefineConstants);SYSNETSECURITY_NO_OPENSSL</DefineConstants>
<GenAPIExcludeApiList>ReferenceAssemblyExclusions.txt</GenAPIExcludeApiList>
<ILLinkArgs>$(ILLinkArgs) --ignore-substitutions</ILLinkArgs>
</PropertyGroup>
<Import Project="$(CommonPath)System\Security\Cryptography\Asn1Reader\System.Security.Cryptography.Asn1Reader.Shared.projitems" Condition="'$(TargetPlatformIdentifier)' != '' and '$(TargetPlatformIdentifier)' != 'windows'" />
<ItemGroup>
Expand Down Expand Up @@ -284,7 +285,8 @@
<Compile Include="System\Net\Security\Pal.Managed\SafeChannelBindingHandle.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetPlatformIdentifier)' != '' and '$(TargetPlatformIdentifier)' != 'windows' and '$(UseManagedNtlm)' != 'true'">
<ILLinkSubstitutionsXmls Include="$(ILLinkDirectory)ILLink.Substitutions.xml" />
<ILLinkSubstitutionsXmls Condition="'$(TargetPlatformIdentifier)' == 'linux'" Include="$(ILLinkDirectory)ILLink.Substitutions.Linux.xml" />
<ILLinkSubstitutionsXmls Condition="'$(TargetPlatformIdentifier)' != 'linux'" Include="$(ILLinkDirectory)ILLink.Substitutions.OSXLike.xml" />
<Compile Include="System\Net\NegotiateAuthenticationPal.Unix.cs" />
<Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\GssSafeHandles.cs"
Link="Common\Microsoft\Win32\SafeHandles\GssSafeHandles.cs" />
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Net.Security/src/System/Net/NegotiateAuthenticationPal.Unix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace System.Net
{
internal partial class NegotiateAuthenticationPal
{
private static bool UseManagedNtlm { get; } =
public static bool UseManagedNtlm { get; } =
filipnavara marked this conversation as resolved.
Show resolved Hide resolved
AppContext.TryGetSwitch("System.Net.Security.UseManagedNtlm", out bool useManagedNtlm) ?
useManagedNtlm :
OperatingSystem.IsMacOS() || OperatingSystem.IsIOS() || OperatingSystem.IsMacCatalyst();
Expand Down