зеркало из https://github.com/dotnet/msbuild.git
Improve packaging scenarios (#7610)
This commit is contained in:
Ben Villalobos
GitHub
Родитель
72a0767940
Коммит
235c0e7462
83
MSBuild.sln
83
MSBuild.sln
|
|
@ -75,6 +75,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjectCachePlugin", "src\S
|
|||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StringTools.Benchmark", "src\StringTools.Benchmark\StringTools.Benchmark.csproj", "{65749C80-47E7-42FE-B441-7A86289D46AA}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSBuild.VSSetup.Arm64", "src\Package\MSBuild.VSSetup.Arm64\MSBuild.VSSetup.Arm64.csproj", "{71E59632-D644-491B-AF93-22BC93167C56}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
|
|
@ -1019,46 +1021,6 @@ Global
|
|||
{EDBFE32E-F264-4F01-97C3-B58F8B9165C9}.Release-MONO|x64.Build.0 = Release-MONO|x64
|
||||
{EDBFE32E-F264-4F01-97C3-B58F8B9165C9}.Release-MONO|x86.ActiveCfg = Release-MONO|Any CPU
|
||||
{EDBFE32E-F264-4F01-97C3-B58F8B9165C9}.Release-MONO|x86.Build.0 = Release-MONO|Any CPU
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Debug|ARM64.Build.0 = Debug|Any CPU
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Debug|x64.Build.0 = Debug|x64
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Debug-MONO|Any CPU.ActiveCfg = Debug-MONO|Any CPU
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Debug-MONO|Any CPU.Build.0 = Debug-MONO|Any CPU
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Debug-MONO|ARM64.ActiveCfg = Debug-MONO|Any CPU
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Debug-MONO|ARM64.Build.0 = Debug-MONO|Any CPU
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Debug-MONO|x64.ActiveCfg = Debug|x64
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Debug-MONO|x64.Build.0 = Debug|x64
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Debug-MONO|x86.ActiveCfg = Debug|Any CPU
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Debug-MONO|x86.Build.0 = Debug|Any CPU
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.MachineIndependent|Any CPU.ActiveCfg = MachineIndependent|Any CPU
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.MachineIndependent|Any CPU.Build.0 = MachineIndependent|Any CPU
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.MachineIndependent|ARM64.ActiveCfg = MachineIndependent|Any CPU
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.MachineIndependent|ARM64.Build.0 = MachineIndependent|Any CPU
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.MachineIndependent|x64.ActiveCfg = MachineIndependent|x64
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.MachineIndependent|x64.Build.0 = MachineIndependent|x64
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.MachineIndependent|x86.ActiveCfg = MachineIndependent|Any CPU
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.MachineIndependent|x86.Build.0 = MachineIndependent|Any CPU
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Release|ARM64.Build.0 = Release|Any CPU
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Release|x64.ActiveCfg = Release|x64
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Release|x64.Build.0 = Release|x64
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Release|x86.Build.0 = Release|Any CPU
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Release-MONO|Any CPU.ActiveCfg = Release-MONO|Any CPU
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Release-MONO|Any CPU.Build.0 = Release-MONO|Any CPU
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Release-MONO|ARM64.ActiveCfg = Release-MONO|Any CPU
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Release-MONO|ARM64.Build.0 = Release-MONO|Any CPU
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Release-MONO|x64.ActiveCfg = Release-MONO|x64
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Release-MONO|x64.Build.0 = Release-MONO|x64
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Release-MONO|x86.ActiveCfg = Release-MONO|Any CPU
|
||||
{3D67E4FF-6EC6-4FE7-82F1-0DACE1E399A7}.Release-MONO|x86.Build.0 = Release-MONO|Any CPU
|
||||
{CEAEE4FE-9298-443B-AFC5-0F72472484B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{CEAEE4FE-9298-443B-AFC5-0F72472484B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{CEAEE4FE-9298-443B-AFC5-0F72472484B6}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
|
|
@ -1339,6 +1301,46 @@ Global
|
|||
{65749C80-47E7-42FE-B441-7A86289D46AA}.Release-MONO|x64.Build.0 = Release-MONO|x64
|
||||
{65749C80-47E7-42FE-B441-7A86289D46AA}.Release-MONO|x86.ActiveCfg = Release-MONO|Any CPU
|
||||
{65749C80-47E7-42FE-B441-7A86289D46AA}.Release-MONO|x86.Build.0 = Release-MONO|Any CPU
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Debug|ARM64.ActiveCfg = Debug|arm64
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Debug|ARM64.Build.0 = Debug|arm64
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Debug|x64.Build.0 = Debug|x64
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Debug-MONO|Any CPU.ActiveCfg = Debug-MONO|Any CPU
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Debug-MONO|Any CPU.Build.0 = Debug-MONO|Any CPU
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Debug-MONO|ARM64.ActiveCfg = Debug-MONO|arm64
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Debug-MONO|ARM64.Build.0 = Debug-MONO|arm64
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Debug-MONO|x64.ActiveCfg = Debug-MONO|x64
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Debug-MONO|x64.Build.0 = Debug-MONO|x64
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Debug-MONO|x86.ActiveCfg = Debug-MONO|Any CPU
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Debug-MONO|x86.Build.0 = Debug-MONO|Any CPU
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.MachineIndependent|Any CPU.ActiveCfg = MachineIndependent|Any CPU
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.MachineIndependent|Any CPU.Build.0 = MachineIndependent|Any CPU
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.MachineIndependent|ARM64.ActiveCfg = MachineIndependent|arm64
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.MachineIndependent|ARM64.Build.0 = MachineIndependent|arm64
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.MachineIndependent|x64.ActiveCfg = MachineIndependent|x64
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.MachineIndependent|x64.Build.0 = MachineIndependent|x64
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.MachineIndependent|x86.ActiveCfg = MachineIndependent|Any CPU
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.MachineIndependent|x86.Build.0 = MachineIndependent|Any CPU
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Release|ARM64.ActiveCfg = Release|arm64
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Release|ARM64.Build.0 = Release|arm64
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Release|x64.ActiveCfg = Release|x64
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Release|x64.Build.0 = Release|x64
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Release|x86.Build.0 = Release|Any CPU
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Release-MONO|Any CPU.ActiveCfg = Release-MONO|Any CPU
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Release-MONO|Any CPU.Build.0 = Release-MONO|Any CPU
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Release-MONO|ARM64.ActiveCfg = Release-MONO|arm64
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Release-MONO|ARM64.Build.0 = Release-MONO|arm64
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Release-MONO|x64.ActiveCfg = Release-MONO|x64
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Release-MONO|x64.Build.0 = Release-MONO|x64
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Release-MONO|x86.ActiveCfg = Release-MONO|Any CPU
|
||||
{71E59632-D644-491B-AF93-22BC93167C56}.Release-MONO|x86.Build.0 = Release-MONO|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
@ -1356,6 +1358,7 @@ Global
|
|||
{EDBFE32E-F264-4F01-97C3-B58F8B9165C9} = {9BAD9352-DEFB-45E5-B8A4-4816B9B22A33}
|
||||
{B60173F0-F9F0-4688-9DF8-9ADDD57BD45F} = {9BAD9352-DEFB-45E5-B8A4-4816B9B22A33}
|
||||
{F47E1A0A-7D81-40CF-B8B3-A0F4B5ADE943} = {760FF85D-8BEB-4992-8095-A9678F88FD47}
|
||||
{71E59632-D644-491B-AF93-22BC93167C56} = {9BAD9352-DEFB-45E5-B8A4-4816B9B22A33}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {F948D667-14E3-4F98-BA50-3F3C948BF4C2}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<DotNetUseShippingVersions>true</DotNetUseShippingVersions>
|
||||
<!-- Workaround for https://github.com/dotnet/roslyn/issues/35793 -->
|
||||
<SemanticVersioningV1>true</SemanticVersioningV1>
|
||||
<MicroBuildPluginsSwixBuildVersion>1.0.672</MicroBuildPluginsSwixBuildVersion>
|
||||
<MicroBuildPluginsSwixBuildVersion>1.1.87</MicroBuildPluginsSwixBuildVersion>
|
||||
<MonoBuild Condition="'$(Configuration)' == 'Debug-MONO' or '$(Configuration)' == 'Release-MONO'">true</MonoBuild>
|
||||
</PropertyGroup>
|
||||
<!-- Repo Toolset Features -->
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@
|
|||
</Target>
|
||||
|
||||
<Import Project="..\Package\GetBinPaths.targets" Condition="$(TargetFramework.StartsWith('net4'))"/>
|
||||
<Import Project="..\Package\GetBinPaths.Arm64.targets" Condition="$(TargetFramework.StartsWith('net4'))"/>
|
||||
|
||||
<Import Project="$(RepoRoot)eng\BootStrapMSBuild.targets" />
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,36 @@
|
|||
<Project>
|
||||
|
||||
<ItemGroup>
|
||||
<!-- Set up items to build projects where the Platform is set to x64, when we need the x64 versions of the files.
|
||||
We have to treat these separately from normal project references, as the AssignProjectConfiguration task would overwrite
|
||||
the SetPlatform item metadata if they were ProjectReferences.
|
||||
-->
|
||||
<Arm64ProjectReference Include="$(MSBuildThisFileDirectory)\..\MSBuild\MSBuild.csproj"
|
||||
SetPlatform="Platform=arm64"
|
||||
SetTargetFramework="TargetFramework=$(FullFrameworkTFM)"
|
||||
OutputItemType="MSBuildArm64ResolvedProjectReferencePath" />
|
||||
|
||||
<ProjectReference Include="$(MSBuildThisFileDirectory)\..\Framework\Microsoft.Build.Framework.csproj"
|
||||
Private="false"
|
||||
ReferenceOutputAssembly="false"
|
||||
OutputItemType="FrameworkResolvedProjectReferencePath" />
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="SetBinPathsArm64" DependsOnTargets="ResolveProjectReferences">
|
||||
<MSBuild
|
||||
Projects="@(Arm64ProjectReference)"
|
||||
BuildInParallel="$(BuildInParallel)"
|
||||
Properties="Configuration=$(Configuration); %(Arm64ProjectReference.SetPlatform); %(Arm64ProjectReference.SetTargetFramework)"
|
||||
RemoveProperties="%(Arm64ProjectReference.GlobalPropertiesToRemove)">
|
||||
|
||||
<Output TaskParameter="TargetOutputs" ItemName="%(Arm64ProjectReference.OutputItemType)" />
|
||||
</MSBuild>
|
||||
|
||||
<PropertyGroup>
|
||||
<FrameworkBinPath>@(FrameworkResolvedProjectReferencePath->'%(RootDir)%(Directory)')</FrameworkBinPath>
|
||||
<Arm64BinPath>@(MSBuildArm64ResolvedProjectReferencePath->'%(RootDir)%(Directory)')</Arm64BinPath>
|
||||
</PropertyGroup>
|
||||
</Target>
|
||||
|
||||
|
||||
</Project>
|
||||
|
|
@ -36,11 +36,6 @@
|
|||
SetPlatform="Platform=x64"
|
||||
OutputItemType="MSBuildTaskHostX64ResolvedProjectReferencePath"
|
||||
GlobalPropertiesToRemove="TargetFramework" />
|
||||
|
||||
<Arm64ProjectReference Include="$(MSBuildThisFileDirectory)\..\MSBuild\MSBuild.csproj"
|
||||
SetPlatform="Platform=arm64"
|
||||
SetTargetFramework="TargetFramework=$(FullFrameworkTFM)"
|
||||
OutputItemType="MSBuildArm64ResolvedProjectReferencePath" />
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="SetBinPaths" DependsOnTargets="ResolveProjectReferences">
|
||||
|
|
@ -52,24 +47,13 @@
|
|||
|
||||
<Output TaskParameter="TargetOutputs" ItemName="%(X64ProjectReference.OutputItemType)" />
|
||||
</MSBuild>
|
||||
|
||||
<MSBuild
|
||||
Projects="@(Arm64ProjectReference)"
|
||||
BuildInParallel="$(BuildInParallel)"
|
||||
Properties="Configuration=$(Configuration); %(Arm64ProjectReference.SetPlatform); %(Arm64ProjectReference.SetTargetFramework)"
|
||||
RemoveProperties="%(Arm64ProjectReference.GlobalPropertiesToRemove)">
|
||||
|
||||
<Output TaskParameter="TargetOutputs" ItemName="%(Arm64ProjectReference.OutputItemType)" />
|
||||
</MSBuild>
|
||||
|
||||
<PropertyGroup>
|
||||
<X86BinPath>@(MSBuildResolvedProjectReferencePath->'%(RootDir)%(Directory)')</X86BinPath>
|
||||
<X64BinPath>@(MSBuildX64ResolvedProjectReferencePath->'%(RootDir)%(Directory)')</X64BinPath>
|
||||
<Arm64BinPath>@(MSBuildArm64ResolvedProjectReferencePath->'%(RootDir)%(Directory)')</Arm64BinPath>
|
||||
<FrameworkBinPath>@(FrameworkResolvedProjectReferencePath->'%(RootDir)%(Directory)')</FrameworkBinPath>
|
||||
<MSBuildTaskHostBinPath>@(MSBuildTaskHostResolvedProjectReferencePath->'%(RootDir)%(Directory)')</MSBuildTaskHostBinPath>
|
||||
<MSBuildTaskHostX64BinPath>@(MSBuildTaskHostX64ResolvedProjectReferencePath->'%(RootDir)%(Directory)')</MSBuildTaskHostX64BinPath>
|
||||
<MSBuildTaskHostArm64BinPath>@(MSBuildTaskHostArm64ResolvedProjectReferencePath->'%(RootDir)%(Directory)')</MSBuildTaskHostArm64BinPath>
|
||||
<MSBuildConversionBinPath>@(MSBuildConversionResolvedProjectReferencePath->'%(RootDir)%(Directory)')</MSBuildConversionBinPath>
|
||||
</PropertyGroup>
|
||||
</Target>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,36 @@
|
|||
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFramework>$(FullFrameworkTFM)</TargetFramework>
|
||||
<!-- VS Insertion -->
|
||||
<TargetVsixContainerName>Microsoft.Build.Arm64.vsix</TargetVsixContainerName>
|
||||
<VisualStudioInsertionComponent>Microsoft.Build.Arm64</VisualStudioInsertionComponent>
|
||||
<ShouldSkipProject>false</ShouldSkipProject>
|
||||
<ShouldSkipProject Condition="'$(MonoBuild)' == 'true' or '$(MSBuildRuntimeType)' != 'Full'">true</ShouldSkipProject>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\Build\Microsoft.Build.csproj" PrivateAssets="All" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<SwrProperty Include="ThirdPartyNotice=$(ThirdPartyNotice)" />
|
||||
<SwrProperty Include="SourceDir=$(RepoRoot)\src\" />
|
||||
|
||||
<!-- Only add the swr file when building on full framework msbuild, otherwise,
|
||||
this triggers a build of the swixproj, which is not supported in core msbuild. -->
|
||||
<SwrFile Include="files.arm64.swr" Condition=" '$(MSBuildRuntimeType)' == 'Full' " />
|
||||
</ItemGroup>
|
||||
|
||||
<Import Project="..\GetBinPaths.Arm64.targets" Condition="!$(ShouldSkipProject)" />
|
||||
|
||||
<Target Name="SetVsixProperties" BeforeTargets="Build" DependsOnTargets="SetBinPathsArm64" Condition="!$(ShouldSkipProject)">
|
||||
<ItemGroup>
|
||||
<SwrProperty Include="Version=$(VsixVersion)" />
|
||||
<SwrProperty Include="FrameworkBinPath=$(FrameworkBinPath)" />
|
||||
<SwrProperty Include="Arm64BinPath=$(Arm64BinPath)" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<Import Project="$(RepoRoot)eng\ProducesNoOutput.Settings.props" Condition="$(ShouldSkipProject)" />
|
||||
</Project>
|
||||
|
|
@ -0,0 +1,74 @@
|
|||
use vs
|
||||
|
||||
package name=Microsoft.Build.Arm64
|
||||
version=$(Version)
|
||||
vs.package.machineArch=arm64
|
||||
vs.package.language=neutral
|
||||
|
||||
vs.relatedProcessFiles
|
||||
vs.relatedProcessFile Path="[InstallDir]\MSBuild\Current\Bin\arm64\Microsoft.Build.Tasks.Core.dll"
|
||||
|
||||
folder InstallDir:\MSBuild\Current\Bin\arm64
|
||||
file source=$(Arm64BinPath)MSBuild.exe vs.file.ngenArchitecture=all
|
||||
file source=$(Arm64BinPath)MSBuild.exe.config
|
||||
|
||||
file source=$(FrameworkBinPath)x64\Microsoft.Build.Framework.tlb
|
||||
file source=$(Arm64BinPath)Microsoft.Build.Tasks.Core.dll vs.file.ngenArchitecture=all
|
||||
file source=$(Arm64BinPath)Microsoft.Common.CurrentVersion.targets
|
||||
file source=$(Arm64BinPath)Microsoft.Common.CrossTargeting.targets
|
||||
file source=$(Arm64BinPath)Microsoft.Common.overridetasks
|
||||
file source=$(Arm64BinPath)Microsoft.Common.targets
|
||||
file source=$(Arm64BinPath)Microsoft.Common.tasks
|
||||
file source=$(Arm64BinPath)Microsoft.Managed.targets
|
||||
file source=$(Arm64BinPath)Microsoft.Managed.Before.targets
|
||||
file source=$(Arm64BinPath)Microsoft.Managed.After.targets
|
||||
file source=$(Arm64BinPath)Microsoft.CSharp.CurrentVersion.targets
|
||||
file source=$(Arm64BinPath)Microsoft.CSharp.CrossTargeting.targets
|
||||
file source=$(Arm64BinPath)Microsoft.CSharp.targets
|
||||
file source=$(Arm64BinPath)Microsoft.Net.props
|
||||
file source=$(Arm64BinPath)Microsoft.NetFramework.CurrentVersion.props
|
||||
file source=$(Arm64BinPath)Microsoft.NetFramework.CurrentVersion.targets
|
||||
file source=$(Arm64BinPath)Microsoft.NetFramework.props
|
||||
file source=$(Arm64BinPath)Microsoft.NetFramework.targets
|
||||
file source=$(Arm64BinPath)Microsoft.VisualBasic.CurrentVersion.targets
|
||||
file source=$(Arm64BinPath)Microsoft.VisualBasic.CrossTargeting.targets
|
||||
file source=$(Arm64BinPath)Microsoft.VisualBasic.targets
|
||||
file source=$(Arm64BinPath)MSBuild.rsp
|
||||
file source=$(Arm64BinPath)Workflow.targets
|
||||
file source=$(Arm64BinPath)Workflow.VisualBasic.targets
|
||||
file source=$(Arm64BinPath)Microsoft.Xaml.targets
|
||||
file source=$(Arm64BinPath)Microsoft.Data.Entity.targets
|
||||
file source=$(Arm64BinPath)Microsoft.ServiceModel.targets
|
||||
file source=$(Arm64BinPath)Microsoft.WinFx.targets
|
||||
file source=$(Arm64BinPath)Microsoft.WorkflowBuildExtensions.targets
|
||||
|
||||
folder InstallDir:\MSBuild\Current\Bin\arm64\MSBuild
|
||||
file source=$(Arm64BinPath)\MSBuild\Microsoft.Build.Core.xsd
|
||||
file source=$(Arm64BinPath)\MSBuild\Microsoft.Build.CommonTypes.xsd
|
||||
|
||||
folder InstallDir:\MSBuild\Current\Bin\arm64\cs
|
||||
file source=$(Arm64BinPath)cs\MSBuild.resources.dll vs.file.ngenArchitecture=all
|
||||
folder InstallDir:\MSBuild\Current\Bin\arm64\de
|
||||
file source=$(Arm64BinPath)de\MSBuild.resources.dll vs.file.ngenArchitecture=all
|
||||
folder InstallDir:\MSBuild\Current\Bin\arm64\es
|
||||
file source=$(Arm64BinPath)es\MSBuild.resources.dll vs.file.ngenArchitecture=all
|
||||
folder InstallDir:\MSBuild\Current\Bin\arm64\fr
|
||||
file source=$(Arm64BinPath)fr\MSBuild.resources.dll vs.file.ngenArchitecture=all
|
||||
folder InstallDir:\MSBuild\Current\Bin\arm64\it
|
||||
file source=$(Arm64BinPath)it\MSBuild.resources.dll vs.file.ngenArchitecture=all
|
||||
folder InstallDir:\MSBuild\Current\Bin\arm64\ja
|
||||
file source=$(Arm64BinPath)ja\MSBuild.resources.dll vs.file.ngenArchitecture=all
|
||||
folder InstallDir:\MSBuild\Current\Bin\arm64\ko
|
||||
file source=$(Arm64BinPath)ko\MSBuild.resources.dll vs.file.ngenArchitecture=all
|
||||
folder InstallDir:\MSBuild\Current\Bin\arm64\pl
|
||||
file source=$(Arm64BinPath)pl\MSBuild.resources.dll vs.file.ngenArchitecture=all
|
||||
folder InstallDir:\MSBuild\Current\Bin\arm64\pt-BR
|
||||
file source=$(Arm64BinPath)pt-BR\MSBuild.resources.dll vs.file.ngenArchitecture=all
|
||||
folder InstallDir:\MSBuild\Current\Bin\arm64\ru
|
||||
file source=$(Arm64BinPath)ru\MSBuild.resources.dll vs.file.ngenArchitecture=all
|
||||
folder InstallDir:\MSBuild\Current\Bin\arm64\tr
|
||||
file source=$(Arm64BinPath)tr\MSBuild.resources.dll vs.file.ngenArchitecture=all
|
||||
folder InstallDir:\MSBuild\Current\Bin\arm64\zh-Hans
|
||||
file source=$(Arm64BinPath)zh-Hans\MSBuild.resources.dll vs.file.ngenArchitecture=all
|
||||
folder InstallDir:\MSBuild\Current\Bin\arm64\zh-Hant
|
||||
file source=$(Arm64BinPath)zh-Hant\MSBuild.resources.dll vs.file.ngenArchitecture=all
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
|
||||
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFramework>$(FullFrameworkTFM)</TargetFramework>
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
<!-- Only add the swr file when building on full framework msbuild, otherwise,
|
||||
this triggers a build of the swixproj, which is not supported in core msbuild. -->
|
||||
<SwrFile Include="*.swr" Condition=" '$(MSBuildRuntimeType)' == 'Full' " />
|
||||
<SwrFile Include="files.swr" Condition=" '$(MSBuildRuntimeType)' == 'Full' " />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- GetBinPaths depends on GetBuildVersion which does not get imported if ProducesNoOutput.Settings.props is imported-->
|
||||
|
|
@ -34,11 +34,9 @@
|
|||
<SwrProperty Include="Version=$(VsixVersion)" />
|
||||
<SwrProperty Include="X86BinPath=$(X86BinPath)" />
|
||||
<SwrProperty Include="X64BinPath=$(X64BinPath)" />
|
||||
<SwrProperty Include="Arm64BinPath=$(Arm64BinPath)" />
|
||||
<SwrProperty Include="FrameworkBinPath=$(FrameworkBinPath)" />
|
||||
<SwrProperty Include="TaskHostBinPath=$(MSBuildTaskHostBinPath)" />
|
||||
<SwrProperty Include="TaskHostX64BinPath=$(MSBuildTaskHostX64BinPath)" />
|
||||
<SwrProperty Include="TaskHostArm64BinPath=$(MSBuildTaskHostArm64BinPath)" />
|
||||
<SwrProperty Include="MSBuildConversionBinPath=$(MSBuildConversionBinPath)" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ package name=Microsoft.Build
|
|||
|
||||
vs.dependencies
|
||||
vs.dependency id=Microsoft.Build.UnGAC
|
||||
vs.dependency id=Microsoft.Build.Arm64
|
||||
vs.dependency id=Microsoft.VisualStudio.PackageGroup.NuGet
|
||||
|
||||
vs.relatedProcessFiles
|
||||
|
|
@ -18,7 +19,6 @@ vs.relatedProcessFiles
|
|||
vs.relatedProcessFile Path="[InstallDir]\MSBuild\Current\Bin\amd64\Microsoft.Build.Framework.dll"
|
||||
vs.relatedProcessFile Path="[InstallDir]\MSBuild\Current\Bin\amd64\Microsoft.Build.Tasks.Core.dll"
|
||||
vs.relatedProcessFile Path="[InstallDir]\MSBuild\Current\Bin\amd64\Microsoft.Build.Utilities.Core.dll"
|
||||
vs.relatedProcessFile Path="[InstallDir]\MSBuild\Current\Bin\arm64\Microsoft.Build.Tasks.Core.dll"
|
||||
|
||||
folder InstallDir:\MSBuild\Current
|
||||
file source=$(X86BinPath)Microsoft.Common.props
|
||||
|
|
@ -309,71 +309,6 @@ folder InstallDir:\MSBuild\Current\Bin\amd64\zh-Hant
|
|||
file source=$(X64BinPath)zh-Hant\MSBuild.resources.dll vs.file.ngenArchitecture=all
|
||||
file source=$(TaskHostX64BinPath)zh-Hant\MSBuildTaskHost.resources.dll vs.file.ngenArchitecture=all
|
||||
|
||||
folder InstallDir:\MSBuild\Current\Bin\arm64
|
||||
file source=$(Arm64BinPath)MSBuild.exe vs.file.ngenArchitecture=x64
|
||||
file source=$(Arm64BinPath)MSBuild.exe.config
|
||||
|
||||
file source=$(FrameworkBinPath)x64\Microsoft.Build.Framework.tlb
|
||||
file source=$(X86BinPath)Microsoft.Build.Tasks.Core.dll vs.file.ngenArchitecture=all
|
||||
file source=$(X86BinPath)Microsoft.Common.CurrentVersion.targets
|
||||
file source=$(X86BinPath)Microsoft.Common.CrossTargeting.targets
|
||||
file source=$(X86BinPath)Microsoft.Common.overridetasks
|
||||
file source=$(X86BinPath)Microsoft.Common.targets
|
||||
file source=$(X86BinPath)Microsoft.Common.tasks
|
||||
file source=$(X86BinPath)Microsoft.Managed.targets
|
||||
file source=$(X86BinPath)Microsoft.Managed.Before.targets
|
||||
file source=$(X86BinPath)Microsoft.Managed.After.targets
|
||||
file source=$(X86BinPath)Microsoft.CSharp.CurrentVersion.targets
|
||||
file source=$(X86BinPath)Microsoft.CSharp.CrossTargeting.targets
|
||||
file source=$(X86BinPath)Microsoft.CSharp.targets
|
||||
file source=$(X86BinPath)Microsoft.Net.props
|
||||
file source=$(X86BinPath)Microsoft.NetFramework.CurrentVersion.props
|
||||
file source=$(X86BinPath)Microsoft.NetFramework.CurrentVersion.targets
|
||||
file source=$(X86BinPath)Microsoft.NetFramework.props
|
||||
file source=$(X86BinPath)Microsoft.NetFramework.targets
|
||||
file source=$(X86BinPath)Microsoft.VisualBasic.CurrentVersion.targets
|
||||
file source=$(X86BinPath)Microsoft.VisualBasic.CrossTargeting.targets
|
||||
file source=$(X86BinPath)Microsoft.VisualBasic.targets
|
||||
file source=$(X86BinPath)MSBuild.rsp
|
||||
file source=$(X86BinPath)Workflow.targets
|
||||
file source=$(X86BinPath)Workflow.VisualBasic.targets
|
||||
file source=$(X86BinPath)Microsoft.Xaml.targets
|
||||
file source=$(X86BinPath)Microsoft.Data.Entity.targets
|
||||
file source=$(X86BinPath)Microsoft.ServiceModel.targets
|
||||
file source=$(X86BinPath)Microsoft.WinFx.targets
|
||||
file source=$(X86BinPath)Microsoft.WorkflowBuildExtensions.targets
|
||||
|
||||
folder InstallDir:\MSBuild\Current\Bin\arm64\MSBuild
|
||||
file source=$(X86BinPath)\MSBuild\Microsoft.Build.Core.xsd
|
||||
file source=$(X86BinPath)\MSBuild\Microsoft.Build.CommonTypes.xsd
|
||||
|
||||
folder InstallDir:\MSBuild\Current\Bin\arm64\cs
|
||||
file source=$(Arm64BinPath)cs\MSBuild.resources.dll vs.file.ngenArchitecture=all
|
||||
folder InstallDir:\MSBuild\Current\Bin\arm64\de
|
||||
file source=$(Arm64BinPath)de\MSBuild.resources.dll vs.file.ngenArchitecture=all
|
||||
folder InstallDir:\MSBuild\Current\Bin\arm64\es
|
||||
file source=$(Arm64BinPath)es\MSBuild.resources.dll vs.file.ngenArchitecture=all
|
||||
folder InstallDir:\MSBuild\Current\Bin\arm64\fr
|
||||
file source=$(Arm64BinPath)fr\MSBuild.resources.dll vs.file.ngenArchitecture=all
|
||||
folder InstallDir:\MSBuild\Current\Bin\arm64\it
|
||||
file source=$(Arm64BinPath)it\MSBuild.resources.dll vs.file.ngenArchitecture=all
|
||||
folder InstallDir:\MSBuild\Current\Bin\arm64\ja
|
||||
file source=$(Arm64BinPath)ja\MSBuild.resources.dll vs.file.ngenArchitecture=all
|
||||
folder InstallDir:\MSBuild\Current\Bin\arm64\ko
|
||||
file source=$(Arm64BinPath)ko\MSBuild.resources.dll vs.file.ngenArchitecture=all
|
||||
folder InstallDir:\MSBuild\Current\Bin\arm64\pl
|
||||
file source=$(Arm64BinPath)pl\MSBuild.resources.dll vs.file.ngenArchitecture=all
|
||||
folder InstallDir:\MSBuild\Current\Bin\arm64\pt-BR
|
||||
file source=$(Arm64BinPath)pt-BR\MSBuild.resources.dll vs.file.ngenArchitecture=all
|
||||
folder InstallDir:\MSBuild\Current\Bin\arm64\ru
|
||||
file source=$(Arm64BinPath)ru\MSBuild.resources.dll vs.file.ngenArchitecture=all
|
||||
folder InstallDir:\MSBuild\Current\Bin\arm64\tr
|
||||
file source=$(Arm64BinPath)tr\MSBuild.resources.dll vs.file.ngenArchitecture=all
|
||||
folder InstallDir:\MSBuild\Current\Bin\arm64\zh-Hans
|
||||
file source=$(Arm64BinPath)zh-Hans\MSBuild.resources.dll vs.file.ngenArchitecture=all
|
||||
folder InstallDir:\MSBuild\Current\Bin\arm64\zh-Hant
|
||||
file source=$(Arm64BinPath)zh-Hant\MSBuild.resources.dll vs.file.ngenArchitecture=all
|
||||
|
||||
folder InstallDir:\Common7\IDE\CommonExtensions\MSBuild
|
||||
file source=$(SourceDir)Package\MSBuild.VSSetup\MSBuild.clientenabledpkg
|
||||
file source=$(SourceDir)Framework\Microsoft.Build.Framework.pkgdef
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче