The main part here is a rework of the KnownFrameworkReference item:

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 https://github.com/dotnet/sdk/issues/26384.

We can also bump MonoTouch.Dialog and Touch.Unit, to use these projects with a .NET 6 TFM.

Fixes https://github.com/xamarin/xamarin-macios/issues/15344.

Jul 12 '22 10:07 rolfbjarne

:fire: [PR Build] Build failed :fire:

Build failed for the job 'Detect API changes'

Pipeline on Agent Hash: [PR build]

Jul 12 '22 13:07 vs-mobiletools-engineering-service2

:fire: Unable to find the contents for the comment: D:\a\1\s\change-detection\results\gh-comment.md does not exist :fire

Pipeline on Agent Hash: 8a4b90f109dfb946fd64ce1b26447a6306832335 [PR build]

Jul 12 '22 14:07 vs-mobiletools-engineering-service2

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

:white_check_mark: All tests on macOS Mac Catalina (10.15) passed.

Pipeline on Agent Hash: 8a4b90f109dfb946fd64ce1b26447a6306832335 [PR build]

Jul 12 '22 15:07 vs-mobiletools-engineering-service2

:books: [PR Build] Artifacts :books:

Packages generated

View packages

Pipeline on Agent XAMBOT-1017.Monterey Hash: 8a4b90f109dfb946fd64ce1b26447a6306832335 [PR build]

Jul 12 '22 15:07 vs-mobiletools-engineering-service2

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

Failed tests are:

linksdk
linkall
monotouch-test

Pipeline on Agent Hash: 8a4b90f109dfb946fd64ce1b26447a6306832335 [PR build]

Jul 12 '22 15:07 vs-mobiletools-engineering-service2

:fire: [CI Build] Test results :fire:

Test results

:x: Tests failed on VSTS: simulator tests

0 tests crashed, 77 tests failed, 146 tests passed.

Failures

:x: cecil tests

1 tests failed, 0 tests passed.

Cecil-based tests/NUnit: Failed (Execution failed with exit code 37)

xamarin-macios xamarin-macios copied to clipboard

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

:fire: [PR Build] Build failed :fire:

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

:books: [PR Build] Artifacts :books:

Packages generated

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

:fire: [CI Build] Test results :fire:

Test results

Failures

:x: cecil tests

:x: dotnettests tests

:x: fsharp tests

:x: framework tests

:x: generator tests

:x: interdependent_binding_projects tests

:x: introspection tests

:x: linker tests

:x: monotouch tests

:x: msbuild tests

:x: mtouch tests

:x: xcframework tests

:x: xtro tests

Successes

:books: [PR Build] Artifacts :books:

Packages generated

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

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

:fire: [CI Build] Test results :fire:

Test results

Failures

:x: bcl tests

:x: cecil tests

:x: dotnettests tests

:x: fsharp tests

:x: framework tests

:x: generator tests

:x: interdependent_binding_projects tests

:x: install_source tests

:x: introspection tests

:x: linker tests

:x: mmp tests

:x: mononative tests

:x: monotouch tests

:x: msbuild tests

:x: mtouch tests

:x: xcframework tests

:x: xtro tests

Successes

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

:books: [PR Build] Artifacts :books:

Packages generated

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

:fire: [CI Build] Test results :fire:

Test results

Failures

:x: cecil tests

:x: dotnettests tests

:x: fsharp tests

:x: framework tests

:x: generator tests

:x: interdependent_binding_projects tests

:x: introspection tests

:x: linker tests

:x: monotouch tests

:x: msbuild tests

:x: mtouch tests

:x: xcframework tests

Successes

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

:x: [PR Build] Tests on macOS Mac Catalina (10.15) failed :x:

:books: [PR Build] Artifacts :books:

Packages generated

:fire: [CI Build] Test results :fire:

Test results

Failures

:x: bcl tests

:x: cecil tests

:x: dotnettests tests

:x: fsharp tests

xamarin-macios
xamarin-macios copied to clipboard