projects / platform / upstream / dotnet / runtime.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c250639)
Ensure we reference NETCoreApp1.1 packages on nca1.1
authorEric St. John <ericstj@microsoft.com>
Wed, 24 May 2017 17:14:01 +0000 (10:14 -0700)
committerEric St. John <ericstj@microsoft.com>
Wed, 24 May 2017 18:49:15 +0000 (11:49 -0700)
Commit migrated from https://github.com/dotnet/core-setup/commit/7d5e3e33bffda964a7f27737f24d46badf9cce23

src/installer/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj patch | blob | history
src/installer/pkg/projects/Microsoft.NETCore.App/netcoreapp1.1.props patch | blob | history

diff --git a/src/installer/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj
index e5c915f..ae84b04 100644 (file)
--- a/src/installer/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj
+++ b/src/installer/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj
@@ -22,9 +22,9 @@
          the Microsoft.NETCore.App (RID-agnostic/identity package). -->
     <IncludeAllRuntimePackagesInPlatformManifest Condition="'$(BuildFullPlatformManifest)' == 'true'">true</IncludeAllRuntimePackagesInPlatformManifest>
   </PropertyGroup>
-  
-  
+
   <Import Project="netcoreapp1.0.props" />
+  <Import Project="netcoreapp1.1.props" />
 
   <!-- Identity / Reference package content -->
   <ItemGroup Condition="'$(PackageTargetRuntime)' == ''">
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.App/netcoreapp1.1.props b/src/installer/pkg/projects/Microsoft.NETCore.App/netcoreapp1.1.props
index 5d2eaa7..2e81d2a 100644 (file)
--- a/src/installer/pkg/projects/Microsoft.NETCore.App/netcoreapp1.1.props
+++ b/src/installer/pkg/projects/Microsoft.NETCore.App/netcoreapp1.1.props
@@ -6,9 +6,11 @@
     </NETCoreApp11Dependency>
     <NETCoreApp11Dependency Include="Microsoft.CodeAnalysis.CSharp">
       <Version>1.3.0</Version>
+      <Exclude>Compile</Exclude>
     </NETCoreApp11Dependency>
     <NETCoreApp11Dependency Include="Microsoft.CodeAnalysis.VisualBasic">
       <Version>1.3.0</Version>
+      <Exclude>Compile</Exclude>
     </NETCoreApp11Dependency>
     <NETCoreApp11Dependency Include="Microsoft.CSharp">
       <Version>4.3.0</Version>
@@ -99,6 +101,7 @@
     </NETCoreApp11Dependency>
     <NETCoreApp11Dependency Include="System.Runtime.Loader">
       <Version>4.3.0</Version>
+      <Exclude>Compile</Exclude>
     </NETCoreApp11Dependency>
     <NETCoreApp11Dependency Include="System.Security.Cryptography.Algorithms">
       <Version>4.3.0</Version>
Domain: Dotnet / Core;