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

github.com/mono/corefx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric StJohn <ericstj@microsoft.com>2017-09-02 00:06:57 +0300
committerGitHub <noreply@github.com>2017-09-02 00:06:57 +0300
commit35e0a7fcc693dbb73996e8dae5d8841a4ba00d6f (patch)
treedf2c4f1cfb58c6f75a0f73b932c523ad84697bce /external
parentfa71a8d698df216b625391198b726e06b5232459 (diff)
parent75962dae7f338445b57d7d276d018774e1dd2e46 (diff)
Merge pull request #23719 from ericstj/rollBackRefAssmVerInbox
Fix library packages overlapping with framework packages
Diffstat (limited to 'external')
-rw-r--r--external/runtime/Configurations.props2
-rw-r--r--external/runtime/runtime.depproj1
2 files changed, 3 insertions, 0 deletions
diff --git a/external/runtime/Configurations.props b/external/runtime/Configurations.props
index 7d40e785db..903d22de95 100644
--- a/external/runtime/Configurations.props
+++ b/external/runtime/Configurations.props
@@ -4,6 +4,8 @@
<BuildConfigurations>
netcoreapp-Windows_NT;
netcoreapp-Unix;
+ netcoreapp2.0-Windows_NT;
+ netcoreapp2.0-Unix;
uap;
uapaot;
mono;
diff --git a/external/runtime/runtime.depproj b/external/runtime/runtime.depproj
index 1bd39c34f4..48bb76c9d8 100644
--- a/external/runtime/runtime.depproj
+++ b/external/runtime/runtime.depproj
@@ -4,6 +4,7 @@
<PropertyGroup>
<NugetRuntimeIdentifier>$(PackageRID)</NugetRuntimeIdentifier>
<RidSpecificAssets>true</RidSpecificAssets>
+ <CoreClrPackageVersion Condition="'$(TargetGroup)' == 'netcoreapp2.0'">2.0.0</CoreClrPackageVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetGroup)' == 'uapaot'">
<!-- Temporarily Override restore moniker since NETNative's targeting pack still uses uap10.1 moniker -->