Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dotnet/runtime.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Wicher <kwicher@microsoft.com>2020-05-26 20:10:26 +0300
committerKrzysztof Wicher <kwicher@microsoft.com>2020-05-29 00:31:37 +0300
commita84b2b0efb8a7230017f8befba3e30975a508b52 (patch)
treecc129bf2e98eb8baa1191a87fdbbf5ad259975ee
parentfd62c7f2c222e9685043b30ddd84e1f3ceea1f1d (diff)
remove System.IO.Ports native assets from framework
-rw-r--r--eng/liveBuilds.targets5
-rw-r--r--src/installer/pkg/projects/netcoreapp/pkg/Directory.Build.props2
2 files changed, 4 insertions, 3 deletions
diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets
index 42cae856879..dd0e409fb32 100644
--- a/eng/liveBuilds.targets
+++ b/eng/liveBuilds.targets
@@ -174,6 +174,8 @@
$(LibrariesAllBinArtifactsPath)*.dll;
$(LibrariesAllBinArtifactsPath)*.pdb"
IsNative="" />
+ <ExcludeNativeLibrariesRuntimeFiles Condition="'$(IncludeOOBLibraries)' != 'true'"
+ Include="$(LibrariesNativeArtifactsPath)/libSystem.IO.Ports.Native.*" />
<LibrariesRuntimeFiles Include="
$(LibrariesNativeArtifactsPath)*.dll;
$(LibrariesNativeArtifactsPath)*.dylib;
@@ -182,7 +184,8 @@
$(LibrariesNativeArtifactsPath)*.dbg;
$(LibrariesNativeArtifactsPath)*.dwarf;
$(LibrariesNativeArtifactsPath)*.pdb"
- IsNative="true" />
+ IsNative="true"
+ Exclude="@(ExcludeNativeLibrariesRuntimeFiles)" />
<LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'Browser'"
Include="
$(LibrariesNativeArtifactsPath)wasm\runtimes\debug\dotnet.js;
diff --git a/src/installer/pkg/projects/netcoreapp/pkg/Directory.Build.props b/src/installer/pkg/projects/netcoreapp/pkg/Directory.Build.props
index e616a7cfc1f..1c28e2590f7 100644
--- a/src/installer/pkg/projects/netcoreapp/pkg/Directory.Build.props
+++ b/src/installer/pkg/projects/netcoreapp/pkg/Directory.Build.props
@@ -15,7 +15,6 @@
<ItemGroup>
<!-- UNIX -->
<SingleFileHostIncludeFilename Include="libSystem.IO.Compression.Native.so" />
- <SingleFileHostIncludeFilename Include="libSystem.IO.Ports.Native.so" />
<SingleFileHostIncludeFilename Include="libSystem.Native.so" />
<SingleFileHostIncludeFilename Include="libSystem.Net.Security.Native.so" />
<SingleFileHostIncludeFilename Include="llibSystem.Security.Cryptography.Native.OpenSsl.so" />
@@ -24,7 +23,6 @@
<!-- OSX -->
<SingleFileHostIncludeFilename Include="libSystem.IO.Compression.Native.dylib" />
- <SingleFileHostIncludeFilename Include="libSystem.IO.Ports.Native.dylib" />
<SingleFileHostIncludeFilename Include="libSystem.Native.dylib" />
<SingleFileHostIncludeFilename Include="libSystem.Net.Security.Native.dylib" />
<SingleFileHostIncludeFilename Include="libSystem.Security.Cryptography.Native.Apple.dylib" />