Require Microsoft.VisualStudio.Component.VC.Tools.x86.x64 to be installed before compiling ANCM (#238)
This commit is contained in:
parent
6bfcd4a2d4
commit
b9ed1e073a
|
|
@ -4,26 +4,18 @@
|
||||||
<VerifyDependsOn>$(VerifyDependsOn);PublishPackage</VerifyDependsOn>
|
<VerifyDependsOn>$(VerifyDependsOn);PublishPackage</VerifyDependsOn>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<Target Name="_LocateMSBuildExe">
|
<Target Name="BuildNativeAssets" DependsOnTargets="GetToolsets" BeforeTargets="Compile" >
|
||||||
<ItemGroup>
|
|
||||||
<MSBuild15ExePaths Include="$(MSBuildProgramFiles32)\Microsoft Visual Studio\**\MSBuild\15.0\Bin\MSBuild.exe" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<Error
|
|
||||||
Text="Unable to locate MSBuild 15.0 under $(MSBuildProgramFiles32)\Microsoft Visual Studio"
|
|
||||||
Condition="'@(MSBuild15ExePaths)'==''"/>
|
|
||||||
|
|
||||||
<PropertyGroup Condition="'@(MSBuild15ExePaths)'!=''">
|
|
||||||
<MSBuildExePath>%(MSBuild15ExePaths.FullPath)</MSBuildExePath>
|
|
||||||
</PropertyGroup>
|
|
||||||
</Target>
|
|
||||||
|
|
||||||
<Target Name="BuildNativeAssets" DependsOnTargets="_LocateMSBuildExe" BeforeTargets="Compile">
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<BuildConfigurations Include="/p:Configuration=Release /p:platform=Win32" />
|
<BuildConfigurations Include="/p:Configuration=Release /p:platform=Win32" />
|
||||||
<BuildConfigurations Include="/p:Configuration=Release /p:platform=x64" />
|
<BuildConfigurations Include="/p:Configuration=Release /p:platform=x64" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Exec Command=""$(MSBuildExePath)" "$(RepositoryRoot)src\AspNetCore\AspNetCore.vcxproj" %(BuildConfigurations.Identity)" />
|
|
||||||
|
<Error
|
||||||
|
Text="Could not find an installation of Visual Studio with the C++ development tools."
|
||||||
|
Condition="'$(VisualStudioMSBuildx86Path)' == ''" />
|
||||||
|
|
||||||
|
<Exec Command=""$(VisualStudioMSBuildx86Path)" "$(RepositoryRoot)src\AspNetCore\AspNetCore.vcxproj" %(BuildConfigurations.Identity)"
|
||||||
|
Condition="'$(VisualStudioMSBuildx86Path)' != ''" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="PackageProjects">
|
<Target Name="PackageProjects">
|
||||||
|
|
@ -48,4 +40,4 @@
|
||||||
ApiKey="$(APIKey)" />
|
ApiKey="$(APIKey)" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
@ -0,0 +1,14 @@
|
||||||
|
{
|
||||||
|
"$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
|
||||||
|
"channel": "dev",
|
||||||
|
"toolsets": {
|
||||||
|
"visualstudio": {
|
||||||
|
"required": ["Windows"],
|
||||||
|
"includePrerelease": true,
|
||||||
|
"minVersion": "15.0.26730.03",
|
||||||
|
"requiredWorkloads": [
|
||||||
|
"Microsoft.VisualStudio.Component.VC.Tools.x86.x64"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue