[workload] Update net6.0 KnownFrameworkReference #15834
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
jonathanpeppers
approved these changes
Aug 31, 2022
Comment on lines
+4
to
+9
| <KnownFrameworkReference | ||
| Update="Microsoft.$(_PlatformName)" | ||
| DefaultRuntimeFrameworkVersion="@NET6_NUGET_VERSION_NO_METADATA@" | ||
| LatestRuntimeFrameworkVersion="@NET6_NUGET_VERSION_NO_METADATA@" | ||
| TargetingPackVersion="@NET6_NUGET_VERSION_NO_METADATA@" | ||
| /> |
There was a problem hiding this comment.
This seems to match what we do in Android here:
A question for later: can we use **FromWorkload** here? That would prevent us from having to hardcode version numbers in this file.
There was a problem hiding this comment.
be careful using **FromWorkload** along with any aliasing and this appears to be updating the 6.0 version which would no longer have an entry in the manifest and so no version either
There was a problem hiding this comment.
**FromWorkload** was what got us into this mess in the first place...
pjcollins
force-pushed
the
sharedaftertarget
branch
2 times, most recently
from
0a923e5 to
686ed4f
Compare
A `Xamarin.Shared.Sdk.MultiTarget.targets` file has been added to update the ref/runtime pack versions associated with the .NET 6 SDK. This file will only be imported when using the .NET 6 SDK, and it should work around the need to add new net6 and net7 versioned aliases of the Ref and Runtime packs. Adding this file to `AfterMicrosoftNETSdkTargets` will ensure that it is imported last, after all KnownFrameworkReferences that need updating are declared.
pjcollins
force-pushed
the
sharedaftertarget
branch
from
686ed4f to
fe85dd6
Compare
|
🔥 Failed to compare API and create generator diff 🔥 Failed to update apidiff references Pipeline on Agent |
❌ [PR Build] Tests on macOS Mac Catalina (10.15) failed ❌Failed tests are:
Pipeline on Agent |
❌ [PR Build] Tests on macOS M1 - Mac Big Sur (11.5) failed ❌Failed tests are:
Pipeline on Agent |
rolfbjarne
approved these changes
Sep 1, 2022
| @@ -18,10 +18,10 @@ | |||
| Include="Microsoft.@PLATFORM@" | |||
| TargetFramework="@DOTNET_TFM@" | |||
| RuntimeFrameworkName="Microsoft.@PLATFORM@" | |||
| DefaultRuntimeFrameworkVersion="@NUGET_VERSION_NO_METADATA@" | |||
| LatestRuntimeFrameworkVersion="@NUGET_VERSION_NO_METADATA@" | |||
| DefaultRuntimeFrameworkVersion="**FromWorkload**" | |||
There was a problem hiding this comment.
I don't think this is what we want, because we end up with the same problem in .NET 8: the .NET 8 workload will point to .NET 8 packs, and we'll need to update KnownFrameworkReference again like you're doing below for the .NET 8 workload to load .NET 7 ref/runtime packs from the .NET 7 sdk packs.
OTOH this is for RC1 only, we can do something else in RC2+.
Using the exact versions makes everything work without having to update any KnownFrameworkReference.
This comment was marked as outdated.
This comment was marked as outdated.
🔥 [CI Build] Test results 🔥Test results❌ Tests failed on VSTS: simulator tests 0 tests crashed, 11 tests failed, 212 tests passed. Failures❌ bcl tests
Html Report (VSDrops) Download Successes✅ cecil: All 1 tests passed. Html Report (VSDrops) Download Pipeline on Agent |
|
Test failures are unrelated (https://github.com/xamarin/maccore/issues/2450). |
|
/sudo backport net7.0 |
|
Backport Job to branch net7.0 Created! The magic is happening here |
|
Hooray! Backport succeeded! Please see https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=6656025 for more details. |
rolfbjarne
added a commit
that referenced
this pull request
Sep 26, 2022
A `Xamarin.Shared.Sdk.MultiTarget.targets` file has been added to update the ref/runtime pack versions associated with the .NET 6 SDK. This file will ship as part of the .NET 7 SDK but only be imported when using the .NET 6 SDK. This should work around the need to add new and net7 versioned aliases of the `Ref` and `Runtime` packs. Adding this file to `AfterMicrosoftNETSdkTargets` will ensure that it is imported last, after all `KnownFrameworkReferences` that need updating are declared. Backport of #15834 Co-authored-by: Peter Collins <pecolli@microsoft.com> Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
This was referenced Sep 26, 2022
Merged
rolfbjarne
added a commit
that referenced
this pull request
Sep 27, 2022
…FrameworkReference (#16135) A `Xamarin.Shared.Sdk.MultiTarget.targets` file has been added to update the ref/runtime pack versions associated with the .NET 6 SDK. This file will ship as part of the .NET 7 SDK but only be imported when using the .NET 6 SDK. This should work around the need to add new and net7 versioned aliases of the `Ref` and `Runtime` packs. Adding this file to `AfterMicrosoftNETSdkTargets` will ensure that it is imported last, after all `KnownFrameworkReferences` that need updating are declared. Backport of #15834 Backport of #15882 Co-authored-by: Peter Collins <pecolli@microsoft.com> Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
rolfbjarne
added a commit
that referenced
this pull request
Sep 27, 2022
…kReference (#16136) A `Xamarin.Shared.Sdk.MultiTarget.targets` file has been added to update the ref/runtime pack versions associated with the .NET 6 SDK. This file will ship as part of the .NET 7 SDK but only be imported when using the .NET 6 SDK. This should work around the need to add new and net7 versioned aliases of the `Ref` and `Runtime` packs. Adding this file to `AfterMicrosoftNETSdkTargets` will ensure that it is imported last, after all `KnownFrameworkReferences` that need updating are declared. Backport of #15834 Backport of #15882 Co-authored-by: Peter Collins <pecolli@microsoft.com> Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A
Xamarin.Shared.Sdk.MultiTarget.targetsfile has been added to updatethe ref/runtime pack versions associated with the .NET 6 SDK. This file
will ship as part of the .NET 7 SDK but only be imported when using the
.NET 6 SDK. This should work around the need to add new and net7
versioned aliases of the
RefandRuntimepacks. Adding this file toAfterMicrosoftNETSdkTargetswill ensure that it is imported last,after all
KnownFrameworkReferencesthat need updating are declared.