Add the FX_RESOLUTION Runtime property

src/installer/corehost/cli/fxr/fx_muxer.cpp

@@ -1057,4 +1057,4 @@ int fx_muxer_t::handle_cli(
     }
 
     return result;
-}
+}

src/installer/corehost/cli/fxr/fx_resolver.messages.cpp

@@ -156,4 +156,4 @@ void fx_resolver_t::display_incompatible_loaded_framework_error(
 void fx_resolver_t::display_missing_loaded_framework_error(const pal::string_t& fx_name)
 {
     trace::error(_X("The specified framework '%s' is not present in the previously loaded runtime."), fx_name.c_str());
-}
+}

src/installer/corehost/cli/hostpolicy/coreclr.cpp

@@ -203,7 +203,8 @@ namespace
         _X("JIT_PATH"),
         _X("STARTUP_HOOKS"),
         _X("APP_PATHS"),
-        _X("APP_NI_PATHS")
+        _X("APP_NI_PATHS"),
+        _X("RESOLVED_FRAMEWORKS")
     };
 
     static_assert((sizeof(PropertyNameMapping) / sizeof(*PropertyNameMapping)) == static_cast<size_t>(common_property::Last), "Invalid property count");

src/installer/corehost/cli/hostpolicy/coreclr.h

@@ -67,6 +67,7 @@ enum class common_property
     StartUpHooks,
     AppPaths,
     AppNIPaths,
+    ResolvedFrameworks,
 
     // Sentinel value - new values should be defined above
     Last

src/installer/corehost/cli/hostpolicy/hostpolicy_context.cpp

@@ -114,15 +114,38 @@ int hostpolicy_context_t::initialize(hostpolicy_init_t &hostpolicy_init, const a
     fx_definition_vector_t::iterator fx_end;
     resolver.get_app_fx_definition_range(&fx_begin, &fx_end);
 
+    pal::string_t resolved_frameworks;
     pal::string_t app_context_deps_str;
-    fx_definition_vector_t::iterator fx_curr = fx_begin;
-    while (fx_curr != fx_end)
+    bool is_app = host_mode != host_mode_t::libhost;
+
+    for (const auto& fx : fx_definitions)
     {
-        if (fx_curr != fx_begin)
+        if (!app_context_deps_str.empty())
+        {
             app_context_deps_str += _X(';');
+        }
 
-        app_context_deps_str += (*fx_curr)->get_deps_file();
-        ++fx_curr;
+        app_context_deps_str += fx->get_deps_file();
+
+        if (!resolved_frameworks.empty())
+        {
+            resolved_frameworks += _X(';');
+        }
+
+        if (is_app)
+        {
+            // The first framework entry is skipped, because it corresponds to the app itself.
+            is_app = false;
+        }
+        else
+        {
+            resolved_frameworks += _X("Framework:");
+            resolved_frameworks += fx->get_name();
+            resolved_frameworks += _X(",Requested:");
+            resolved_frameworks += fx->get_requested_version();
+            resolved_frameworks += _X(",Resolved:");
+            resolved_frameworks += fx->get_found_version();
+        }
     }
 
     pal::string_t clr_library_version;
@@ -145,6 +168,7 @@ int hostpolicy_context_t::initialize(hostpolicy_init_t &hostpolicy_init, const a
     coreclr_properties.add(common_property::FxDepsFile, fx_deps_str.c_str());
     coreclr_properties.add(common_property::ProbingDirectories, resolver.get_lookup_probe_directories().c_str());
     coreclr_properties.add(common_property::FxProductVersion, clr_library_version.c_str());
+    coreclr_properties.add(common_property::ResolvedFrameworks, resolved_frameworks.c_str());
 
     if (!clrjit_path.empty())
         coreclr_properties.add(common_property::JitPath, clrjit_path.c_str());

src/installer/test/Assets/TestProjects/PortableApp21/Directory.Build.props

@@ -0,0 +1,10 @@
+<Project>
+
+  <!-- This project targets a released verison of .net core, don't use workaround. -->
+  <PropertyGroup>
+    <UseMicrosoftNETCoreAppInternalWorkaround>false</UseMicrosoftNETCoreAppInternalWorkaround>
+  </PropertyGroup>
+
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
+
+</Project>

src/installer/test/Assets/TestProjects/PortableApp21/PortableApp21.csproj

@@ -0,0 +1,14 @@
+<Project>
+
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+
+  <PropertyGroup>
+    <AssemblyName>PortableApp</AssemblyName>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <RuntimeFrameworkVersion>$(MNAVersion)</RuntimeFrameworkVersion>
+  </PropertyGroup>
+
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+
+</Project>

src/installer/test/Assets/TestProjects/PortableApp21/Program.cs

@@ -0,0 +1,18 @@
+using System;
+
+namespace PortableApp
+{
+    public static class Program
+    {
+        public static void Main(string[] args)
+        {
+            Console.WriteLine("Hello World!");
+            Console.WriteLine($"RESOLVED_FRAMEWORKS = {GetRuntimePropertiesFromAppDomain()}");
+        }
+
+        private static string GetRuntimePropertiesFromAppDomain()
+        {
+            return System.AppDomain.CurrentDomain.GetData("RESOLVED_FRAMEWORKS") as string;
+        }
+    }
+}

src/installer/test/Assets/TestProjects/StandaloneApp20/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
 
-  <!-- This project isn't 3.0, don't use workaround. -->
+  <!-- This project targets a released verison of .net core, don't use workaround. -->
   <PropertyGroup>
     <UseMicrosoftNETCoreAppInternalWorkaround>false</UseMicrosoftNETCoreAppInternalWorkaround>
   </PropertyGroup>

src/installer/test/Assets/TestProjects/StandaloneApp20/StandaloneApp20.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	<AssemblyName>StandaloneApp</AssemblyName>
+    <AssemblyName>StandaloneApp</AssemblyName>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeIdentifier>$(TestTargetRid)</RuntimeIdentifier>

src/installer/test/Assets/TestProjects/StandaloneApp21/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
 
-  <!-- This project isn't 3.0, don't use workaround. -->
+  <!-- This project targets a released verison of .net core, don't use workaround. -->
   <PropertyGroup>
     <UseMicrosoftNETCoreAppInternalWorkaround>false</UseMicrosoftNETCoreAppInternalWorkaround>
   </PropertyGroup>

src/installer/test/Assets/TestProjects/StandaloneApp21/StandaloneApp21.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	<AssemblyName>StandaloneApp</AssemblyName>
+    <AssemblyName>StandaloneApp</AssemblyName>
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeIdentifier>$(TestTargetRid)</RuntimeIdentifier>

src/installer/test/HostActivation.Tests/FrameworkResolution/ResolvedFrameworksProperty.cs

@@ -0,0 +1,75 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using Xunit;
+
+namespace Microsoft.DotNet.CoreSetup.Test.HostActivation
+{
+    public class ResolvedFrameworksProperty : IClassFixture<ResolvedFrameworksProperty.SharedTestState>
+    {
+        private readonly SharedTestState sharedTestState;
+
+        public ResolvedFrameworksProperty(SharedTestState fixture)
+        {
+            sharedTestState = fixture;
+        }
+
+        [Fact]
+        public void ResolvedFrameworksPropertyIsEmptyForStandaloneApps()
+        {
+            var fixture = sharedTestState.StandaloneApp.Copy();
+            var dotnet = fixture.BuiltDotnet;
+            var appDll = fixture.TestProject.AppDll;
+
+            dotnet.Exec(appDll)
+                .EnableTracingAndCaptureOutputs()
+                .Execute()
+                .Should()
+                .Pass()
+                .And
+                .HaveStdErrContaining($"Property RESOLVED_FRAMEWORKS = \r\n");
+        }
+
+        [Fact]
+        public void ResolvedFrameworksPropertyIsComputedForPortableApps()
+        {
+            var fixture = sharedTestState.PortableApp.Copy();
+            var dotnet = fixture.BuiltDotnet;
+            var appDll = fixture.TestProject.AppDll;
+            var MNAversion = sharedTestState.RepoDirectories.MicrosoftNETCoreAppVersion;
+
+            dotnet.Exec(appDll)
+                .EnableTracingAndCaptureOutputs()
+                .Execute()
+                .Should()
+                .Pass()
+                .And
+                .HaveStdErrContaining($"Property RESOLVED_FRAMEWORKS = Framework:Microsoft.NETCore.App,Requested:{"2.1.0"},Resolved:{MNAversion}\r\n");
+        }
+
+        public class SharedTestState : IDisposable
+        {
+            public RepoDirectoriesProvider RepoDirectories { get; }
+            public TestProjectFixture PortableApp { get; }
+            public TestProjectFixture StandaloneApp { get; }
+            public SharedTestState()
+            {
+                RepoDirectories = new RepoDirectoriesProvider(microsoftNETCoreAppVersion: "2.1.0");
+                var rid = RepoDirectories.TargetRID;
+                StandaloneApp = new TestProjectFixture("StandaloneApp", RepoDirectories)
+                    .BuildProject(runtime: rid, restore: true);
+
+                PortableApp = new TestProjectFixture("PortableApp21", RepoDirectories, framework: "netcoreapp2.1", assemblyName: "PortableApp")
+                    .BuildProject(restore: true);
+            }
+
+            public void Dispose()
+            {
+                PortableApp.Dispose();
+                StandaloneApp.Dispose();
+            }
+        }
+    }
+}

src/installer/test/TestUtils/TestProjectFixture.cs

@@ -131,7 +131,8 @@ public TestProjectFixture BuildProject(
             DotNetCli dotnet = null,
             string runtime = null,
             string framework = null,
-            string outputDirectory = null)
+            string outputDirectory = null,
+            bool restore = false)
         {
             dotnet = dotnet ?? SdkDotnet;
             outputDirectory = outputDirectory ?? TestProject.OutputDirectory;
@@ -141,10 +142,14 @@ public TestProjectFixture BuildProject(
 
             var buildArgs = new List<string>
             {
-                "--no-restore",
                 "/bl:BuildProject.binlog"
             };
 
+            if (restore != true)
+            {
+                buildArgs.Add("--no-restore");
+            }
+
             if (runtime != null)
             {
                 buildArgs.Add("--runtime");