Move the native Bootstrap dll to play nice(r) with VS #1498
Conversation
DrusTheAxe
added
area-Infrastructure
DrusTheAxe
requested review from
AdamBraden,
Scottj1s,
huichen123 and
kythant
ghost
added
the
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
| @@ -10,7 +10,7 @@ | |||
| </PropertyGroup> | |||
|
|
|||
| <Target Name="BinPlaceBootstrapDll" Condition="'$(AppxPackage)' != 'true' and '$(OutputType)' != 'Library'" AfterTargets="Build"> | |||
There was a problem hiding this comment.
@huichen123 Will be needed for .NET Framework (4.x) too, right?
There was a problem hiding this comment.
i think only .net core 5.0+ is supported for WindowsAppSDK.
There was a problem hiding this comment.
only for c++?
Nope. ALL need the Bootstrap.dll. C# also needs Bootstrap.Net.dll (that's just a C# assembly wrapper with P/Invoke over Bootstrap.dll)
There was a problem hiding this comment.
@huichen123 Hui Chen FTE Will be needed for .NET Framework (4.x) too, right?
@andrewleader got link to WinAppSDK's prerequisites/supported tech?
There was a problem hiding this comment.
would C# be handled automatically? or should we simply not copy for AnyCPU?
There was a problem hiding this comment.
With the folder structure change, you no longer need the targets file for C#/.NET projects as C# msbulid and nuget will do the right thing. Now we can just delete the MS.WindowsAppSDK.Bootstrap.targets file and then remove the "import project" from Build\microsoft.windowsappsdk.foundation.targets
C++ projects need another change to Build\native\windowsappsdk-nuget-native.c.props. Fixup the sub directory for the native bootstrap dll based on the change above, eg:
- xcopy /y "$(MSBuildThisFileDirectory)....\runtimes\win10-$(_WindowsAppSDKFoundationPlatform)\native\Microsoft.WindowsAppRuntime.Bootstrap.dll" "$(OutDir)"
There appears to be an issue with Build\microsoft.interactiveexperiences.common.targets. Need to discuss options as it is assuming something if the runtimes/win10-{arch}/native folders exist
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
| @@ -116,8 +116,8 @@ PublishFile $FullBuildOutput\DynamicDependencyLifetimeManager.ProxyStub\DynamicD | |||
| PublishFile $FullBuildOutput\DynamicDependencyLifetimeManager.ProxyStub\DynamicDependencyLifetimeManager.ProxyStub.pdb $NugetDir\runtimes\win10-$Platform\native | |||
| # | |||
| # Native (not managed, AppLocal / no MSIX) | |||
| PublishFile $FullBuildOutput\WindowsAppRuntime_BootstrapDLL\Microsoft.WindowsAppRuntime.Bootstrap.dll $NugetDir\runtimes\lib\native\$Platform | |||
| PublishFile $FullBuildOutput\WindowsAppRuntime_BootstrapDLL\Microsoft.WindowsAppRuntime.Bootstrap.pdb $NugetDir\runtimes\lib\native\$Platform | |||
| PublishFile $FullBuildOutput\WindowsAppRuntime_BootstrapDLL\Microsoft.WindowsAppRuntime.Bootstrap.dll $NugetDir\runtimes\win10-$Platform\native | |||
There was a problem hiding this comment.
Transport package = build\ProjectReunion-BuildFoundation.yml line 172
TargetFolder: '$(Build.ArtifactStagingDirectory)\FullNuget\lib\net5.0-windows10.0.18362.0'
The Aggregator pipeline needs to copy that from the Transport to the Nuget. I'm uncertain if it does (the logic's a bit complex, some of the wildcarding may already be handling it). Easy enough to tell once this goes in, the Transport package will have the file and if the built NuGet doesn't I'll whip up a PR for that in the Aggregator.
I just spoke with @ionvasilian. The collective order of operations...
- IXP pipeline changes complete (currently in progress)
- IXP's .props in the IXP Transport package is adjusted to not trip over this PR
- This PR's checked in
- (If necessary) Aggregator PR copying bootstrap.net.dll to the NuGet
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
* Move the native Bootstrap dll to play nice(r) with VS * Fixed typo * Updated Native.C.props for the new path * Delete the Bootstrap props file and AnyCPU should work (fingers crossed) * Remove obsolete reference to no-longer-existing file
* Move the native Bootstrap dll to play nice(r) with VS * Fixed typo * Updated Native.C.props for the new path * Delete the Bootstrap props file and AnyCPU should work (fingers crossed) * Remove obsolete reference to no-longer-existing file
Move the native bootstrap DLL to
runtimes\win10-$(Platform)\native\Microsoft.WindowsAppRuntime.Bootstrap.dll
and change build\nuspecs\Microsoft.WindowsAppSDK.Bootstrap.targets
to
i.e.
runtimes\lib\native\$(_WindowsAppSDKBootstrapPlatform)toruntimes\win10-$(_WindowsAppSDKBootstrapPlatform)\native