[main] Upgrade netcoreapp3.1 TFMs to net7.0 #9127

lbussell · 2022-04-20T17:01:07Z

I have switched all of the netcoreapp3.1 TFMs to net7.0, and also removed all of the now-unnecessary source-build conditions (I think one is still needed).

eng/TargetFrameworkDefaults.props

src/Common/Microsoft.Arcade.Common.Tests/Microsoft.Arcade.Common.Tests.csproj

crummel

Agreed that it'd be nice if more of these could use the TFM property but I'm also not sure of the intricacies here.

src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj

src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props

…ld)" This reverts commit 49e11af.

This reverts commit f87cc56.

This reverts commit 1db4d43.

crummel · 2022-04-29T01:03:17Z

I'm not sure if changing the props files with file paths to use TargetFrameworkForNETSDK will work - is that something that the projects using Arcade have available in their MSBuild context?

src/Microsoft.DotNet.ApiCompat/src/build/Microsoft.DotNet.ApiCompat.targets

lbussell · 2022-05-02T19:59:13Z

@markwilkie Is there anyone else who should look at this? Feel free to add reviewers.

MichaelSimons

I am not an expert in this repo but FWIW, the changes look good from my perspective.

riarenas · 2022-05-26T17:17:21Z

I think there are a couple of things that we can do to try and figure out how this is going to impact repos:

Generate a private build of arcade and run it against the arcade-validation repo: https://github.com/dotnet/arcade/blob/main/Documentation/Policy/TestingMSBuildGuidance.md#how-to-validate-a-private-build
Use that private build to Run the validation for promotion pipeline: https://github.com/dotnet/arcade/blob/main/Documentation/Validation/Overview.md#the-process so that we validate using the private sdk from the above step against the runtime / aspnetcore and installer repositories.

This won't catch all ways in which a repo might be broken by such a wide sweeping change, but it will give us a heads up.

...icrosoft.DotNet.Build.Tasks.Workloads/src/build/Microsoft.DotNet.Build.Tasks.Workloads.props

ViktorHofer · 2022-06-20T16:09:17Z

@lbussell thanks for your continued work. Have you had a chance to perform the validation that @riarenas suggested above?

lbussell · 2022-06-20T17:10:03Z

@lbussell thanks for your continued work. Have you had a chance to perform the validation that @riarenas suggested above?

Yes, I have done the validation steps and tested out the changes on the official CI for arcade-validation, runtime, aspnetcore, installer, and fsharp, and all are passing with no changes or only minor changes related to referencing task assemblies produced by arcade.

ViktorHofer

LGTM. I most certainly expect that someone will be broken by this but this shouldn't block this going in as it's the right change. Maybe we should send out a mail to the Arcade Engineering Partners DL to make sure they are aware of the change.

I would imagine that consumers of these packages would be broken if they make assumptions about the supported tfms (which they of course shouldn't).

MichaelSimons

Thanks for your effort and persistence to improve the code vs just fixing the bare minimum.

AraHaan · 2022-06-25T10:57:31Z

src/Microsoft.DotNet.Build.Tasks.Installers/build/Microsoft.DotNet.Build.Tasks.Installers.props

@@ -1,6 +1,6 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
-    <MicrosoftDotNetBuildTasksInstallersTaskAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\netcoreapp3.1\Microsoft.DotNet.Build.Tasks.Installers.dll</MicrosoftDotNetBuildTasksInstallersTaskAssembly>


I tried this change even with the preview 5 .NET 7 SDK and it still cant load 7.0.0 of System.Runtime for this task.

@AraHaan can you please post or message to me privately a link to the failure you're describing?

Arcade upgraded to 7.0 in dotnet/arcade#9127

* Update dependencies from https://github.com/dotnet/arcade build 20220620.8 Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.22316.2 -> To Version 7.0.0-beta.22320.8 * Update dependencies from https://github.com/dotnet/arcade build 20220622.3 Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.22316.2 -> To Version 7.0.0-beta.22322.3 * Update dependencies from https://github.com/dotnet/arcade build 20220623.2 Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.22316.2 -> To Version 7.0.0-beta.22323.2 * Update dependencies from https://github.com/dotnet/arcade build 20220624.1 Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.22316.2 -> To Version 7.0.0-beta.22324.1 * Update dependencies from https://github.com/dotnet/arcade build 20220627.1 Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.22316.2 -> To Version 7.0.0-beta.22327.1 * Update dependencies from https://github.com/dotnet/arcade build 20220627.2 Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.22316.2 -> To Version 7.0.0-beta.22327.2 * Upgrade paths with TFMs to net7.0 Arcade upgraded to 7.0 in dotnet/arcade#9127 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Premek Vysoky <premek.vysoky@microsoft.com> Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>

lbussell added 3 commits April 19, 2022 14:29

retarget arcade projects to net7.0 tfm

510f582

don't build net472 version of Build.Tasks.Workloads during source build

9d4bd2b

fix incorrect 7.0 tfm

bc91aae

lbussell mentioned this pull request Apr 20, 2022

[main] Use arcade version that targets net7.0 dotnet/installer#13676

Closed

lbussell marked this pull request as ready for review April 20, 2022 18:24

lbussell requested review from alexperovich, MichaelSimons, crummel and ViktorHofer April 20, 2022 18:24

ViktorHofer reviewed Apr 20, 2022

View reviewed changes

eng/TargetFrameworkDefaults.props Outdated Show resolved Hide resolved

ViktorHofer reviewed Apr 20, 2022

View reviewed changes

src/Common/Microsoft.Arcade.Common.Tests/Microsoft.Arcade.Common.Tests.csproj Outdated Show resolved Hide resolved

crummel reviewed Apr 20, 2022

View reviewed changes

src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj Outdated Show resolved Hide resolved

src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props Outdated Show resolved Hide resolved

lbussell added 10 commits April 21, 2022 13:57

updates from code review

b8236d1

add another possible arcade logging directory (for source build)

49e11af

update to net7.0 preview 3

1db4d43

Revert "add another possible arcade logging directory (for source bui…

0d9dcdc

…ld)" This reverts commit 49e11af.

change initialize build tool framework to net7.0

b65afc0

also change build tool framework in tools ps script

f6af788

Merge remote-tracking branch 'upstream/main' into net7.0-tfm

b88968b

more updates to 7.0 preview 3

f87cc56

Revert "more updates to 7.0 preview 3"

d46523a

This reverts commit f87cc56.

Revert "update to net7.0 preview 3"

ef51e04

This reverts commit 1db4d43.

lbussell requested review from riarenas and MattGal April 27, 2022 18:56

use TargetFrameworkForNETSDK to standardize TFM across projects

d262b23

ViktorHofer reviewed Apr 29, 2022

View reviewed changes

src/Microsoft.DotNet.ApiCompat/src/build/Microsoft.DotNet.ApiCompat.targets Outdated Show resolved Hide resolved

Refine TargetFrameworkForNETSDK usage.

08c7848

MichaelSimons previously approved these changes May 4, 2022

View reviewed changes

lbussell added 2 commits May 5, 2022 17:23

Merge remote-tracking branch 'upstream/main' into net7.0-tfm

9627a60

Hardcode more target framework values

5200224

MichaelSimons mentioned this pull request May 23, 2022

Update previous source-built artifacts in 7.0 dotnet/source-build#2876

Closed

Merge branch 'main' into net7.0-tfm

a881adf

lbussell mentioned this pull request May 25, 2022

[main] Add patch that retargets arcade projects to net7.0 dotnet/installer#13874

Merged

lbussell mentioned this pull request Jun 1, 2022

Upgrade maestro tasks to multi-target net6.0 and net7.0 dotnet/arcade-services#1909

Closed

lbussell requested a review from ChadNedzlek June 1, 2022 18:15

lbussell added 3 commits June 7, 2022 17:07

Revert MaestroTasks hardcoded path

a39a29f

Add comment for Maestro.Tasks assembly reference

9073eb7

Reference net7.0 version of Build.Tasks.Workloads assembly if it exists

2a9d198

ViktorHofer reviewed Jun 8, 2022

View reviewed changes

...icrosoft.DotNet.Build.Tasks.Workloads/src/build/Microsoft.DotNet.Build.Tasks.Workloads.props Outdated Show resolved Hide resolved

lbussell added 2 commits June 13, 2022 11:55

Simplify BuildTasksWorkloads assembly references

d0090ab

Merge remote-tracking branch 'upstream/main' into net7.0-tfm

b5794ff

This comment was marked as spam.

Sign in to view

lbussell requested review from ViktorHofer, mmitche, MichaelSimons and crummel June 17, 2022 19:57

ViktorHofer approved these changes Jun 20, 2022

View reviewed changes

MichaelSimons approved these changes Jun 20, 2022

View reviewed changes

crummel approved these changes Jun 23, 2022

View reviewed changes

lbussell merged commit b8007ee into dotnet:main Jun 23, 2022

AraHaan reviewed Jun 25, 2022

View reviewed changes

akoeplinger added a commit to dotnet/runtime that referenced this pull request Jun 28, 2022

Upgrade paths with TFMs to net7.0

76efb06

Arcade upgraded to 7.0 in dotnet/arcade#9127

ViktorHofer mentioned this pull request Aug 8, 2022

Ensure build task projects work when source built #7413

Closed

1 task

ViktorHofer mentioned this pull request Jan 5, 2023

Upgrade Arcade to .NET 8 SDK and TFM #12096

Merged

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[main] Upgrade netcoreapp3.1 TFMs to net7.0 #9127

[main] Upgrade netcoreapp3.1 TFMs to net7.0 #9127

lbussell commented Apr 20, 2022

crummel left a comment

crummel commented Apr 29, 2022

lbussell commented May 2, 2022

MichaelSimons left a comment

riarenas commented May 26, 2022

This comment was marked as spam.

ViktorHofer commented Jun 20, 2022

lbussell commented Jun 20, 2022

ViktorHofer left a comment

MichaelSimons left a comment

AraHaan Jun 25, 2022

lbussell Jun 27, 2022

[main] Upgrade netcoreapp3.1 TFMs to net7.0 #9127

[main] Upgrade netcoreapp3.1 TFMs to net7.0 #9127

Conversation

lbussell commented Apr 20, 2022

crummel left a comment

Choose a reason for hiding this comment

crummel commented Apr 29, 2022

lbussell commented May 2, 2022

MichaelSimons left a comment

Choose a reason for hiding this comment

riarenas commented May 26, 2022

This comment was marked as spam.

ViktorHofer commented Jun 20, 2022

lbussell commented Jun 20, 2022

ViktorHofer left a comment

Choose a reason for hiding this comment

MichaelSimons left a comment

Choose a reason for hiding this comment

AraHaan Jun 25, 2022

Choose a reason for hiding this comment

lbussell Jun 27, 2022

Choose a reason for hiding this comment