[msbuild] Ship the net10.0 version of our msbuild tasks.#24546
[msbuild] Ship the net10.0 version of our msbuild tasks.#24546rolfbjarne merged 1 commit intomainfrom
Conversation
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 |
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.
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.
This comment has been minimized.
This comment has been minimized.
rolfbjarne
force-pushed
the
dev/rolf/msbuild-dotnet-host
branch
from
39f84ad to
242e7d3
Compare
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.
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.
rolfbjarne
force-pushed
the
dev/rolf/msbuild-dotnet-host
branch
from
36a9a3d to
53722a2
Compare
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.
* 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'. Using the net10.0 version of the msbuild tasks is a good thing because: * We get to use a much newer version of .NET (which is better for performance). * We get to use newer APIs and features. * Task assemblies are loaded in isolation from eachother, we means we don't have to use ILMerge to merge dependencies into a single assembly, simplifying the build process: https://github.com/dotnet/msbuild/blob/main/documentation/specs/task-isolation-and-dependencies.md 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.
rolfbjarne
force-pushed
the
dev/rolf/msbuild-dotnet-host
branch
from
53722a2 to
fe8a7de
Compare
✅ [CI Build #fe8a7de] Build passed (Build packages) ✅Pipeline on Agent |
✅ [PR Build #fe8a7de] Build passed (Detect API changes) ✅Pipeline on Agent |
✅ 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 |
✅ [CI Build #fe8a7de] Build passed (Build macOS tests) ✅Pipeline on Agent |
🚀 [CI Build #fe8a7de] Test results 🚀Test results✅ All tests passed on VSTS: test results. 🎉 All 156 tests passed 🎉 Tests counts✅ cecil: All 1 tests passed. Html Report (VSDrops) Download macOS tests✅ Tests on macOS Monterey (12): All 5 tests passed. Html Report (VSDrops) Download Pipeline on Agent |
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.