Add Microsoft.NET.Build.Extensions and corresponding DLLs in CLI layout #6794
Conversation
|
@dotnet-bot |
|
@livarcocc @ericstj @nguerrera for review. This adds the Microsoft.NET.Build.Extensions tasks and targets to the CLI layout. It gets the facades and other necessary assemblies directly from the NETStandard.Library.NETFramework package, so that we don't need to do a two-hop insertion (corefx->SDK->CLI) to update them. |
src/redist/redist.csproj
Outdated
| @@ -41,125 +41,94 @@ | |||
| </Content> | |||
| </ItemGroup> | |||
|
|
|||
| <Target Name="PublishAspNetRuntimePackageStore" | |||
| AfterTargets="CrossgenPublishDir"> | |||
| <Target Name="PublishAspNetRuntimePackageStore" AfterTargets="CrossgenPublishDir"> | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
Microsoft.DotNet.Cli.sln
Outdated
| {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Release|x64.ActiveCfg = Debug|Any CPU | ||
| {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Release|x64.Build.0 = Debug|Any CPU | ||
| {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Release|x86.ActiveCfg = Debug|Any CPU | ||
| {CACA427D-5A71-45E6-88DC-3E2DB6C4D52D}.Release|x86.Build.0 = Debug|Any CPU |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
dsplaisted
force-pushed
the
6737-Include-Build-Extensions
branch
from
e688d23
to
3a61ba1
Compare
|
Embarrassed to ask, but which repo is |
|
dotnet/sdk |
build/MSBuildExtensions.targets
Outdated
| Exclude="$(MSBuildExtensionsNuPkgPath)\msbuildExtensions\Microsoft.NET.Build.Extensions\net*\**" /> | ||
| <MSBuildExtensionsContent Include="$(MSBuildExtensionsNuPkgPath)\msbuildExtensions-ver\**\*.*" | ||
| DeploymentSubpath="$(MSBuildExtensionsVersionSubfolder)/" /> | ||
| <MSBuildExtensionsContent Include="$(NETStandardLibraryNETFrameworkNuPkgPath)\build\**\*.*" |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
|
Any tests we can add here to validate that this works from the CLI? |
|
@dasMulli See dotnet/sdk#1267 for the meta-issue tracking this work |
|
Thanks, I just forgot to look into the release/2.0.0 branch 😅 (not in master yet) |
…nsions package are excluded
… fix RestoreDependency.proj to work when SdkLayoutDirectory isn't set
|
This is failing locally for me due to microsoft/vstest#847. The CI runs look like they might be failing for a different reason (perhaps related to the PTF/ATF changes). |
|
@dsplaisted can you snap to an older version of the SDK to unblock this PR? |
|
@dotnet-bot test this please |
1 similar comment
|
@dotnet-bot test this please |
|
@dotnet-bot test CentOS7.1 x64 Debug Build |
|
@MattGertz for approval. This is another part of the work for dotnet/sdk#1286. This part of the change doesn't directly relate to Visual Studio. It takes the .NET Standard support from other repos and lays it out for the CLI install. The insertion and layout in VS will come later. Customer scenario Use a .NET Standard 2.0 library from a .NET Framework project. Bugs this fixes: Workarounds, if any n/a Risk Medium - This is hooking into the MSBuild reference pipeline, in different ways depending on the project type or how it references NuGet packages. Performance impact Low to Medium: This avoids doing work when possible, but has to inspect referenced DLLs to determine whether they depend on netstandard.dll Is this a regression from a previous update? No Root cause analysis: n/a - this is feature work How was the bug found? n/a - this is feature work |
Fixes #6737