Skip to content

Commit

Permalink
arm64 bootstrap setup (#7488)
Browse files Browse the repository at this point in the history
* V1 for new bootstrap

* Bring in tasks and targets
  • Loading branch information
benvillalobos authored Apr 11, 2022
1 parent c7cdc43 commit 4ec1bbd
Showing 1 changed file with 14 additions and 1 deletion.
15 changes: 14 additions & 1 deletion eng/BootStrapMSBuild.targets
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<PropertyGroup>
<BootstrapDestination>$(ArtifactsBinDir)bootstrap\</BootstrapDestination>
<BootstrapDestination Condition="'$(Platform)' == 'x64'">$(BootstrapDestination)$(Platform)\</BootstrapDestination>
<BootstrapDestination Condition="'$(Platform)' == 'x64' or '$(Platform)' == 'arm64'">$(BootstrapDestination)$(Platform)\</BootstrapDestination>
<BootstrapDestination>$(BootstrapDestination)$(TargetFramework.ToLowerInvariant())\MSBuild\</BootstrapDestination>

<!-- TODO: Mono build should use BootstrapNetCore logic -->
Expand Down Expand Up @@ -100,6 +100,13 @@
<FreshlyBuiltBinariesx64 Include="$(MSBuildTaskHostX64BinPath)**\*.exe.config" />
<FreshlyBuiltBinariesx64 Include="$(X64BinPath)**\*.dll.config" />

<FreshlyBuiltBinariesArm64 Include="$(X64BinPath)\Microsoft.Build.Tasks.Core.dll" />
<FreshlyBuiltBinariesArm64 Include="$(Arm64BinPath)**\*.exe" />
<FreshlyBuiltBinariesArm64 Include="$(Arm64BinPath)**\*.tlb" />
<FreshlyBuiltBinariesArm64 Include="$(Arm64BinPath)**\*.pdb" />
<FreshlyBuiltBinariesArm64 Include="$(Arm64BinPath)**\*.exe.config" />
<FreshlyBuiltBinariesArm64 Include="$(Arm64BinPath)**\*.dll.config" />

<FreshlyBuiltRootProjects Include="$(OutputPath)Microsoft.Common.props" />
<FreshlyBuiltRootProjects Include="$(OutputPath)Microsoft.VisualStudioVersion.*.Common.props" />
<FreshlyBuiltProjects Include="$(OutputPath)**\*props" Exclude="@(FreshlyBuiltRootProjects)" />
Expand Down Expand Up @@ -155,13 +162,19 @@
<Copy SourceFiles="@(FreshlyBuiltBinariesx64)"
DestinationFiles="@(FreshlyBuiltBinariesx64 -> '$(BootstrapDestination)$(TargetMSBuildToolsVersion)\Bin\amd64\%(RecursiveDir)%(Filename)%(Extension)')" />

<!-- Copy our binaries to the arm64 location. -->
<Copy SourceFiles="@(FreshlyBuiltBinariesArm64)"
DestinationFiles="@(FreshlyBuiltBinariesArm64 -> '$(BootstrapDestination)$(TargetMSBuildToolsVersion)\Bin\arm64\%(RecursiveDir)%(Filename)%(Extension)')" />

<!-- Copy our freshly-built props and targets, overwriting anything we copied from the machine -->
<Copy SourceFiles="@(FreshlyBuiltRootProjects)"
DestinationFiles="@(FreshlyBuiltRootProjects -> '$(BootstrapDestination)$(TargetMSBuildToolsVersion)\%(Filename)%(Extension)')" />
<Copy SourceFiles="@(FreshlyBuiltProjects)"
DestinationFiles="@(FreshlyBuiltProjects -> '$(BootstrapDestination)$(TargetMSBuildToolsVersion)\Bin\%(RecursiveDir)%(Filename)%(Extension)')" />
<Copy SourceFiles="@(FreshlyBuiltProjects)"
DestinationFiles="@(FreshlyBuiltProjects -> '$(BootstrapDestination)$(TargetMSBuildToolsVersion)\Bin\amd64\%(RecursiveDir)%(Filename)%(Extension)')" />
<Copy SourceFiles="@(FreshlyBuiltProjects)"
DestinationFiles="@(FreshlyBuiltProjects -> '$(BootstrapDestination)$(TargetMSBuildToolsVersion)\Bin\arm64\%(RecursiveDir)%(Filename)%(Extension)')" />

</Target>

Expand Down

0 comments on commit 4ec1bbd

Please sign in to comment.