Move remaining sample, perf, and test apps off the .NET 6 projection moniker - #11690
Open
Vineeth (vineethkuttan) wants to merge 3 commits into
Open
Move remaining sample, perf, and test apps off the .NET 6 projection moniker#11690Vineeth (vineethkuttan) wants to merge 3 commits into
Vineeth (vineethkuttan) wants to merge 3 commits into
Conversation
…ble RIDs Three projects were still pinned to $(WindowsAppSdkTargetFrameworkMoniker) with unconditional win10-* RIDs, so they stayed on .NET 6 after the samples moniker was split out. - ItemsViewIntegrationApp, XAMLPerf.UnpackagedApp.Cs.MUX: retarget to $(SamplesTargetFrameworkMoniker). - MUXTestInfra: retarget to $(DotNetCoreTargetFrameworkMoniker) so it tracks its consumer MUXControls.Test and still honours `init.cmd net6`. - Switch the above to the repo's TFM-conditional RID pattern and rename six win10-*.pubxml to win-*.pubxml, updating <PublishProfile> in lockstep. - eng/adhocapp.props: add a net8.0 AssetTargetFallback alongside net6.0, since .wapproj restore now spans both. win10-* RIDs are not in .NET 8's portable RID graph (NETSDK1083), and a <PublishProfile> name that no longer exists on disk downgrades to a silent NETSDK1198 warning, so the profile renames must accompany the RID change.
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
Contributor
Author
|
/azp run |
|
Azure Pipelines: 1 pipeline(s) were filtered out due to trigger conditions. |
microsoft-github-policy-service
Bot
added
the
needs-triage
Vineeth (vineethkuttan)
changed the title
…platform version Moving MUXTestInfra to $(DotNetCoreTargetFrameworkMoniker) changed its TargetPlatformVersion from 10.0.17763.0 to 10.0.22621.0, but the project hardcoded Microsoft.Windows.SDK.cpp 10.0.17763.4, so the package's targets failed the build: Microsoft.Windows.SDK.cpp.targets(13,5): error : Version of Uwp Package 10.0.17763.0 does not match TargetPlatformVersion 10.0.22621.0 Use $(MicrosoftWindowsSDKCppNugetPackageVersion) instead, matching MUXControls.Test. That property is parsed from packages.config, which is also the source of $(WindowsTargetPlatformVersion), so the two stay in sync by construction for both net6 and net8 builds. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
Follow-up to the
SamplesTargetFrameworkMonikersplit. Three projects weremissed and were still resolving
$(WindowsAppSdkTargetFrameworkMoniker)(.NET 6) with unconditional
win10-*RIDs.$(WindowsAppSdkTargetFrameworkMoniker)is unchanged at net6.0 — it governsthe shipped projection, so moving it would be a consumer breaking change.
Changes
Samples/ItemsViewIntegrationApp$(SamplesTargetFrameworkMoniker)perf/scenarios/XAMLPerf.UnpackagedApp.Cs.MUX$(SamplesTargetFrameworkMoniker)controls/test/testinfra/MUXTestInfra$(DotNetCoreTargetFrameworkMoniker)Samples\, rather than a flat rename, soinit.cmd net6keeps working.win10-*.pubxml→win-*.pubxml(viagit mv, rename detection intact) and updated<PublishProfile>to match.RuntimeIdentifierinside each is conditional; the filename is only alookup key, so net6 still resolves
win10-*.eng/adhocapp.props—AssetTargetFallbacknow lists net6.0 and net8.0,as packaging projects wrap both projection-floor and sample/test apps.
Note on MUXTestInfra
It uses
$(DotNetCoreTargetFrameworkMoniker), not the samples moniker.SamplesTargetFrameworkMonikeris hardcoded net8.0, butinit.cmd net6isstill supported and its consumer
MUXControls.Testuses the DotNetCoremoniker — pinning it to net8 would leave a net6 project referencing a net8
library. Same moniker as its consumer keeps them in lockstep.
Not included
MUXControlsTestApp/MUXControls.Teststill carry unconditionalwin10-*RIDs and
win10-$(Platform).pubxml. They resolve to net8 today via$(DotNetCoreTargetFrameworkMoniker), so they carry the same latentNETSDK1083 exposure, but they're outside this change's scope.
Validation
init.cmd x64chk+ build samplesinit.cmd x64chk net6+ restore, to confirm the< 8RID branch