[dotnet] Implement support for building net6.0-* apps with .NET 7. Fixes #15672. #15785

vs-mobiletools-engineering-service2 · 2022-08-26T13:36:41Z

"Backport" of #15761.

This required a few changes:

The KnownFrameworkReference now references the exact versions of the ref and
runtime packs we're shipping with the sdk pack, instead of telling the build
to use whatever version is defined in the workload.
Then in the workload we specify the latest released version of the .NET 6
for the ref and runtime packs.
Finally we add an aliased sdk pack, which points to the .NET 6 sdk pack, and
when we're building a .NET 6 TargetFramework we load this aliased sdk pack
instead of the one we're shipping with this workload.

Putting this together means that:

When we're building a .NET 7 TargetFramework, we load the sdk pack shipped
with the workload, which adds a KnownFrameworkReference which references the
ref and runtime packs with the same version as the sdk pack.
When we're building a .NET 6 TargetFramework, we load the (aliased) sdk pack
which points to the latest stable .NET 6 sdk pack. That sdk pack will add a
KnownFrameworkReference that tells the build to use the ref and runtime pack
versions specified in the workload - which are now pointing to the .NET 6
ref and runtime pack versions.

Thus we use the .NET 6 sdk, ref and runtime packs when building a .NET 6
TargetFramework, and we use the .NET 7 sdk, ref and runtime packs when
building a .NET 7 TargetFramework.

According to the workload design spec 1, this is supposed to be implemented
by using aliased ref and runtime packs, but that doesn't work due to
dotnet/sdk#26384.

There were a few other related changes:

Bump MonoTouch.Dialog and Touch.Unit to a get a version where the project
files uses 'net6.0'. This way these projects partly work as tests.
We need to remove any global nfloat usings added by any .NET 6 packs because
we implement the same functionality different in .NET 7 (and they clash).
Add a test.

Fixes #15672.

We can now use these projects with a .NET 6 TFM. New commits in migueldeicaza/MonoTouch.Dialog: * migueldeicaza/MonoTouch.Dialog@558958b Revert "[MonoTouch.Dialog] Use 'BundledNETCoreAppTargetFrameworkVersion' to specify the .NET version in the project files. (migueldeicaza/MonoTouch.Dialogspouliot/Touch.Unit#261)" * migueldeicaza/MonoTouch.Dialog@8e859cc [MonoTouch.Dialog] Use 'BundledNETCoreAppTargetFrameworkVersion' to specify the .NET version in the project files. Removed commits from migueldeicaza/MonoTouch.Dialog: * migueldeicaza/MonoTouch.Dialog@eaa2202 [MonoTouch.Dialog] Use 'BundledNETCoreAppTargetFrameworkVersion' to specify the .NET version in the project files. Diff: https://github.com/migueldeicaza/MonoTouch.Dialog/compare/eaa22021dda3969a73117959a8f638f78a565690..558958b0a2de19036cf6fdd21401573a65239017 New commits in spouliot/Touch.Unit: * xamarin/Touch.Unit@564433f Revert "[Touch.Client] Use 'BundledNETCoreAppTargetFrameworkVersion' to specify the .NET version in the project files. (xamarin/Touch.Unit#113)" * xamarin/Touch.Unit@6963a2a [TouchRunner] Flush the console before exiting. Diff: https://github.com/spouliot/Touch.Unit/compare/be3a8d0855b8291848d02c9c9d99748cb41c56c2..564433f35c8ab6b7bb0709f83e1b81a89c406956

…eworks work when building with .NET 7. Fixes dotnet#15375. The KnownFrameworkReference now references the exact versions of the ref and runtime packs we're shipping with the sdk pack, instead of telling the build to use whatever version is defined in the workload. Then in the workload we specify the latest released version of the .NET 6 for the ref and runtime packs. Finally we add an aliased sdk pack, which points to the .NET 6 sdk pack, and when we're building a .NET 6 TargetFramework we load this aliased sdk pack instead of the one we're shipping with this workload. Putting this together means that: * When we're building a .NET 7 TargetFramework, we load the sdk pack shipped with the workload, which adds a KnownFrameworkReference which references the ref and runtime packs with the same version as the sdk pack. * When we're building a .NET 6 TargetFramework, we load the (aliased) sdk pack which points to the latest stable .NET 6 sdk pack. That sdk pack will add a KnownFrameworkReference that tells the build to use the ref and runtime pack versions specified in the workload - which are now pointing to the .NET 6 ref and runtime pack versions. Thus we use the .NET 6 sdk, ref and runtime packs when building a .NET 6 TargetFramework, and we use the .NET 7 sdk, ref and runtime packs when building a .NET 7 TargetFramework. According to the workload design spec [1], this is supposed to be implemented by using aliased ref and runtime packs, but that doesn't work due to dotnet/sdk#26384. Fixes dotnet#15375. [1]: https://github.com/dotnet/designs/blob/main/accepted/2020/workloads/workload-manifest.md?rgh-link-date=2022-06-30T08%3A25%3A10Z#side-by-side-workload-pattern

… variants in there. This way a workload restore will get the .NET 7 runtime packs.

rolfbjarne · 2022-08-29T09:52:58Z

Looks like this needs a dotnet/runtime bump first:

Could not find workload 'microsoft-net-runtime-tvos-net6' extended by workload 'tvos' in manifest 'microsoft.net.sdk.tvos'

…o-net7.0

Fixes a string replacement related typo in the generated pack name for `Microsoft.@platform@.Windows.Sdk.Aliased.net7`.

…o-net7.0

This reverts commit de7e738.

vs-mobiletools-engineering-service2 · 2022-09-06T18:50:19Z

📚 [PR Build] Artifacts 📚

Packages generated

View packages

Pipeline on Agent XAMBOT-1107.Monterey'
Hash: a0250da042eedeaf4fa8ff1089b340bcd2c63a08 [PR build]

vs-mobiletools-engineering-service2 · 2022-09-06T18:56:20Z

💻 [PR Build] Tests on macOS Mac Catalina (10.15) passed 💻

✅ All tests on macOS Mac Catalina (10.15) passed.

Pipeline on Agent
Hash: a0250da042eedeaf4fa8ff1089b340bcd2c63a08 [PR build]

vs-mobiletools-engineering-service2 · 2022-09-06T18:56:52Z

✅ API diff for current PR / commit

Legacy Xamarin (No breaking changes)

iOS: vsdrops gist (No breaking changes)
tvOS: vsdrops gist (No breaking changes)
watchOS: vsdrops gist (No breaking changes)
~~macOS~~ (no change detected)

.NET (No breaking changes)

iOS: vsdrops gist (No breaking changes)
tvOS: vsdrops gist (No breaking changes)
MacCatalyst: vsdrops gist (No breaking changes)
macOS: vsdrops gist (No breaking changes)

✅ API diff vs stable

Legacy Xamarin (No breaking changes)

iOS: vsdrops gist (No breaking changes)
tvOS: vsdrops gist (No breaking changes)
watchOS: vsdrops gist (No breaking changes)
macOS: vsdrops gist (No breaking changes)

.NET (No breaking changes)

iOS: vsdrops gist (No breaking changes)
tvOS: vsdrops gist (No breaking changes)
MacCatalyst: vsdrops gist (No breaking changes)
macOS: vsdrops gist (No breaking changes)
Microsoft.iOS vs Microsoft.MacCatalyst: vsdrops gist

Legacy Xamarin (stable) vs .NET

iOS: vsdrops gist
tvOS: vsdrops gist
macOS: vsdrops gist

✅ Generator diff

Generator diff is empty

Pipeline on Agent
Hash: a0250da042eedeaf4fa8ff1089b340bcd2c63a08 [PR build]

vs-mobiletools-engineering-service2 · 2022-09-06T19:06:39Z

❌ [PR Build] Tests on macOS M1 - Mac Big Sur (11.5) failed ❌

Failed tests are:

introspection

Pipeline on Agent
Hash: a0250da042eedeaf4fa8ff1089b340bcd2c63a08 [PR build]

vs-mobiletools-engineering-service2 · 2022-09-06T21:51:54Z

🚀 [CI Build] Test results 🚀

Test results

✅ All tests passed on VSTS: simulator tests.

🎉 All 223 tests passed 🎉

Tests counts

✅ bcl: All 69 tests passed. Html Report (VSDrops) Download
✅ cecil: All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests: All 1 tests passed. Html Report (VSDrops) Download
✅ fsharp: All 7 tests passed. Html Report (VSDrops) Download
✅ framework: All 8 tests passed. Html Report (VSDrops) Download
✅ generator: All 2 tests passed. Html Report (VSDrops) Download
✅ interdependent_binding_projects: All 7 tests passed. Html Report (VSDrops) Download
✅ install_source: All 1 tests passed. Html Report (VSDrops) Download
✅ introspection: All 8 tests passed. Html Report (VSDrops) Download
✅ linker: All 65 tests passed. Html Report (VSDrops) Download
✅ mac_binding_project: All 1 tests passed. Html Report (VSDrops) Download
✅ mmp: All 2 tests passed. Html Report (VSDrops) Download
✅ mononative: All 12 tests passed. Html Report (VSDrops) Download
✅ monotouch: All 23 tests passed. Html Report (VSDrops) Download
✅ msbuild: All 2 tests passed. Html Report (VSDrops) Download
✅ mtouch: All 1 tests passed. Html Report (VSDrops) Download
✅ xammac: All 3 tests passed. Html Report (VSDrops) Download
✅ xcframework: All 8 tests passed. Html Report (VSDrops) Download
✅ xtro: All 2 tests passed. Html Report (VSDrops) Download

Pipeline on Agent
Hash: [PR build]

rolfbjarne added 7 commits August 26, 2022 13:36

[dotnet] Generate the WorkloadManifest.json files and add .net6/.net7…

61823e4

… variants in there. This way a workload restore will get the .NET 7 runtime packs.

[tests] Add test case for building a net6.0 project.

731e15a

[dotnet] Remove any global usings added by the .NET 6 SDK pack.

be73bfa

[devops] Install template packs too on bots.

b42a152

[NuGet.Config] Add temporary feed to find some newer .NET 6 packs.

2ad32b8

vs-mobiletools-engineering-service2 requested review from rolfbjarne and chamons as code owners August 26, 2022 13:36

vs-mobiletools-engineering-service2 added backported not-notes-worthy Ignore for release notes labels Aug 26, 2022

rolfbjarne changed the title ~~[net7.0] [dotnet] Make it so that 'net6.0-*' TargetFrameworks work when building with .NET 7. Fixes #15672.~~ [dotnet] Implement support for building net6.0-* apps with .NET 7. Fixes #15672. Aug 26, 2022

rolfbjarne mentioned this pull request Aug 26, 2022

[dotnet] Make it so that 'net6.0-*' TargetFrameworks work when building with .NET 7. Fixes #15672. #15469

Closed

rolfbjarne approved these changes Aug 26, 2022

View reviewed changes

rolfbjarne mentioned this pull request Aug 26, 2022

[ci] Add support to net6.0 for multi-targeting in VS #15776

Merged

dalexsoto approved these changes Aug 26, 2022

View reviewed changes

Add MSI and VS Drop changes needed for multitargeting

934f677