Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use .NET Standard facades without reference assembly bit set #1612

Merged
merged 6 commits into from
Oct 10, 2017
Merged

Use .NET Standard facades without reference assembly bit set #1612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
540d71f
Revert "Update support libraries to those that are only lib."
dsplaisted Sep 26, 2017
c2cf289
Update preserve compilation context test to use correct method of bri…
dsplaisted Sep 27, 2017
589e651
Revert "Revert "Update support libraries to those that are only lib.""
dsplaisted Sep 27, 2017
5b9260c
Provide .NET Standard facades as seperate lists of ref and runtime as…
dsplaisted Sep 27, 2017
e8ed8cf
Add comments explaining .NET Standard facade injection
dsplaisted Sep 27, 2017
977128f
Merge remote-tracking branch 'upstream/release/15.5' into fix-facades
dsplaisted Oct 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions ...rosoft/Microsoft.NET.Build.Extensions/Microsoft.NET.Build.Extensions.NETFramework.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,28 @@ Copyright (c) .NET Foundation. All rights reserved.
targets. -->
<Reference Remove="%(_NETStandardLibraryNETFrameworkLib.FileName)" />

<Reference Include="@(_NETStandardLibraryNETFrameworkLib)">
<!-- netfx.force.conflicts is only needed at compile time. -->
<Private Condition="'%(FileName)' == 'netfx.force.conflicts'">false</Private>
<!-- Put each facade assembly in two separate items: Reference with Private set to false, which means it won't be
copied locally, and ReferenceCopyLocalPaths, which will be copied locally. The reason for this split is to
workaround https://github.com/dotnet/core-setup/issues/2981 by ensuring that the facades are written
to the deps.json with a type of "referenceassembly" instead of "reference".

The exception is netfx.force.conflicts.dll, which shouldn't be copied local. So it isn't included in
ReferenceCopyLocalPaths.

When we add the Reference items, we use the simple name as the ItemSpec, and refer to the full path
to the DLL via the HintPath metadata. This is so that if we're replacing a simple Reference,
the OriginalItemSpec of the resolved reference will match to the Reference that was replaced,
and VS won't show a warning icon on the reference. See https://github.com/dotnet/sdk/issues/1499
-->

<Reference Include="@(_NETStandardLibraryNETFrameworkLib.FileName)">
<HintPath>%(_NETStandardLibraryNETFrameworkLib.Identity)</HintPath>
<Private>false</Private>
</Reference>

<ReferenceCopyLocalPaths Include="@(_NETStandardLibraryNETFrameworkLib)" Condition="'%(FileName)' != 'netfx.force.conflicts'">
<Private>false</Private>
</ReferenceCopyLocalPaths>
</ItemGroup>
</Target>
</Project>
14 changes: 12 additions & 2 deletions test/Microsoft.NET.Build.Tests/GivenThatWeWantToPreserveCompilationContextForBuild.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,16 @@ public void It_supports_copylocal_false_references()
};

testProject.AdditionalProperties.Add("PreserveCompilationContext", "true");
testProject.PackageReferences.Add(new TestPackageReference("NETStandard.Library.NETFramework", "2.0.0-preview2-25330-01", null));

var testReference = new TestProject()
{
Name = "NetStandardLibrary",
TargetFrameworks = "netstandard2.0",
IsSdkProject = true,
IsExe = false
};

testProject.ReferencedProjects.Add(testReference);

var testAsset = _testAssetsManager.CreateTestProject(testProject)
.Restore(Log, testProject.Name);
Expand All @@ -59,7 +68,8 @@ public void It_supports_copylocal_false_references()
.Select(a => a.Split('/').Last())
.ToList();

compileLibraryAssemblyNames.Should().BeEquivalentTo(Net461CompileAssemblies);
compileLibraryAssemblyNames.Should().BeEquivalentTo(
Net461CompileAssemblies.Concat(new[] { testReference.Name + ".dll" }));
}
}

Expand Down