Enable P2P's to determine their own compilation RID

.gitignore

@@ -181,4 +181,7 @@ project.json.template
 
 # Ignore Generated project template files 
 Project.csproj
-Project.vbproj
+Project.vbproj
+
+# VS Code
+.vscode/

DotnetCLIVersion.txt

@@ -1 +1 @@
-1.0.0-rc4-004771
+1.0.0-rc4-004828

TestAssets/TestProjects/AppWithLibraryAndRid/App/App.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <RuntimeIdentifiers>osx.10.11-x64;ubuntu.14.04-x64;win10-x64</RuntimeIdentifiers>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\LibraryWithRid\LibraryWithRid.csproj" />
+    <ProjectReference Include="..\LibraryWithRids\LibraryWithRids.csproj" />
+    <ProjectReference Include="..\LibraryWithoutRid\LibraryWithoutRid.csproj" />
+  </ItemGroup>
+
+</Project>

TestAssets/TestProjects/AppWithLibraryAndRid/App/Program.cs

@@ -0,0 +1,26 @@
+using System;
+
+namespace App
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            var libraryWithRidNativeOutput = LibraryWithRid.NativeCode.InvokeNativeCodeAndReturnAString();
+
+            var libraryWithRidsNativeOutput = LibraryWithRid.NativeCode.InvokeNativeCodeAndReturnAString();
+
+            var libraryWithRidCompileTimeRid = LibraryWithRid.NativeCode.GetRidStoredInAssemblyDescriptionAttribute();
+
+            var libraryWithRidsCompileTimeRid = LibraryWithRids.NativeCode.GetRidStoredInAssemblyDescriptionAttribute();
+
+            var libraryWithRidStatus = $"{libraryWithRidNativeOutput} {libraryWithRidCompileTimeRid}";
+
+            var libraryWithRidsStatus = $"{libraryWithRidsNativeOutput} {libraryWithRidsCompileTimeRid}";
+
+            var portableLibraryStatus = LibraryWithoutRid.PortableClass.GetHelloWorld();
+
+            Console.WriteLine($"{libraryWithRidStatus} {libraryWithRidsStatus} {portableLibraryStatus}");
+        }
+    }
+}

TestAssets/TestProjects/AppWithLibraryAndRid/LibraryWithRid/LibraryWithRid.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard1.4</TargetFramework>
+    <RuntimeIdentifier>$(TestRuntimeIdentifier)</RuntimeIdentifier>
+  </PropertyGroup>
+  <PropertyGroup>
+    <Description>'$(RuntimeIdentifier)'</Description>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="SQLite">
+      <Version>3.13.0</Version>
+    </PackageReference>
+  </ItemGroup>
+</Project>

TestAssets/TestProjects/AppWithLibraryAndRid/LibraryWithRid/LinuxNativeMethods.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace LibraryWithRid
+{
+    public static class LinuxNativeMethods
+    {
+        [DllImport("libsqlite3", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr sqlite3_libversion();
+    }
+}

TestAssets/TestProjects/AppWithLibraryAndRid/LibraryWithRid/MacNativeMethods.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace LibraryWithRid
+{
+    public static class MacNativeMethods
+    {
+        [DllImport("libsqlite3", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr sqlite3_libversion();
+    }
+}

TestAssets/TestProjects/AppWithLibraryAndRid/LibraryWithRid/NativeCode.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+namespace LibraryWithRid
+{
+    public class NativeCode
+    {
+        public static string InvokeNativeCodeAndReturnAString()
+        {
+            switch(GetRidStoredInAssemblyDescriptionAttribute())
+            {
+                case "'ubuntu.14.04-x64'":
+                    return Marshal.PtrToStringAnsi(LinuxNativeMethods.sqlite3_libversion());
+                case "'osx.10.11-x64'": 
+                    return Marshal.PtrToStringAnsi(MacNativeMethods.sqlite3_libversion());
+                case "'win10-x64'":
+                    return Marshal.PtrToStringAnsi(WindowsNativeMethods.sqlite3_libversion());
+                default:
+                    return "Unexpected RID. Cannot find sqlite3.";
+            }            
+        }
+
+        public static string GetRidStoredInAssemblyDescriptionAttribute()
+        {
+            return typeof(NativeCode)
+                .GetTypeInfo()
+                .Assembly
+                .GetCustomAttribute<AssemblyDescriptionAttribute>()
+                ?.Description;
+        }
+    }
+}

TestAssets/TestProjects/AppWithLibraryAndRid/LibraryWithRid/WindowsNativeMethods.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace LibraryWithRid
+{
+    public static class WindowsNativeMethods
+    {
+        [DllImport("sqlite3", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr sqlite3_libversion();
+    }
+}

TestAssets/TestProjects/AppWithLibraryAndRid/LibraryWithRids/LibraryWithRids.csproj

@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard1.4</TargetFramework>
+    <RuntimeIdentifiers>osx.10.11-x64;ubuntu.14.04-x64;win10-x64</RuntimeIdentifiers>
+    <Description>'$(RuntimeIdentifier)'</Description>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="SQLite">
+      <Version>3.13.0</Version>
+    </PackageReference>
+  </ItemGroup>
+</Project>

TestAssets/TestProjects/AppWithLibraryAndRid/LibraryWithRids/LinuxNativeMethods.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace LibraryWithRids
+{
+    public static class LinuxNativeMethods
+    {
+        [DllImport("libsqlite3", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr sqlite3_libversion();
+    }
+}

TestAssets/TestProjects/AppWithLibraryAndRid/LibraryWithRids/MacNativeMethods.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace LibraryWithRids
+{
+    public static class MacNativeMethods
+    {
+        [DllImport("libsqlite3", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr sqlite3_libversion();
+    }
+}

TestAssets/TestProjects/AppWithLibraryAndRid/LibraryWithRids/NativeCode.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+namespace LibraryWithRids
+{
+    public class NativeCode
+    {
+        public static string InvokeNativeCodeAndReturnAString()
+        {
+            switch(GetRidStoredInAssemblyDescriptionAttribute())
+            {
+                case "'ubuntu.14.04-x64'":
+                    return Marshal.PtrToStringAnsi(LinuxNativeMethods.sqlite3_libversion());
+                case "'osx.10.11-x64'": 
+                    return Marshal.PtrToStringAnsi(MacNativeMethods.sqlite3_libversion());
+                case "'win10-x64'":
+                    return Marshal.PtrToStringAnsi(WindowsNativeMethods.sqlite3_libversion());
+                default:
+                    return "Unexpected RID. Cannot find sqlite3.";
+            }            
+        }
+
+        public static string GetRidStoredInAssemblyDescriptionAttribute()
+        {
+            return typeof(NativeCode)
+                .GetTypeInfo()
+                .Assembly
+                .GetCustomAttribute<AssemblyDescriptionAttribute>()
+                ?.Description;
+        }
+    }
+}

TestAssets/TestProjects/AppWithLibraryAndRid/LibraryWithRids/WindowsNativeMethods.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace LibraryWithRids
+{
+    public static class WindowsNativeMethods
+    {
+        [DllImport("sqlite3", CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr sqlite3_libversion();
+    }
+}

TestAssets/TestProjects/AppWithLibraryAndRid/LibraryWithoutRid/LibraryWithoutRid.csproj

@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard1.4</TargetFramework>
+  </PropertyGroup>
+
+</Project>

TestAssets/TestProjects/AppWithLibraryAndRid/LibraryWithoutRid/PortableCode.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace LibraryWithoutRid
+{
+    public class PortableClass
+    {
+        public static string GetHelloWorld()
+        {
+            return "Hello World";
+        }
+    }
+}

build/build.proj

@@ -164,6 +164,7 @@
           DestinationFolder="$(TestsDirectory)"
           />
 
+<Message Text="$(DotNetTool) &quot;$(TestsDirectory)\xunit.console.netcore.exe&quot; &quot;@(TestAssembly, '&quot; &quot;')&quot; -xml &quot;@(XmlTestFile)&quot;" Importance="High" />
     <Exec Command="$(DotNetTool) &quot;$(TestsDirectory)\xunit.console.netcore.exe&quot; &quot;@(TestAssembly, '&quot; &quot;')&quot; -xml &quot;@(XmlTestFile)&quot;"
           LogStandardErrorAsError="true"
           WorkingDirectory="$(TestsDirectory)"

src/Tasks/Microsoft.NET.Build.Tasks/build/Microsoft.NET.Sdk.Common.targets

@@ -51,9 +51,13 @@ Copyright (c) .NET Foundation. All rights reserved.
     with the referencing project's target framework.
   ============================================================
    -->
-  <Target Name="GetTargetFrameworkProperties" Returns="TargetFramework=$(NearestTargetFramework);ProjectHasSingleTargetFramework=$(_HasSingleTargetFramework)">
+  <Target Name="GetTargetFrameworkProperties" Returns="TargetFramework=$(NearestTargetFramework);ProjectHasSingleTargetFramework=$(_HasSingleTargetFramework);ProjectIsRidAgnostic=$(_IsRidAgnostic)">
 
     <PropertyGroup>
+      <!-- indicate to caller that project is RID agnostic so that a global property RuntimeIdentifier value can be removed -->
+      <_IsRidAgnostic>false</_IsRidAgnostic>
+      <_IsRidAgnostic Condition=" '$(RuntimeIdentifier)' == '' and '$(RuntimeIdentifiers)' == '' ">true</_IsRidAgnostic>
+
       <!-- If a ReferringTargetFramework was not specified, and we only have one TargetFramework, then don't try to check compatibility -->
       <_SkipNearestTargetFrameworkResolution Condition="'$(TargetFramework)' != '' and '$(ReferringTargetFramework)' == ''">true</_SkipNearestTargetFrameworkResolution>
       <NearestTargetFramework Condition="'$(_SkipNearestTargetFrameworkResolution)' == 'true'">$(TargetFramework)</NearestTargetFramework>

test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildASelfContainedAppWithRid.cs

@@ -0,0 +1,61 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using FluentAssertions;
+using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.NET.TestFramework;
+using Microsoft.NET.TestFramework.Commands;
+using Microsoft.NET.TestFramework.Assertions;
+using System.IO;
+using Xunit;
+using static Microsoft.NET.TestFramework.Commands.MSBuildTest;
+
+namespace Microsoft.NET.Build.Tests
+{
+    public class GivenThatWeWantToBuildASelfContainedAppWithLibrariesAndRid : SdkTest
+    {
+        [Fact]
+        public void It_builds_a_RID_specific_runnable_output()
+        {
+            if (UsingFullFrameworkMSBuild)
+            {
+                //  Disable this test on full framework, as the current build won't have access to 
+                //  https://github.com/Microsoft/msbuild/pull/1674
+                //  See https://github.com/dotnet/sdk/issues/877
+                return;
+            }
+
+            var runtimeIdentifier = RuntimeEnvironment.GetRuntimeIdentifier();
+            var testAsset = _testAssetsManager
+                .CopyTestAsset("AppWithLibraryAndRid")
+                .WithSource();
+
+            var projectPath = Path.Combine(testAsset.TestRoot, "App");
+
+            var restoreCommand = new RestoreCommand(Stage0MSBuild, projectPath, "App.csproj"); 
+            restoreCommand 
+                .Execute($"/p:TestRuntimeIdentifier={runtimeIdentifier}") 
+                .Should() 
+                .Pass(); 
+
+            var buildCommand = new BuildCommand(Stage0MSBuild, projectPath);
+
+            buildCommand
+                .Execute($"/p:RuntimeIdentifier={runtimeIdentifier}", $"/p:TestRuntimeIdentifier={runtimeIdentifier}")
+                .Should()
+                .Pass();
+
+            var outputDirectory = buildCommand.GetOutputDirectory("netcoreapp1.0");
+            var selfContainedExecutable = $"App{Constants.ExeSuffix}";
+
+            Command.Create(Path.Combine(outputDirectory.FullName, selfContainedExecutable), new string[] { })
+                .CaptureStdOut()
+                .Execute()
+                .Should()
+                .Pass()
+                .And
+                .HaveStdOutContaining($"3.13.0 '{runtimeIdentifier}' 3.13.0 '{runtimeIdentifier}' Hello World");
+        }
+    }
+}