-
Notifications
You must be signed in to change notification settings - Fork 688
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.
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
Remove netstandard1.x dependencies in source-build #5885
Changes from 1 commit
86fe217
0951823
1a438ee
00d8bd3
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
<Project Sdk="Microsoft.NET.Sdk"> | ||
|
||
<PropertyGroup> | ||
<TargetFrameworks>$(TargetFrameworksLibrary)</TargetFrameworks> | ||
<TargetFrameworks>$(TargetFrameworksExe)</TargetFrameworks> | ||
<NoWarn>$(NoWarn);CS1591</NoWarn> | ||
<AssemblyName>NuGet.Build.Tasks.Pack</AssemblyName> | ||
<RootNamespace>$(AssemblyName)</RootNamespace> | ||
|
@@ -41,7 +41,7 @@ | |
<None Include="$(BuildCommonDirectory)NOTICES.txt" Pack="true" PackagePath="\" /> | ||
</ItemGroup> | ||
|
||
<ItemGroup Condition=" '$(TargetFramework)' != '$(NETFXTargetFramework)' "> | ||
<ItemGroup Condition=" '$(TargetFramework)' == '$(NETCoreTargetFramework)' "> | ||
<PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="runtime" GeneratePathProperty="true" /> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @rainersigwald is it recommended to reference the MSBuild packages on all frameworks or just on the ones where references aren't available? Asking as in L35-L36, msbuild references are used from the .NET Framework installation when targeting netfx. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The .NET Framework references are the "most compatible" option, but . . . do we really support modern Pack-in-MSBuild in Visual Studio 2010? That doesn't seem required. I would lean toward "reference the packages at the explicit lowest-supported-version for the netfx output". |
||
<PackageReference Include="Microsoft.Build.Tasks.Core" ExcludeAssets="runtime" GeneratePathProperty="true" /> | ||
<PackageReference Include="Microsoft.Build.Utilities.Core" ExcludeAssets="runtime" GeneratePathProperty="true" /> | ||
|
@@ -214,8 +214,8 @@ | |
<PropertyGroup> | ||
<!-- Build from source can't use ILMerge and XPLat builds don't run the ILmerge targets. --> | ||
<ILMergeSubpath Condition="'$(DotNetBuildSourceOnly)' != 'true' and '$(IsXPlat)' != 'true'">ilmerge\</ILMergeSubpath> | ||
<PackagePathDir Condition="'$(TargetFramework)' == '$(NETFXTargetFramework)'">Desktop/</PackagePathDir> | ||
<PackagePathDir Condition="'$(TargetFramework)' == '$(NetStandardVersion)'">CoreCLR/</PackagePathDir> | ||
<PackagePathDir Condition="'$(TargetFramework)' == '$(NETFXTargetFramework)'">netframework/</PackagePathDir> | ||
<PackagePathDir Condition="'$(TargetFramework)' == '$(NETCoreTargetFramework)'">net/</PackagePathDir> | ||
</PropertyGroup> | ||
<ItemGroup> | ||
<TfmSpecificPackageFile Include="$(OutputPath)\$(ILMergeSubpath)NuGet.Build.Tasks.Pack.dll" Condition="'$(DotNetBuildSourceOnly)' != 'true'"> | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
use TFI instead?