Removing "netcoreapp" and "netfx" TargetGroup #457

Anipik · 2019-12-02T22:25:41Z

Most of the work is done using regex. The commit messages contain the regex used for that commit.
I also introduced a new variable to track the latest version of netcoreapp, making it easier to increment for later version
.sln files will need to be updated with every new major product version.

Regexs used
netcoreapp -> netcoreapp5.0 in .sln
netcoreapp; -> netcoreapp5.0; in .props
netcoreapp- -> netcoreapp5.0- in .props
netcoreapp- -> netcoreapp5.0- in .csproj
'netcoreapp -> 'netcoreapp5.0 in .csproj

netcoreapp5.0 occurences are then replaced using the above regex by TargetFrameworkVNext

Same stuff has been done for netfx

ViktorHofer · 2019-12-02T22:27:34Z

This collides with the work being done in #445. Can you either pause this until the other PR is in or use the same TFM name so that we can simply replace the property define here after the other one is in?

Anipik · 2019-12-02T22:29:45Z

Sure I can wait until the #445 is in

Directory.Build.props

src/libraries/sendtohelix.proj

ViktorHofer · 2019-12-04T15:37:29Z

We agreed on NetCoreAppCurrentTargetFrameworkMoniker (.NETCoreApp,Version=v5.0) and NetCoreAppCurrent (netcoreapp5.0) in #445.

ViktorHofer · 2019-12-05T17:24:05Z

@Anipik this work is now unblocked.

safern · 2019-12-11T19:01:47Z

eng/pipelines/libraries/build-job.yml

@@ -114,8 +114,8 @@ jobs:
          - task: CopyFiles@2
            displayName: Prepare framework runtime folder to publish
            inputs:
-              sourceFolder: $(Build.SourcesDirectory)/artifacts/bin/pkg/${{ parameters.framework }}/runtime
-              targetFolder: $(Build.ArtifactStagingDirectory)/artifacts/bin/pkg/${{ parameters.framework }}/runtime
+              sourceFolder: $(Build.SourcesDirectory)/artifacts/bin/pkg/netcoreapp5.0/runtime # The hardcoded target framework should be removed when we drop the support for versionless targetframeworks from ci.


FYI: @jkoritzinsky

src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj

src/libraries/Native/native-binplace.proj

...sts/StressTests/System.Data.SqlClient.Stress.Tests/System.Data.SqlClient.Stress.Tests.csproj

eng/packaging.props

src/libraries/Directory.Build.props

src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets

jkoritzinsky · 2019-12-12T00:39:12Z

I'd prefer if I could get #494 in before this if I can to unblock cross-cutting PRs instead of having to react to this and delaying merging #494 another day or so.

safern · 2019-12-12T00:45:44Z

I'd prefer if I could get #494 in before this if I can to unblock cross-cutting PRs

I definitely agree #494 has higher priority since that unblocks live live workflow.

Anipik · 2019-12-12T05:38:46Z

sure i can wait. let me know when i can go ahead and merge this one.

Directory.Build.props

src/libraries/Directory.Build.props

src/libraries/Directory.Build.targets

ViktorHofer · 2019-12-12T16:18:15Z

Actually I just saw in how many places we hardcode net472 and I'm not really happy about that. As we are already touching so many files as part of this PR I would introduce a property for it NetFrameworkCurrent as well as part of this PR. As this PR is currently blocked by other work we should have some time for it. I can help too.

Anipik · 2019-12-13T18:38:19Z

@ViktorHofer as we are not gonna increase the netframework version, what will be the advantages of having this new property ?

Anipik · 2019-12-13T22:11:31Z

@jkoritzinsky @safern @ViktorHofer
Do we need to add build coreclr step for the runtime-libraries enterprise-linux ?

  /repo/eng/liveBuilds.targets(20,5): error : The CoreCLR artifacts path does not exist '/repo/artifacts/bin/coreclr/Linux.x64.Debug/'. The CoreCLR subset category must be built before building this project. [/repo/src/libraries/System.AppContext/src/System.AppContext.csproj]
/repo/eng/liveBuilds.targets(20,5): error : The CoreCLR artifacts path does not exist '/repo/artifacts/bin/coreclr/Linux.x64.Debug/'. The CoreCLR subset category must be built before building this project. [/repo/src/libraries/System.Buffers/src/System.Buffers.csproj]
/repo/eng/liveBuilds.targets(20,5): error : The CoreCLR artifacts path does not exist '/repo/artifacts/bin/coreclr/Linux.x64.Debug/'. The CoreCLR subset category must be built before building this project. [/repo/src/libraries/System.Private.Uri/src/System.Private.Uri.csproj]
/repo/eng/liveBuilds.targets(20,5): error : The CoreCLR artifacts path does not exist '/repo/artifacts/bin/coreclr/Linux.x64.Debug/'. The CoreCLR subset category must be built before building this project. [/repo/src/libraries/System.Diagnostics.Debug/src/System.Diagnostics.Debug.csproj]
/repo/eng/liveBuilds.targets(20,5): error : The CoreCLR artifacts path does not exist '/repo/artifacts/bin/coreclr/Linux.x64.Debug/'. The CoreCLR subset category must be built before building this project. [/repo/src/libraries/System.Diagnostics.Contracts/src/System.Diagnostics.Contracts.csproj]
/rep

jkoritzinsky · 2019-12-13T22:53:56Z

Yes. You'll need to add a job to build coreclr for that pipeline now that live-live is enabled.

Anipik · 2019-12-14T03:13:06Z

@safern @ViktorHofer @ericstj can we go ahead and merge this one ?
linux failure is not related to this one .

davidsh · 2019-12-14T03:29:56Z

runtime-libraries enterprise-linux — #20191213.7 failed

This has been fixed already with PR #843 which was merged in the last hour.

Anipik · 2019-12-14T04:56:05Z

Thanks @davidsh

Anipik · 2019-12-14T18:42:57Z

This one is ready to go in. the merging is blocked and require an approval

Anipik added 11 commits December 2, 2019 11:50

netcoreapp -> netcoreapp5.0 in .sln files

2eeecc8

netcoreapp; -> netcoreapp5.0; , netcoreapp- to netcoreapp5.0-

9bb38a8

netcoreapp- -> netcoreapp5.0 in .csproj

cc7489a

'netcoreapp -> 'netcoreapp5.0 in .csproj

b1e889c

done with libraries sub folder

bd1891f

missed semicolon

2f70d3b

minor changes

66bfc49

netcoreapp -> netcoreapp5.0 in some extra files

fe33700

vNext target variable in configurations.props

7831a53

netcoreapp => netcoreapp5/0 in some other .props file

71b9862

netcoreapp -> vnext in .csproj

bb47f23

Anipik requested review from ViktorHofer, ericstj and safern December 2, 2019 22:25

jkotas reviewed Dec 2, 2019

View reviewed changes

Directory.Build.props Outdated Show resolved Hide resolved

maryamariyan added the area-Infrastructure label Dec 2, 2019

Anipik added 4 commits December 2, 2019 16:57

making the netcorepap framework switch work

9450fb5

fixing sendToHelix and linux build

eb62bc5

Merge branch 'master' into vnext

ff73c41

TargetFrameworkVNext -> netcoreappCurrent

e9839b0

safern reviewed Dec 3, 2019

View reviewed changes

src/libraries/sendtohelix.proj Outdated Show resolved Hide resolved

Anipik added 5 commits December 5, 2019 14:32

Merge branch 'master' into vnext

b25e16e

case correct netcoreappcurrent

04f85e3

fixing send to helix zip path

731d5fb

netfx -> net472 in .sln

41a8482

netfx; -> net472; in .props

b0fca9a

safern reviewed Dec 11, 2019

View reviewed changes

src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj Outdated Show resolved Hide resolved

safern reviewed Dec 11, 2019

View reviewed changes

src/libraries/Native/native-binplace.proj Outdated Show resolved Hide resolved

safern reviewed Dec 11, 2019

View reviewed changes

...sts/StressTests/System.Data.SqlClient.Stress.Tests/System.Data.SqlClient.Stress.Tests.csproj Outdated Show resolved Hide resolved

ViktorHofer reviewed Dec 11, 2019

View reviewed changes

eng/packaging.props Outdated Show resolved Hide resolved

ViktorHofer reviewed Dec 11, 2019

View reviewed changes

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

feedback and override corefx path corrected in installers

4e7f2ca

safern reviewed Dec 12, 2019

View reviewed changes

src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets Outdated Show resolved Hide resolved

ViktorHofer reviewed Dec 12, 2019

View reviewed changes

Directory.Build.props Outdated Show resolved Hide resolved

ViktorHofer reviewed Dec 12, 2019

View reviewed changes

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

ViktorHofer reviewed Dec 12, 2019

View reviewed changes

src/libraries/Directory.Build.targets Outdated Show resolved Hide resolved

remaing netcoreapp5.0 changes done

5d53653

Anipik added 3 commits December 13, 2019 10:43

Merge branch 'master' into vnext

b1ca85f

netcoreapp-> netcoreapp5.0 after live builds

596aa19

net472 -> netframeworkcurrent

f040d5c

safern approved these changes Dec 14, 2019

View reviewed changes

Anipik merged commit 3b9abae into dotnet:master Dec 14, 2019

Anipik deleted the vnext branch February 24, 2020 23:37

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Removing "netcoreapp" and "netfx" TargetGroup #457

Removing "netcoreapp" and "netfx" TargetGroup #457

Anipik commented Dec 2, 2019 •

edited

Loading

ViktorHofer commented Dec 2, 2019

Anipik commented Dec 2, 2019

ViktorHofer commented Dec 4, 2019

ViktorHofer commented Dec 5, 2019

safern Dec 11, 2019

jkoritzinsky commented Dec 12, 2019

safern commented Dec 12, 2019

Anipik commented Dec 12, 2019

ViktorHofer commented Dec 12, 2019

Anipik commented Dec 13, 2019

Anipik commented Dec 13, 2019

jkoritzinsky commented Dec 13, 2019

Anipik commented Dec 14, 2019

davidsh commented Dec 14, 2019

Anipik commented Dec 14, 2019

Anipik commented Dec 14, 2019

Removing "netcoreapp" and "netfx" TargetGroup #457

Removing "netcoreapp" and "netfx" TargetGroup #457

Conversation

Anipik commented Dec 2, 2019 • edited Loading

ViktorHofer commented Dec 2, 2019

Anipik commented Dec 2, 2019

ViktorHofer commented Dec 4, 2019

ViktorHofer commented Dec 5, 2019

safern Dec 11, 2019

Choose a reason for hiding this comment

jkoritzinsky commented Dec 12, 2019

safern commented Dec 12, 2019

Anipik commented Dec 12, 2019

ViktorHofer commented Dec 12, 2019

Anipik commented Dec 13, 2019

Anipik commented Dec 13, 2019

jkoritzinsky commented Dec 13, 2019

Anipik commented Dec 14, 2019

davidsh commented Dec 14, 2019

Anipik commented Dec 14, 2019

Anipik commented Dec 14, 2019

Anipik commented Dec 2, 2019 •

edited

Loading