[msbuild] Ship the net10.0 version of our msbuild tasks. #24546
Conversation
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
* Ship the net10.0 version of our msbuild tasks. * This required a bit of a reshuffling of the files in our Sdk pack, since we now ship both a netstandard2.0 and a net10.0 version of our msbuild tasks. * Use the net10.0 version of the msbuild tasks by default, but allow opt-out using the property '_UseDesktopTaskAssemblies'. Loading the net10.0 version of the tasks should work in VS2026, because VS2026 supports the "Runtime=NET" metadata on the 'UsingTask' directive (VS2022 does not, but this doesn't matter, because we don't support VS2022 anymore in .NET 10+). Hopefully we'll be able to remove the opt-out once we've confirmed nothing breaks, and then we can remove the netstandard2.0 versions of our task assemblies.
Contributor
There was a problem hiding this comment.
Pull request overview
This pull request updates the MSBuild build system to ship both netstandard2.0 and net10.0 versions of the MSBuild task assemblies, with net10.0 being the default. The changes introduce new properties _TaskAssemblyName and _TaskRuntime to support loading the appropriate version of task assemblies, with an opt-out mechanism via _UseDesktopTaskAssemblies.
Changes:
- Added support for shipping both netstandard2.0 and net10.0 task assemblies with configurable selection
- Updated all UsingTask declarations to include Runtime metadata and use the new
_TaskAssemblyNameproperty - Modified Makefile to copy net10.0 assemblies to the SDK pack structure
Reviewed changes
Copilot reviewed 11 out of 11 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
| msbuild/Xamarin.Shared/Xamarin.Shared.targets | Added properties to select task assembly version and runtime, updated all UsingTask declarations to use new properties and Runtime attribute |
| msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.Windows.After.targets | Updated UsingTask declarations to use new Runtime attribute and _TaskAssemblyName property |
| msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.ObjCBinding.CSharp.After.targets | Updated UsingTask declaration to use new Runtime attribute and _TaskAssemblyName property |
| msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.Common.Before.targets | Removed UsingTask declaration (moved to Common.After.targets) |
| msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.Common.After.targets | Added CollectMonotouchReferences UsingTask and updated all declarations with Runtime attribute |
| msbuild/Xamarin.MacDev.Tasks/Xamarin.MacDev.Tasks.csproj | Enabled CopyLocalLockFileAssemblies for net10.0 and disabled ILMerge for net10.0 target |
| msbuild/Makefile | Added NETTARGETFRAMEWORK variable and updated install rules to copy both netstandard2.0 and net10.0 assemblies |
| msbuild/.gitignore | Added .copy-stamp-* to ignore list for build artifacts |
| dotnet/targets/Xamarin.Shared.Sdk.targets | Updated UsingTask declarations to use Runtime attribute and _TaskAssemblyName property |
| dotnet/targets/Xamarin.Shared.Sdk.props | Removed _XamarinTaskAssembly property definition (replaced by _TaskAssemblyName) |
| dotnet/targets/Microsoft.MaciOS.Sdk.Xcode.targets | Updated UsingTask declarations to use Runtime attribute and _TaskAssemblyName property |
| <_TaskAssemblyFileNameWindows>Xamarin.iOS.Tasks.Windows.dll</_TaskAssemblyFileNameWindows> | ||
| <_TaskAssemblyName>$(MSBuildThisFileDirectory)\$(_TaskAssemblyFileName)</_TaskAssemblyName> | ||
| <_TaskAssemblyName Condition="'$(_UseDesktopTaskAssemblies)' != 'true'">$(MSBuildThisFileDirectory)\net$(BundledNETCoreAppTargetFrameworkVersion)\$(_TaskAssemblyFileName)</_TaskAssemblyName> | ||
| <_TaskAssemblyName Condition="'$(_UseDesktopTaskAssemblies)' == 'true'">$(MSBuildThisFileDirectory)\netstandard2.0\$(_TaskAssemblyFileName)</_TaskAssemblyName> |
There was a problem hiding this comment.
The property _TaskAssemblyFileNameWindows should have a corresponding full-path property similar to _TaskAssemblyName. The UsingTask declarations in Windows-specific target files are using just the filename without a path, which may cause task loading issues. Consider adding _TaskAssemblyNameWindows with a full path similar to how _TaskAssemblyName is defined on lines 24-25.
Suggested change
| <_TaskAssemblyName Condition="'$(_UseDesktopTaskAssemblies)' == 'true'">$(MSBuildThisFileDirectory)\netstandard2.0\$(_TaskAssemblyFileName)</_TaskAssemblyName> | |
| <_TaskAssemblyName Condition="'$(_UseDesktopTaskAssemblies)' == 'true'">$(MSBuildThisFileDirectory)\netstandard2.0\$(_TaskAssemblyFileName)</_TaskAssemblyName> | |
| <_TaskAssemblyNameWindows Condition="'$(_UseDesktopTaskAssemblies)' != 'true'">$(MSBuildThisFileDirectory)\net$(BundledNETCoreAppTargetFrameworkVersion)\$(_TaskAssemblyFileNameWindows)</_TaskAssemblyNameWindows> | |
| <_TaskAssemblyNameWindows Condition="'$(_UseDesktopTaskAssemblies)' == 'true'">$(MSBuildThisFileDirectory)\netstandard2.0\$(_TaskAssemblyFileNameWindows)</_TaskAssemblyNameWindows> |
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.
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.
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.
This comment has been minimized.
This comment has been minimized.
Collaborator
💻 [CI Build #a01c8fd] Tests on macOS X64 - Mac Sonoma (14) passed 💻✅ All tests on macOS X64 - Mac Sonoma (14) passed. Pipeline on Agent |
Collaborator
💻 [CI Build #a01c8fd] Tests on macOS M1 - Mac Monterey (12) passed 💻✅ All tests on macOS M1 - Mac Monterey (12) passed. Pipeline on Agent |
Collaborator
💻 [CI Build #a01c8fd] Tests on macOS M1 - Mac Ventura (13) passed 💻✅ All tests on macOS M1 - Mac Ventura (13) passed. Pipeline on Agent |
Collaborator
💻 [CI Build #a01c8fd] Tests on macOS arm64 - Mac Sequoia (15) passed 💻✅ All tests on macOS arm64 - Mac Sequoia (15) passed. Pipeline on Agent |
Collaborator
💻 [CI Build #a01c8fd] Tests on macOS arm64 - Mac Tahoe (26) passed 💻✅ All tests on macOS arm64 - Mac Tahoe (26) passed. Pipeline on Agent |
This comment has been minimized.
This comment has been minimized.
Collaborator
✅ [CI Build #52e9a27] Build passed (Build packages) ✅Pipeline on Agent |
Collaborator
✅ [PR Build #52e9a27] Build passed (Detect API changes) ✅Pipeline on Agent |
Collaborator
🔥 [CI Build #52e9a27] Build failed (Build macOS tests) 🔥Build failed for the job 'Build macOS tests' (with job status 'Failed') Pipeline on Agent |
Collaborator
✅ API diff for current PR / commitNET (empty diffs)✅ API diff vs stableNET (empty diffs)ℹ️ Generator diffGenerator Diff: vsdrops (html) vsdrops (raw diff) gist (raw diff) - Please review changes) Pipeline on Agent |
Collaborator
🔥 [CI Build #52e9a27] Test results 🔥Test results❌ Tests failed on VSTS: test results 4 tests crashed, 91 tests failed, 6 tests passed. Failures❌ dotnettests tests (iOS)1 tests failed, 0 tests passed.Failed tests
Html Report (VSDrops) Download ❌ dotnettests tests (MacCatalyst)1 tests failed, 0 tests passed.Failed tests
Html Report (VSDrops) Download ❌ dotnettests tests (macOS)1 tests failed, 0 tests passed.Failed tests
Html Report (VSDrops) Download ❌ dotnettests tests (Multiple platforms)1 tests failed, 0 tests passed.Failed tests
Html Report (VSDrops) Download ❌ dotnettests tests (tvOS)1 tests failed, 0 tests passed.Failed tests
Html Report (VSDrops) Download ❌ framework tests2 tests failed, 0 tests passed.Failed tests
Html Report (VSDrops) Download ❌ fsharp tests4 tests failed, 0 tests passed.Failed tests
Html Report (VSDrops) Download ❌ generator tests1 tests failed, 4 tests passed.Failed tests
Html Report (VSDrops) Download ❌ interdependent-binding-projects tests🔥 Failed catastrophically on VSTS: test results - interdependent-binding-projects (no summary found). Html Report (VSDrops) Download ❌ introspection tests4 tests failed, 0 tests passed.Failed tests
Html Report (VSDrops) Download ❌ linker tests44 tests failed, 0 tests passed.Failed tests
Html Report (VSDrops) Download ❌ monotouch tests (iOS)9 tests failed, 0 tests passed.Failed tests
Html Report (VSDrops) Download ❌ monotouch tests (MacCatalyst)11 tests failed, 0 tests passed.Failed tests
Html Report (VSDrops) Download ❌ monotouch tests (macOS)9 tests failed, 0 tests passed.Failed tests
Html Report (VSDrops) Download ❌ monotouch tests (tvOS)🔥 Failed catastrophically on VSTS: test results - monotouch_tvos (no summary found). Html Report (VSDrops) Download ❌ msbuild tests1 tests failed, 1 tests passed.Failed tests
Html Report (VSDrops) Download ❌ windows testsDetails# 🎉 All 3 tests passed 🎉Html Report (VSDrops) Download ❌ xcframework tests🔥 Failed catastrophically on VSTS: test results - xcframework (no summary found). Html Report (VSDrops) Download ❌ xtro tests🔥 Failed catastrophically on VSTS: test results - xtro (no summary found). Html Report (VSDrops) Download Successes✅ cecil: All 1 tests passed. Html Report (VSDrops) Download Pipeline on Agent |
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.
ship both a netstandard2.0 and a net10.0 version of our msbuild tasks.
the property '_UseDesktopTaskAssemblies'.
Loading the net10.0 version of the tasks should work in VS2026, because VS2026 supports
the "Runtime=NET" metadata on the 'UsingTask' directive (VS2022 does not, but this
doesn't matter, because we don't support VS2022 anymore in .NET 10+).
Hopefully we'll be able to remove the opt-out once we've confirmed nothing breaks,
and then we can remove the netstandard2.0 versions of our task assemblies.