Skip to content

Microsoft.Build: netstandard2.0 instead of netcoreapp2.0 #3126

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

Merged
rainersigwald merged 4 commits into from
Mar 23, 2018
Merged

Microsoft.Build: netstandard2.0 instead of netcoreapp2.0 #3126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0a90e2b
M.Build: netstandard2.0 instead of netcoreapp2.0
rainersigwald Mar 23, 2018
d1f9fbf
OS-specific TFs for M.Build
rainersigwald Mar 23, 2018
7c70f1a
Make netcore 2.1 references specific
rainersigwald Mar 23, 2018
fe28124
only generate ref asm for netstandard2.0, not netcoreapp2.1, for Build
rainersigwald Mar 23, 2018
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 ref/Microsoft.Build/netstandard/Microsoft.Build.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1093,7 +1093,7 @@ public enum NodeEngineShutdownReason
}
public partial class OutOfProcNode
{
public OutOfProcNode() { }
public OutOfProcNode(string clientToServerPipeHandle, string serverToClientPipeHandle) { }
public Microsoft.Build.Execution.NodeEngineShutdownReason Run(bool enableReuse, out System.Exception shutdownException) { shutdownException = default(System.Exception); throw null; }
public Microsoft.Build.Execution.NodeEngineShutdownReason Run(out System.Exception shutdownException) { shutdownException = default(System.Exception); throw null; }
}
Expand Down
13 changes: 8 additions & 5 deletions src/Build/Microsoft.Build.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(RuntimeOutputTargetFrameworks)</TargetFrameworks>
<!-- Node reuse requires an API new to .NET Core 2.1 not yet available
in .NETStandard. -->
<TargetFrameworks>netstandard2.0;netcoreapp2.1</TargetFrameworks>
Copy link
Contributor

@cdmihai cdmihai Mar 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How does this not break our netcoreapp2.0 target? I assume that one's also getting tested, right?

Copy link
Member Author

@rainersigwald rainersigwald Mar 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The netcoreapp2.0 target uses the netstandard2.0 library from here.

<TargetFrameworks Condition="'$(OsEnvironment)'=='windows'">net46;netstandard2.0;netcoreapp2.1</TargetFrameworks>
<RootNamespace>Microsoft.Build</RootNamespace>
<AssemblyName>Microsoft.Build</AssemblyName>

Expand All @@ -10,8 +13,8 @@
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>

<!-- Generate API only for the more limited .NET Core flavor. -->
<GenerateReferenceAssemblySources Condition="'$(TargetFramework)' != 'netcoreapp2.0'">true</GenerateReferenceAssemblySources>
<!-- Generate API only for the more limited .NET Core/Standard flavor. -->
<GenerateReferenceAssemblySources Condition="'$(TargetFramework)' != 'netcoreapp2.1'">true</GenerateReferenceAssemblySources>
<CreateTlb>true</CreateTlb>
<IsPackable>true</IsPackable>
<Description>This package contains the $(MSBuildProjectName) assembly which is used to create, edit, and evaluate MSBuild projects.</Description>
Expand All @@ -35,11 +38,11 @@

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'">
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.0.0" />
<PackageReference Include="System.IO.Pipes.AccessControl" Version="4.3.0" />
<PackageReference Include="System.IO.Pipes.AccessControl" Version="4.3.0" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
<PackageReference Include="System.Reflection.Metadata" Version="1.3.0" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.1.0" />
<PackageReference Include="System.Runtime.Loader" Version="4.0.0" />
<PackageReference Include="System.Security.Principal.Windows" Version="4.3.0" />
<PackageReference Include="System.Security.Principal.Windows" Version="4.3.0" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.0.1" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.6.0" />
</ItemGroup>
Expand Down