Change netcoreapp5.0 to net5.0 #35176

ViktorHofer · 2020-04-19T09:52:59Z

No Merge. Part of batched rollout in May: #35202

Contributes towards dotnet/sdk#10756
Requires dotnet/arcade#5292

I will create a doc after merging this which describes when to use which condition. Basically the recommendation is:

Use an equality check if the TargetFramework isn't overloaded with the OS portion.
Use a StartsWith when you want to test for .NETStandard or .NETFramework
Use a StartsWith if the TargetFramework is overloaded with the OS portion.
Use negations if that makes the conditions easier.

cc @ericstj

ghost · 2020-04-19T09:53:07Z

Tagging subscribers to this area: @ViktorHofer
Notify danmosemsft if you want to be subscribed.

src/libraries/shims/ApiCompat.proj

Anipik · 2020-04-19T17:36:15Z

We will need to change our custom parsing for the designTimeBuilds as well.

src/libraries/Directory.Build.props

ViktorHofer · 2020-04-20T16:52:27Z

We will need to change our custom parsing for the designTimeBuilds as well.

Master already has the net5.0 parsing logic: https://github.com/dotnet/runtime/blob/master/src/libraries/intellisense.targets#L42-L54, dotnet/sdk@0f5fc4b

src/coreclr/src/tools/crossgen2/crossgen2/crossgen2.csproj

src/libraries/shims/ApiCompat.proj

src/libraries/targetframework.props

safern · 2020-05-04T18:21:51Z

...s/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj

@@ -16,7 +16,7 @@
    <Reference Include="System.Text.Json" />
  </ItemGroup>

-  <ItemGroup Condition="$(TargetFramework.StartsWith('netcoreapp'))">
+  <ItemGroup Condition="$(TargetFramework.StartsWith('$(NetCoreAppCurrent)'))">


Should this instead test for equality?

No, because the TargetFramework is overloaded with the OS: netcoreapp5.0-Windows_NT.
I will create a doc after merging this which describes when to use what. Basically the recommendation is:

Use an equality check if the TargetFramework isn't overloaded with the OS portion.

Use a StartsWith when you want to test for multiple .NETStandard or .NETFramework versions

Use a StartsWith if the TargetFramework is overloaded with the OS portion.

Use negations if that makes the conditions easier.

src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj

ahsonkhan · 2020-05-06T00:47:41Z

src/libraries/System.Text.Json/src/System.Text.Json.csproj

@@ -14,8 +14,8 @@
  <PropertyGroup>
    <!-- For the inbox library (that is shipping with the product), this should always be true. -->
    <!-- BUILDING_INBOX_LIBRARY is only false when building the netstandard compatible NuGet package. -->
-    <DefineConstants Condition="$(TargetFramework.StartsWith('netcoreapp'))">$(DefineConstants);BUILDING_INBOX_LIBRARY</DefineConstants>
-    <NoWarn Condition="!$(TargetFramework.StartsWith('netcoreapp'))">$(NoWarn);nullable</NoWarn>   
+    <DefineConstants Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)' or '$(TargetFramework)' == 'netcoreapp3.0'">$(DefineConstants);BUILDING_INBOX_LIBRARY</DefineConstants>


What about netcoreapp3.1?

We don’t build System.Text.Json for netcoreapp3.1 and we shouldn’t need as it has been inbox since netcoreapp3.0.

Also it seems like we shouldn’t need to cross build System.Text.Json for netcoreapp3.0 since it is inbox and the package should just contain an inbox placeholder:

https://github.com/dotnet/runtime/blob/master/src/libraries/pkg/baseline/packageIndex.json#L6253

We should do a pass over all our OOBs at some point and make sure that we only build what's actually necessary. This will help us keep our build configuration and conditions sane.

ghost · 2020-05-06T11:15:46Z

Hello @ViktorHofer!

Because this pull request has the auto-merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (`@msftbot`) and give me an instruction to get started! Learn more here.

ViktorHofer requested a review from a team April 19, 2020 09:52

ViktorHofer requested review from akoeplinger, EgorBo, imhameed, marek-safar, SamMonoRT, steveisok and vargaz as code owners April 19, 2020 09:52

ViktorHofer self-assigned this Apr 19, 2020

Dotnet-GitSync-Bot added the area-Infrastructure label Apr 19, 2020

ViktorHofer force-pushed the Net5.0 branch from cdf34f1 to 54523fc Compare April 19, 2020 10:56

Anipik reviewed Apr 19, 2020

View reviewed changes

src/libraries/shims/ApiCompat.proj Outdated Show resolved Hide resolved

Anipik reviewed Apr 19, 2020

View reviewed changes

src/libraries/Directory.Build.props Show resolved Hide resolved

ViktorHofer mentioned this pull request Apr 20, 2020

Infrastructure - Rollout (May 2020) #35202

Closed

ViktorHofer added the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Apr 20, 2020

safern reviewed Apr 20, 2020

View reviewed changes

src/coreclr/src/tools/crossgen2/crossgen2/crossgen2.csproj Show resolved Hide resolved

safern reviewed Apr 20, 2020

View reviewed changes

src/libraries/shims/ApiCompat.proj Show resolved Hide resolved

safern reviewed Apr 20, 2020

View reviewed changes

src/libraries/targetframework.props Outdated Show resolved Hide resolved

jaredpar mentioned this pull request Apr 21, 2020

Builds legs getting abandoned due to agent notification issues #35223

Closed

0x53A mentioned this pull request Apr 24, 2020

Microsoft is changing netcoreapp5.0 to net5.0 fsprojects/Paket#3834

Closed

ViktorHofer mentioned this pull request Apr 28, 2020

Remove Targets* instances from .props files #35353

Merged

dougbu mentioned this pull request May 1, 2020

Update .NET Core Sdk version dotnet/razor#1692

Closed

ViktorHofer force-pushed the Net5.0 branch from 33eaf3b to 91b87be Compare May 3, 2020 16:20

ViktorHofer removed request for vargaz, marek-safar, steveisok and EgorBo May 3, 2020 16:26

safern approved these changes May 4, 2020

View reviewed changes

ViktorHofer force-pushed the Net5.0 branch from e0deded to f0a328a Compare May 4, 2020 18:07

ViktorHofer requested review from ahsonkhan, jozkee, layomia and steveharter as code owners May 4, 2020 18:07

safern reviewed May 4, 2020

View reviewed changes

src/libraries/Microsoft.Win32.SystemEvents/src/Microsoft.Win32.SystemEvents.csproj Show resolved Hide resolved

ViktorHofer removed request for ahsonkhan, jozkee, layomia and steveharter May 4, 2020 18:42

ViktorHofer mentioned this pull request May 5, 2020

Update arcade netcoreapp5.0 mentions to net5.0 dotnet/arcade#5415

Merged

ahsonkhan reviewed May 6, 2020

View reviewed changes

ViktorHofer added 8 commits May 6, 2020 12:32

Change netcoreapp5.0 to net5.0

57dbab3

Remove tfm downgrades

29eccc8

Fix ApiCompat baseline file selection and cleanup

c3fe5ac

Rename MatchingRefApiCompatBaseline

a2a1f5c

Rename S.R.CS.Unsfae include folder

a299e8c

Update installer tfm to net5.0

91ebc61

React to Targets* removal change

16c260a

Add comment in ApiCompat target

4a73520

ViktorHofer force-pushed the Net5.0 branch from f26ecce to 4a73520 Compare May 6, 2020 10:33

ViktorHofer added auto-merge and removed NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) labels May 6, 2020

ViktorHofer merged commit 000046f into dotnet:master May 6, 2020

ViktorHofer deleted the Net5.0 branch May 6, 2020 11:53

safern mentioned this pull request May 6, 2020

Test failure: Assertion failed '(jitIntrinsic->gtSIMDSize == 12) || (jitIntrinsic->gtSIMDSize == 16)' #35877

Closed

ghost locked as resolved and limited conversation to collaborators Dec 9, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Change netcoreapp5.0 to net5.0 #35176

Change netcoreapp5.0 to net5.0 #35176

ViktorHofer commented Apr 19, 2020 •

edited

Loading

ghost commented Apr 19, 2020

Anipik commented Apr 19, 2020

ViktorHofer commented Apr 20, 2020

safern May 4, 2020

ViktorHofer May 4, 2020 •

edited

Loading

ahsonkhan May 6, 2020

safern May 6, 2020

ViktorHofer May 6, 2020

ghost commented May 6, 2020

Change netcoreapp5.0 to net5.0 #35176

Change netcoreapp5.0 to net5.0 #35176

Conversation

ViktorHofer commented Apr 19, 2020 • edited Loading

ghost commented Apr 19, 2020

Anipik commented Apr 19, 2020

ViktorHofer commented Apr 20, 2020

safern May 4, 2020

Choose a reason for hiding this comment

ViktorHofer May 4, 2020 • edited Loading

Choose a reason for hiding this comment

ahsonkhan May 6, 2020

Choose a reason for hiding this comment

safern May 6, 2020

Choose a reason for hiding this comment

ViktorHofer May 6, 2020

Choose a reason for hiding this comment

ghost commented May 6, 2020

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

ViktorHofer commented Apr 19, 2020 •

edited

Loading

ViktorHofer May 4, 2020 •

edited

Loading

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (`@msftbot`) and give me an instruction to get started! Learn more here.