Fix FXVersion manifest version bug

[sfoslund]

Fixes #17567

[dotnet-issue-labeler]

I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label.

[dsplaisted]

Actually, I hit the same thing and fixed it (I think) for 5.0.300 in #17329. So you may just want to merge the 5.0.3xx changes forward. Also take a look at the difference between the fixes, it looks like we're handling the build number differently.

[sfoslund]

It looks like main does contain those commits but somehow the changes got lost in places (maybe a bad merge?). I'll fix the build difference but otherwise main seems to have the changes from #17329

[dsplaisted]

I had also added test coverage which seems to have gotten lost. Maybe you could try re-cherrypicking those commits?

[sfoslund]

Maybe you could try re-cherrypicking those commits?

Sure, just pushed those instead of my changes

[sfoslund]

StdOut:
MSBuild auto-detection: using msbuild version '16.10.0.18105' from 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Preview\MSBuild\Current\bin'.
StdErr:
C:\h\w\B44909B0\t\dotnetSdkTests\iu5e2p3p.enm\ItCanBuildPro---2831E99A\ItCanBuildProjectRestoredWithNuGet5_7\ItCanBuildProjectRestoredWithNuGet5_7.csproj : warning MSB4242: The SDK resolver "Microsoft.DotNet.MSBuildWorkloadSdkResolver" failed to run. Missing or invalid manifest version
C:\h\w\B44909B0\p\d\sdk\6.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.ImportWorkloads.props(14,3): warning MSB4242: The SDK resolver "Microsoft.DotNet.MSBuildWorkloadSdkResolver" failed to run. Missing or invalid manifest version
C:\h\w\B44909B0\p\d\sdk\6.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.ImportWorkloads.props(14,3): error : C:\h\w\B44909B0\p\d\sdk\6.0.100-ci\Sdks\Microsoft.NET.SDK.WorkloadAutoImportPropsLocator\Sdk not found. Check that a recent enough .NET SDK is installed and/or increase the version specified in global.json.
C:\h\w\B44909B0\p\d\sdk\6.0.100-ci\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.ImportWorkloads.props(14,38): error MSB4236: The SDK 'Microsoft.NET.SDK.WorkloadAutoImportPropsLocator' specified could not be found. [C:\h\w\B44909B0\t\dotnetSdkTests\iu5e2p3p.enm\ItCanBuildPro---2831E99A\ItCanBuildProjectRestoredWithNuGet5_7\ItCanBuildProjectRestoredWithNuGet5_7.csproj]

@dsplaisted this is failing consistently, it looks like a workload resolver issue, do you have any ideas?

[dsplaisted]

That test calls nuget.exe to restore, which ends up using the full Framework version of MSBuild. So it sounds like this is failing because the version of VS on the CI machine doesn't have the SDK resolver changes for the manifest version number schema change.

Probably if you change the test to set MSBuildEnableWorkloadResolver to false (currently it sets it to true) the test will start working. Otherwise we can disable the test until CI machines get updated.

[lewing]

A fix here needs to make it into preview5.

[dsplaisted]

@sfoslund This needs to be retargeted to Preview 5, right? (I disabled auto-merge because of this.)

[sfoslund]

@dsplaisted I was going to port it to preview 5 after it's in main

[sfoslund]

Preview 5 PR: #17668