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

Update support libraries to those that are only lib. #1582

Merged
merged 1 commit into from
Sep 14, 2017
Merged

Update support libraries to those that are only lib. #1582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion build/DependencyVersions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<NuGetVersion>4.4.0-preview1-4434</NuGetVersion>
<NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
<SystemReflectionMetadataVersion>1.4.2</SystemReflectionMetadataVersion>
<NETStandardLibraryNETFrameworkVersion>2.0.0-preview2-25405-01</NETStandardLibraryNETFrameworkVersion>
<NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-25708-01</NETStandardLibraryNETFrameworkVersion>
<XliffTasksVersion>0.2.0-beta-000042</XliffTasksVersion>
</PropertyGroup>

Expand Down
20 changes: 4 additions & 16 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 @@ -59,15 +59,6 @@ Copyright (c) .NET Foundation. All rights reserved.

<!-- if any reference depends on netstandard and it is not inbox, add references and implementation assemblies for netstandard2.0 -->
<ItemGroup Condition="'$(DependsOnNETStandard)' == 'true' AND '$(NETStandardInbox)' != 'true'">
<_NETStandardLibraryNETFrameworkReference Condition="'$(_TargetFrameworkVersionWithoutV)' &gt;= '4.7'"
Include="$(MSBuildThisFileDirectory)\net47\ref\*.dll" />
<_NETStandardLibraryNETFrameworkReference Condition="'$(_TargetFrameworkVersionWithoutV)' &gt;= '4.6.2'"
Include="$(MSBuildThisFileDirectory)\net462\ref\*.dll"
Exclude="@(_NETStandardLibraryNETFrameworkReference->'$(MSBuildThisFileDirectory)\net462\ref\%(FileName).dll')" />
<_NETStandardLibraryNETFrameworkReference Condition="'$(_TargetFrameworkVersionWithoutV)' &gt;= '4.6.1'"
Include="$(MSBuildThisFileDirectory)\net461\ref\*.dll"
Exclude="@(_NETStandardLibraryNETFrameworkReference->'$(MSBuildThisFileDirectory)\net461\ref\%(FileName).dll')" />

<_NETStandardLibraryNETFrameworkLib Condition="'$(_TargetFrameworkVersionWithoutV)' &gt;= '4.7'"
Include="$(MSBuildThisFileDirectory)\net47\lib\*.dll" />
<_NETStandardLibraryNETFrameworkLib Condition="'$(_TargetFrameworkVersionWithoutV)' &gt;= '4.6.2'"
Expand All @@ -83,15 +74,12 @@ Copyright (c) .NET Foundation. All rights reserved.
Simple references can also come from NuGet framework assemblies, hence this statement should occur after
including all computed references, thus this target is scheduled after references have been raised by NuGet
targets. -->
<Reference Remove="%(_NETStandardLibraryNETFrameworkReference.FileName)" />
<Reference Remove="%(_NETStandardLibraryNETFrameworkLib.FileName)" />

<Reference Include="@(_NETStandardLibraryNETFrameworkReference)">
<Private>false</Private>
<Reference Include="@(_NETStandardLibraryNETFrameworkLib)">
<!-- netfx.force.conflicts is only needed at compile time. -->
<Private Condition="'%(FileName)' == 'netfx.force.conflicts'">false</Private>
</Reference>

<ReferenceCopyLocalPaths Include="@(_NETStandardLibraryNETFrameworkLib)">
<Private>false</Private>
</ReferenceCopyLocalPaths>
</ItemGroup>
</Target>
</Project>
2 changes: 1 addition & 1 deletion test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopExeWtihNetStandardLib.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ public void It_does_not_include_netstandard_when_inbox(bool isSdk)
// Add a target that replaces the facade folder with the set of netstandard support assemblies
// this can be replaced by targeting the version of .NETFramework that includes netstandard inbox,
// once available
var facadesDir = Path.Combine(RepoInfo.BuildExtensionsMSBuildPath, "net461", "ref\\");
var facadesDir = Path.Combine(RepoInfo.BuildExtensionsMSBuildPath, "net461", "lib\\");
var ns = project.Root.Name.Namespace;
var target = new XElement(ns + "Target",
new XAttribute("Name", "ReplaceDesignTimeFacadeDirectories"),
Expand Down