summaryrefslogtreecommitdiff
path: root/clr.coreclr.props
diff options
context:
space:
mode:
authorAlexGhiondea <AlexGhiondea@users.noreply.github.com>2016-10-31 20:06:26 (GMT)
committerGitHub <noreply@github.com>2016-10-31 20:06:26 (GMT)
commit8c641772e31e902541ade4a2d0ac6259aa7a2f03 (patch)
treebf8457d9a265ce99d92157e2f68de6142275bd57 /clr.coreclr.props
parentf42984160f5f9407f70ebc2e86edfcf226fccd81 (diff)
parent4c465e097719de065f3c663f5c5ac04773b661db (diff)
downloadcoreclr-8c641772e31e902541ade4a2d0ac6259aa7a2f03.zip
coreclr-8c641772e31e902541ade4a2d0ac6259aa7a2f03.tar.gz
coreclr-8c641772e31e902541ade4a2d0ac6259aa7a2f03.tar.bz2
Merge pull request #7884 from AlexGhiondea/Port_SecureString
Bring to CoreCLR the SecureString implementation from CoreFx.
Diffstat (limited to 'clr.coreclr.props')
-rw-r--r--clr.coreclr.props4
1 files changed, 4 insertions, 0 deletions
diff --git a/clr.coreclr.props b/clr.coreclr.props
index 2e7ca83..ec9c23f 100644
--- a/clr.coreclr.props
+++ b/clr.coreclr.props
@@ -81,6 +81,9 @@
<FeatureCoreFxFileStream>true</FeatureCoreFxFileStream>
<FeatureCoreFxShim>true</FeatureCoreFxShim>
<FeatureCoreFxOverlapped>true</FeatureCoreFxOverlapped>
+
+ <!-- We only want to use the CoreFx implementation of SecureString when we are not building the legacy surface area -->
+ <FeatureCoreFxSecureString Condition="'$(FeatureLegacySurface)'==''" >true</FeatureCoreFxSecureString>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetsUnix)' == 'true'">
@@ -106,6 +109,7 @@
<FeatureUseLcid>true</FeatureUseLcid>
<FeatureImplicitLongPath>true</FeatureImplicitLongPath>
</PropertyGroup>
+
<PropertyGroup Condition="'$(TargetsUnix)' != 'true' and '$(ClrProduct)' == 'core_clr'">
<FeatureCoreFxWindowsInterop>true</FeatureCoreFxWindowsInterop>
</PropertyGroup>