Merge pull request #3455 from dsplaisted/referencebydefault

Don't reference assemblies from targeting pack with ReferencedByDefault="false"

Author: dsplaisted

eng/restore-toolset.ps1

@@ -18,7 +18,7 @@ function InitializeCustomSDKToolset {
   InstallDotNetSharedFramework "1.0.5"
   InstallDotNetSharedFramework "1.1.2"
   InstallDotNetSharedFramework "2.1.0"
-  InstallDotNetSharedFramework "2.2.5"
+  InstallDotNetSharedFramework "2.2.6"
 
   CreateBuildEnvScript
   InstallNuget

eng/restore-toolset.sh

@@ -13,7 +13,7 @@ function InitializeCustomSDKToolset {
   InstallDotNetSharedFramework "1.0.5"
   InstallDotNetSharedFramework "1.1.2"
   InstallDotNetSharedFramework "2.1.0"
-  InstallDotNetSharedFramework "2.2.5"
+  InstallDotNetSharedFramework "2.2.6"
 }
 
 # Installs additional shared frameworks for testing purposes

global.json

@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "3.0.100-preview8-012830",
+    "dotnet": "3.0.100-preview8-013410",
     "vs-opt": {
       "version": "15.9"
     }

src/Tasks/Microsoft.NET.Build.Tasks/ResolveTargetingPackAssets.cs

@@ -192,6 +192,14 @@ private void AddReferencesFromFrameworkList(string frameworkListPath, string tar
                     }
                 }
 
+                string referencedByDefaultAttributeValue = fileElement.Attribute("ReferencedByDefault")?.Value;
+                if (referencedByDefaultAttributeValue != null &&
+                    referencedByDefaultAttributeValue.Equals("false", StringComparison.OrdinalIgnoreCase))
+                {
+                    //  Don't automatically reference this assembly if it has ReferencedByDefault="false"
+                    continue;
+                }
+
                 var dllPath = Path.Combine(targetingPackDllFolder, assemblyName + ".dll");
                 var referenceItem = CreateReferenceItem(dllPath, targetingPack);
 

src/Tests/Microsoft.NET.Build.Tests/GivenFrameworkReferences.cs

@@ -792,7 +792,7 @@ public void WindowsFormsFrameworkReference(bool selfContained)
             TestFrameworkReferenceProfiles(
                 frameworkReferences: new [] { "Microsoft.WindowsDesktop.App.WindowsForms" },
                 expectedReferenceNames: new[] { "Microsoft.Win32.Registry", "System.Windows.Forms" },
-                notExpectedReferenceNames: new[] { "System.Windows.Presentation", "WindowsFormsIntegration" },
+                notExpectedReferenceNames: new[] { "System.Windows.Presentation", "WindowsFormsIntegration", "PresentationFramework.Aero" },
                 selfContained);
         }
 
@@ -804,7 +804,7 @@ public void WPFFrameworkReference(bool selfContained)
             TestFrameworkReferenceProfiles(
                 frameworkReferences: new[] { "Microsoft.WindowsDesktop.App.WPF" },
                 expectedReferenceNames: new[] { "Microsoft.Win32.Registry", "System.Windows.Presentation" },
-                notExpectedReferenceNames: new[] { "System.Windows.Forms", "WindowsFormsIntegration" },
+                notExpectedReferenceNames: new[] { "System.Windows.Forms", "WindowsFormsIntegration", "PresentationFramework.Aero" },
                 selfContained);
         }
 
@@ -816,7 +816,7 @@ public void WindowsFormAndWPFFrameworkReference(bool selfContained)
             TestFrameworkReferenceProfiles(
                 frameworkReferences: new[] { "Microsoft.WindowsDesktop.App.WindowsForms", "Microsoft.WindowsDesktop.App.WPF" },
                 expectedReferenceNames: new[] { "Microsoft.Win32.Registry", "System.Windows.Forms", "System.Windows.Presentation" },
-                notExpectedReferenceNames: new[] { "WindowsFormsIntegration" },
+                notExpectedReferenceNames: new[] { "WindowsFormsIntegration", "PresentationFramework.Aero" },
                 selfContained);
         }
 
@@ -829,7 +829,7 @@ public void WindowsDesktopFrameworkReference(bool selfContained)
                 frameworkReferences: new[] { "Microsoft.WindowsDesktop.App" },
                 expectedReferenceNames: new[] { "Microsoft.Win32.Registry", "System.Windows.Forms",
                                                 "System.Windows.Presentation", "WindowsFormsIntegration" },
-                notExpectedReferenceNames: Enumerable.Empty<string>(),
+                notExpectedReferenceNames: new[] { "PresentationFramework.Aero" },
                 selfContained);
         }
 

src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPreserveCompilationContext.cs

@@ -70,6 +70,12 @@ public void It_publishes_the_project_with_a_refs_folder_and_correct_deps_file(st
             testAsset.Restore(Log, "TestApp");
 
             var appProjectDirectory = Path.Combine(testAsset.TestRoot, "TestApp");
+
+            var getValuesCommand = new GetValuesCommand(Log, appProjectDirectory, testProject.TargetFrameworks, "LangVersion");
+            getValuesCommand.Execute().Should().Pass();
+
+            var langVersion = getValuesCommand.GetValues().FirstOrDefault() ?? string.Empty;
+
             var publishCommand = new PublishCommand(Log, appProjectDirectory);
 
             publishCommand
@@ -114,7 +120,7 @@ public void It_publishes_the_project_with_a_refs_folder_and_correct_deps_file(st
                 }
 
                 dependencyContext.CompilationOptions.Defines.Should().BeEquivalentTo(expectedDefines);
-                dependencyContext.CompilationOptions.LanguageVersion.Should().BeOneOf("", "preview");
+                dependencyContext.CompilationOptions.LanguageVersion.Should().Be(langVersion);
                 dependencyContext.CompilationOptions.Platform.Should().Be("x86");
                 dependencyContext.CompilationOptions.Optimize.Should().Be(false);
                 dependencyContext.CompilationOptions.KeyFile.Should().Be("");