Skip to content

Commit be7126f

Browse files
authored
[Build] Require VC++ 2019 redist minimum (#2100)
1 parent 45e5fca commit be7126f

File tree

1 file changed

+23
-16
lines changed

1 file changed

+23
-16
lines changed

sources/assets/Stride.Core.Assets.CompilerApp/build/Stride.Core.Assets.CompilerApp.targets

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,30 @@
1-
<Project InitialTargets="_StrideCheckVisualCRuntime2013" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<!-- Check if Visual C++ Runtime 2013 is properly installed -->
1+
<Project InitialTargets="_StrideCheckVisualCRuntime2019" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<!-- Check if Visual C++ Runtime 2019 is properly installed -->
33
<!-- Should be moved to Stride.Assets as soon as transitive build dependencies are enabled by default in VS2019 (https://github.com/NuGet/Home/issues/6091#issuecomment-438073285) -->
4-
<Target Name="_StrideCheckVisualCRuntime2013" Condition="'$(MSBuildRuntimeType)' == 'Full'">
4+
<Target Name="_StrideCheckVisualCRuntime2019" Condition="'$(MSBuildRuntimeType)' == 'Full'">
55
<ItemGroup>
6-
<_StrideVisualCRuntime2013 Include="Visual C++ Redistributable for Visual Studio 2013 x86">
7-
<Version>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\DevDiv\VC\Servicing\12.0\RuntimeMinimum', 'Version', null, RegistryView.Registry32))</Version>
8-
<ExpectedVersion>12.0.21005</ExpectedVersion>
9-
<DownloadUrl>http://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x86.exe</DownloadUrl>
10-
</_StrideVisualCRuntime2013>
11-
<_StrideVisualCRuntime2013 Include="Visual C++ Redistributable for Visual Studio 2013 x64">
12-
<Version>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\DevDiv\VC\Servicing\12.0\RuntimeMinimum', 'Version', null, RegistryView.Registry64))</Version>
13-
<ExpectedVersion>12.0.21005</ExpectedVersion>
14-
<DownloadUrl>http://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x64.exe</DownloadUrl>
15-
</_StrideVisualCRuntime2013>
16-
17-
<_StrideVisualCRuntime2013NotInstalled Include="@(_StrideVisualCRuntime2013)" Condition="'%(_StrideVisualCRuntime2013.Version)' == '' Or $([System.Version]::Parse('%(Version)').CompareTo($([System.Version]::Parse('%(_StrideVisualCRuntime2013.ExpectedVersion)')))) &lt; 0" />
6+
<!-- VC++ versions:
7+
- 2015: Bld = 23026
8+
- 2017: Bld = 26020
9+
- 2019: Bld = 27820
10+
- 2022: Bld = 33130
11+
See also https://learn.microsoft.com/en-us/cpp/windows/redistributing-visual-cpp-files?#install-the-redistributable-packages
12+
-->
13+
<_StrideVisualCRuntime2019 Include="Visual C++ Redistributable for Visual Studio 2019 x86">
14+
<Version>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\X86', 'Bld', null, RegistryView.Registry32))</Version>
15+
<ExpectedVersion>27820</ExpectedVersion>
16+
<DownloadUrl>https://aka.ms/vs/17/release/vc_redist.x86.exe</DownloadUrl>
17+
</_StrideVisualCRuntime2019>
18+
<_StrideVisualCRuntime2019 Include="Visual C++ Redistributable for Visual Studio 2019 x64">
19+
<Version>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\X64', 'Bld', null, RegistryView.Registry64))</Version>
20+
<ExpectedVersion>27820</ExpectedVersion>
21+
<DownloadUrl>https://aka.ms/vs/17/release/vc_redist.x64.exe</DownloadUrl>
22+
</_StrideVisualCRuntime2019>
23+
24+
<_StrideVisualCRuntime2019NotInstalled Include="@(_StrideVisualCRuntime2019)" Condition="'%(_StrideVisualCRuntime2019.Version)' == '' Or $([System.Int32]::Parse('%(Version)').CompareTo($([System.Int32]::Parse('%(_StrideVisualCRuntime2019.ExpectedVersion)')))) &lt; 0" />
1825
</ItemGroup>
1926

20-
<Error Condition="'@(_StrideVisualCRuntime2013NotInstalled)' != ''" Text="@(_StrideVisualCRuntime2013NotInstalled->'%(Identity) is not installed. Please download from %(DownloadUrl)', '%0a')"/>
27+
<Error Condition="'@(_StrideVisualCRuntime2019NotInstalled)' != ''" Text="@(_StrideVisualCRuntime2019NotInstalled->'%(Identity) is not installed. Please download from %(DownloadUrl)', '%0a')"/>
2128
</Target>
2229
<!--
2330
*****************************************************************************************************************************

0 commit comments

Comments
 (0)