Skip to content

Commit 0403d19

Browse files
CaseyCarterCaseyCarter
authored
Use Retail MSBuild Targets (#4225)
This is the STL-specific part of internal MSVC-PR-510075.
1 parent 8a8dda8 commit 0403d19

File tree

91 files changed

+275
-324
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+275
-324
lines changed

Diff for: ‎stl/msbuild/stl_1/md/dirs.proj

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
77
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\crt-common.settings.targets" />
88

99
<ItemGroup>
10-
<ProjectFile Include="msvcp_1_app\msvcp_1.nativeproj" />
11-
<ProjectFile Include="msvcp_1_kernel32\msvcp_1.nativeproj" />
12-
<ProjectFile Include="msvcp_1_onecore\msvcp_1.nativeproj" />
13-
<ProjectFile Include="msvcp_1_netfx\msvcp_1.nativeproj" Condition="'$(BuildArchitecture)' != 'chpe'" />
10+
<ProjectFile Include="msvcp_1_app\msvcp_1.vcxproj" />
11+
<ProjectFile Include="msvcp_1_kernel32\msvcp_1.vcxproj" />
12+
<ProjectFile Include="msvcp_1_onecore\msvcp_1.vcxproj" />
13+
<ProjectFile Include="msvcp_1_netfx\msvcp_1.vcxproj" Condition="'$(BuildArchitecture)' != 'chpe'" />
1414
</ItemGroup>
1515

1616
<Import Project="$(RepoSrc)\tools\Microsoft.DevDiv.Traversal.targets" />

Diff for: ‎stl/msbuild/stl_1/md/msvcp_1_app/msvcp_1.nativeproj renamed to ‎stl/msbuild/stl_1/md/msvcp_1_app/msvcp_1.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<PropertyGroup Label="Globals">
88
<ProjectGuid>{AC581714-5C34-43F1-88AA-F239723F751F}</ProjectGuid>
9-
<UseRetailTargets>false</UseRetailTargets>
9+
<UseRetailTargets>true</UseRetailTargets>
1010
</PropertyGroup>
1111
<Import Project="$([MSBuild]::GetPathOfFileAbove(VCTools.Cpp.Default.props))" />
1212
<PropertyGroup>

Diff for: ‎stl/msbuild/stl_1/md/msvcp_1_kernel32/msvcp_1.nativeproj renamed to ‎stl/msbuild/stl_1/md/msvcp_1_kernel32/msvcp_1.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<PropertyGroup Label="Globals">
88
<ProjectGuid>{58C30DB7-35C9-432D-8490-66F6E5901B8F}</ProjectGuid>
9-
<UseRetailTargets>false</UseRetailTargets>
9+
<UseRetailTargets>true</UseRetailTargets>
1010
</PropertyGroup>
1111
<Import Project="$([MSBuild]::GetPathOfFileAbove(VCTools.Cpp.Default.props))" />
1212
<PropertyGroup>

Diff for: ‎stl/msbuild/stl_1/md/msvcp_1_netfx/msvcp_1.nativeproj renamed to ‎stl/msbuild/stl_1/md/msvcp_1_netfx/msvcp_1.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<PropertyGroup Label="Globals">
88
<ProjectGuid>{CAA5F16A-A6C1-4450-981D-E3BF0F0A7B5B}</ProjectGuid>
9-
<UseRetailTargets>false</UseRetailTargets>
9+
<UseRetailTargets>true</UseRetailTargets>
1010
</PropertyGroup>
1111
<Import Project="$([MSBuild]::GetPathOfFileAbove(VCTools.Cpp.Default.props))" />
1212
<PropertyGroup>

Diff for: ‎stl/msbuild/stl_1/md/msvcp_1_onecore/msvcp_1.nativeproj renamed to ‎stl/msbuild/stl_1/md/msvcp_1_onecore/msvcp_1.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<PropertyGroup Label="Globals">
88
<ProjectGuid>{2BD1256B-3615-4061-AD30-4F5E1E092381}</ProjectGuid>
9-
<UseRetailTargets>false</UseRetailTargets>
9+
<UseRetailTargets>true</UseRetailTargets>
1010
</PropertyGroup>
1111
<Import Project="$([MSBuild]::GetPathOfFileAbove(VCTools.Cpp.Default.props))" />
1212
<PropertyGroup>

Diff for: ‎stl/msbuild/stl_1/msvcp_1.settings.targets

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
-->
77
<PropertyGroup Label="Configuration">
88
<ConfigurationType>DynamicLibrary</ConfigurationType>
9+
<GenerateImportLib>true</GenerateImportLib>
910
</PropertyGroup>
1011

1112
<PropertyGroup>
@@ -32,7 +33,6 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
3233
<ClDefines Condition="'$(MsvcpFlavor)' == 'app'">$(ClDefines);_CRT_APP</ClDefines>
3334

3435
<UseMsvcrt>false</UseMsvcrt>
35-
<GenerateImportLib>true</GenerateImportLib>
3636
<RCIntermediateOutputDirectory>$(IntermediateOutputDirectory)</RCIntermediateOutputDirectory>
3737
<IntermediateImportLibOutput>$(CrtBuildDir)\msvcprt_1$(BuildSuffix).$(MsvcpFlavor).import_only.lib</IntermediateImportLibOutput>
3838
<DllDefName>$(LibOutputFileName).$(MsvcpFlavor)</DllDefName>
@@ -64,7 +64,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6464
</ItemGroup>
6565

6666
<ItemGroup>
67-
<ProjectReference Condition="'$(CrtBuildModel)'=='md' or '$(CrtBuildModel)'=='xmd'" Include="$(VCToolsRootPath)\crt\github\stl\msbuild\stl_base\$(CrtBuildModel)\msvcp_$(MsvcpFlavor)\msvcp.nativeproj"/>
67+
<ProjectReference Condition="'$(CrtBuildModel)'=='md' or '$(CrtBuildModel)'=='xmd'" Include="$(VCToolsRootPath)\crt\github\stl\msbuild\stl_base\$(CrtBuildModel)\msvcp_$(MsvcpFlavor)\msvcp.vcxproj"/>
6868
<TargetLib Include="$(CrtLibPath)\msvcprt_base$(BuildSuffix)$(ClrLibSuffix).lib"/>
6969
<TargetLib Include="$(CrtLibPath)\msvcrt$(BuildSuffix)$(ClrLibSuffix).lib"/>
7070
<TargetLib Include="$(CrtLibPath)\vcruntime$(BuildSuffix)$(ClrLibSuffix).lib"/>

Diff for: ‎stl/msbuild/stl_1/stl_1.files.settings.targets

+2-10
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,8 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
-->
77

88
<ItemGroup>
9-
<BuildFiles Include="
10-
$(CrtRoot)\github\stl\src\memory_resource.cpp;
11-
">
12-
<BuildAs>nativecpp</BuildAs>
13-
</BuildFiles>
14-
<BuildFiles Condition="'$(CrtBuildModelIsDll)' == 'true'" Include="
15-
$(CrtRoot)\github\stl\src\dllmain_satellite.cpp;
16-
">
17-
<BuildAs>nativecpp</BuildAs>
18-
</BuildFiles>
9+
<ClCompile Include="$(CrtRoot)\github\stl\src\memory_resource.cpp" />
10+
<ClCompile Condition="'$(CrtBuildModelIsDll)' == 'true'" Include="$(CrtRoot)\github\stl\src\dllmain_satellite.cpp" />
1911
</ItemGroup>
2012

2113
<Choose>

Diff for: ‎stl/msbuild/stl_1/xmd/dirs.proj

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
99
<ItemGroup Condition="('$(SpectreBuildMode)' == '' or
1010
'$(Configuration)' == 'chk' or
1111
'$(Configuration)' == 'dbg')">
12-
<ProjectFile Include="msvcp_1_app\msvcp_1.nativeproj" />
13-
<ProjectFile Include="msvcp_1_kernel32\msvcp_1.nativeproj" />
14-
<ProjectFile Include="msvcp_1_onecore\msvcp_1.nativeproj" />
12+
<ProjectFile Include="msvcp_1_app\msvcp_1.vcxproj" />
13+
<ProjectFile Include="msvcp_1_kernel32\msvcp_1.vcxproj" />
14+
<ProjectFile Include="msvcp_1_onecore\msvcp_1.vcxproj" />
1515
</ItemGroup>
1616

1717
<ItemGroup Condition="'$(SpectreBuildMode)' == ''">
18-
<ProjectFile Include="msvcp_1_netfx\msvcp_1.nativeproj" Condition="'$(BuildArchitecture)' != 'chpe'" />
18+
<ProjectFile Include="msvcp_1_netfx\msvcp_1.vcxproj" Condition="'$(BuildArchitecture)' != 'chpe'" />
1919
</ItemGroup>
2020

2121
<Import Project="$(RepoSrc)\tools\Microsoft.DevDiv.Traversal.targets" />

Diff for: ‎stl/msbuild/stl_1/xmd/msvcp_1_app/msvcp_1.nativeproj renamed to ‎stl/msbuild/stl_1/xmd/msvcp_1_app/msvcp_1.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<PropertyGroup Label="Globals">
88
<ProjectGuid>{E30D9740-AD72-4A90-B8A9-A1CABCC52EB9}</ProjectGuid>
9-
<UseRetailTargets>false</UseRetailTargets>
9+
<UseRetailTargets>true</UseRetailTargets>
1010
</PropertyGroup>
1111
<Import Project="$([MSBuild]::GetPathOfFileAbove(VCTools.Cpp.Default.props))" />
1212
<PropertyGroup>

Diff for: ‎stl/msbuild/stl_1/xmd/msvcp_1_kernel32/msvcp_1.nativeproj renamed to ‎stl/msbuild/stl_1/xmd/msvcp_1_kernel32/msvcp_1.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<PropertyGroup Label="Globals">
88
<ProjectGuid>{A90AB3DB-494B-4ECD-AEFB-E880F9C58F74}</ProjectGuid>
9-
<UseRetailTargets>false</UseRetailTargets>
9+
<UseRetailTargets>true</UseRetailTargets>
1010
</PropertyGroup>
1111
<Import Project="$([MSBuild]::GetPathOfFileAbove(VCTools.Cpp.Default.props))" />
1212
<PropertyGroup>

Diff for: ‎stl/msbuild/stl_1/xmd/msvcp_1_netfx/msvcp_1.nativeproj renamed to ‎stl/msbuild/stl_1/xmd/msvcp_1_netfx/msvcp_1.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<PropertyGroup Label="Globals">
88
<ProjectGuid>{B37B087A-D591-472E-8E73-396CD32F5E77}</ProjectGuid>
9-
<UseRetailTargets>false</UseRetailTargets>
9+
<UseRetailTargets>true</UseRetailTargets>
1010
</PropertyGroup>
1111
<Import Project="$([MSBuild]::GetPathOfFileAbove(VCTools.Cpp.Default.props))" />
1212
<PropertyGroup>

Diff for: ‎stl/msbuild/stl_1/xmd/msvcp_1_onecore/msvcp_1.nativeproj renamed to ‎stl/msbuild/stl_1/xmd/msvcp_1_onecore/msvcp_1.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<PropertyGroup Label="Globals">
88
<ProjectGuid>{6E55B52D-472B-4A51-AC94-B1E391ECAAD7}</ProjectGuid>
9-
<UseRetailTargets>false</UseRetailTargets>
9+
<UseRetailTargets>true</UseRetailTargets>
1010
</PropertyGroup>
1111
<Import Project="$([MSBuild]::GetPathOfFileAbove(VCTools.Cpp.Default.props))" />
1212
<PropertyGroup>

Diff for: ‎stl/msbuild/stl_2/md/dirs.proj

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
77
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\crt-common.settings.targets" />
88

99
<ItemGroup>
10-
<ProjectFile Include="msvcp_2_app\msvcp_2.nativeproj" />
11-
<ProjectFile Include="msvcp_2_kernel32\msvcp_2.nativeproj" />
12-
<ProjectFile Include="msvcp_2_onecore\msvcp_2.nativeproj" />
13-
<ProjectFile Include="msvcp_2_netfx\msvcp_2.nativeproj" Condition="'$(BuildArchitecture)' != 'chpe'" />
10+
<ProjectFile Include="msvcp_2_app\msvcp_2.vcxproj" />
11+
<ProjectFile Include="msvcp_2_kernel32\msvcp_2.vcxproj" />
12+
<ProjectFile Include="msvcp_2_onecore\msvcp_2.vcxproj" />
13+
<ProjectFile Include="msvcp_2_netfx\msvcp_2.vcxproj" Condition="'$(BuildArchitecture)' != 'chpe'" />
1414
</ItemGroup>
1515

1616
<Import Project="$(RepoSrc)\tools\Microsoft.DevDiv.Traversal.targets" />

Diff for: ‎stl/msbuild/stl_2/md/msvcp_2_app/msvcp_2.nativeproj renamed to ‎stl/msbuild/stl_2/md/msvcp_2_app/msvcp_2.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<PropertyGroup Label="Globals">
88
<ProjectGuid>{451BB540-FBE3-4BFC-B3FC-1D118E6D44ED}</ProjectGuid>
9-
<UseRetailTargets>false</UseRetailTargets>
9+
<UseRetailTargets>true</UseRetailTargets>
1010
</PropertyGroup>
1111
<Import Project="$([MSBuild]::GetPathOfFileAbove(VCTools.Cpp.Default.props))" />
1212
<PropertyGroup>

Diff for: ‎stl/msbuild/stl_2/md/msvcp_2_kernel32/msvcp_2.nativeproj renamed to ‎stl/msbuild/stl_2/md/msvcp_2_kernel32/msvcp_2.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<PropertyGroup Label="Globals">
88
<ProjectGuid>{219EFF3E-A40D-46E4-86DC-887AF90330CA}</ProjectGuid>
9-
<UseRetailTargets>false</UseRetailTargets>
9+
<UseRetailTargets>true</UseRetailTargets>
1010
</PropertyGroup>
1111
<Import Project="$([MSBuild]::GetPathOfFileAbove(VCTools.Cpp.Default.props))" />
1212
<PropertyGroup>

Diff for: ‎stl/msbuild/stl_2/md/msvcp_2_netfx/msvcp_2.nativeproj renamed to ‎stl/msbuild/stl_2/md/msvcp_2_netfx/msvcp_2.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<PropertyGroup Label="Globals">
88
<ProjectGuid>{DEC67AC5-1EF2-4745-BAFF-28484A23477E}</ProjectGuid>
9-
<UseRetailTargets>false</UseRetailTargets>
9+
<UseRetailTargets>true</UseRetailTargets>
1010
</PropertyGroup>
1111
<Import Project="$([MSBuild]::GetPathOfFileAbove(VCTools.Cpp.Default.props))" />
1212
<PropertyGroup>

Diff for: ‎stl/msbuild/stl_2/md/msvcp_2_onecore/msvcp_2.nativeproj renamed to ‎stl/msbuild/stl_2/md/msvcp_2_onecore/msvcp_2.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<PropertyGroup Label="Globals">
88
<ProjectGuid>{24C78BD7-AED7-4090-BE81-8E3247ECC5A3}</ProjectGuid>
9-
<UseRetailTargets>false</UseRetailTargets>
9+
<UseRetailTargets>true</UseRetailTargets>
1010
</PropertyGroup>
1111
<Import Project="$([MSBuild]::GetPathOfFileAbove(VCTools.Cpp.Default.props))" />
1212
<PropertyGroup>

Diff for: ‎stl/msbuild/stl_2/msvcp_2.settings.targets

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
-->
77
<PropertyGroup Label="Configuration">
88
<ConfigurationType>DynamicLibrary</ConfigurationType>
9+
<GenerateImportLib>true</GenerateImportLib>
910
</PropertyGroup>
1011

1112
<PropertyGroup>
@@ -32,7 +33,6 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
3233
<ClDefines Condition="'$(MsvcpFlavor)' == 'app'">$(ClDefines);_CRT_APP</ClDefines>
3334

3435
<UseMsvcrt>false</UseMsvcrt>
35-
<GenerateImportLib>true</GenerateImportLib>
3636
<RCIntermediateOutputDirectory>$(IntermediateOutputDirectory)</RCIntermediateOutputDirectory>
3737
<IntermediateImportLibOutput>$(CrtBuildDir)\msvcprt_2$(BuildSuffix).$(MsvcpFlavor).import_only.lib</IntermediateImportLibOutput>
3838
<DllDefName>$(LibOutputFileName).$(MsvcpFlavor)</DllDefName>
@@ -64,7 +64,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6464
</ItemGroup>
6565

6666
<ItemGroup>
67-
<ProjectReference Condition="'$(CrtBuildModel)'=='md' or '$(CrtBuildModel)'=='xmd'" Include="$(VCToolsRootPath)\crt\github\stl\msbuild\stl_base\$(CrtBuildModel)\msvcp_$(MsvcpFlavor)$(CrtSpectreSuffix)\msvcp.nativeproj"/>
67+
<ProjectReference Condition="'$(CrtBuildModel)'=='md' or '$(CrtBuildModel)'=='xmd'" Include="$(VCToolsRootPath)\crt\github\stl\msbuild\stl_base\$(CrtBuildModel)\msvcp_$(MsvcpFlavor)\msvcp.vcxproj"/>
6868
<TargetLib Include="$(CrtLibPath)\msvcprt_base$(BuildSuffix)$(ClrLibSuffix).lib"/>
6969
<TargetLib Include="$(CrtLibPath)\msvcrt$(BuildSuffix)$(ClrLibSuffix).lib"/>
7070
<TargetLib Include="$(CrtLibPath)\vcruntime$(BuildSuffix)$(ClrLibSuffix).lib"/>

Diff for: ‎stl/msbuild/stl_2/stl_2.files.settings.targets

+2-10
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,8 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
-->
77

88
<ItemGroup>
9-
<BuildFiles Include="
10-
$(CrtRoot)\github\stl\src\special_math.cpp;
11-
">
12-
<BuildAs>nativecpp</BuildAs>
13-
</BuildFiles>
14-
<BuildFiles Condition="'$(CrtBuildModelIsDll)' == 'true'" Include="
15-
$(CrtRoot)\github\stl\src\dllmain_satellite.cpp;
16-
">
17-
<BuildAs>nativecpp</BuildAs>
18-
</BuildFiles>
9+
<ClCompile Include="$(CrtRoot)\github\stl\src\special_math.cpp" />
10+
<ClCompile Condition="'$(CrtBuildModelIsDll)' == 'true'" Include="$(CrtRoot)\github\stl\src\dllmain_satellite.cpp" />
1911
</ItemGroup>
2012

2113
<Choose>

Diff for: ‎stl/msbuild/stl_2/xmd/dirs.proj

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
99
<ItemGroup Condition="('$(SpectreBuildMode)' == '' or
1010
'$(Configuration)' == 'chk' or
1111
'$(Configuration)' == 'dbg')">
12-
<ProjectFile Include="msvcp_2_app\msvcp_2.nativeproj" />
13-
<ProjectFile Include="msvcp_2_kernel32\msvcp_2.nativeproj" />
14-
<ProjectFile Include="msvcp_2_onecore\msvcp_2.nativeproj" />
12+
<ProjectFile Include="msvcp_2_app\msvcp_2.vcxproj" />
13+
<ProjectFile Include="msvcp_2_kernel32\msvcp_2.vcxproj" />
14+
<ProjectFile Include="msvcp_2_onecore\msvcp_2.vcxproj" />
1515
</ItemGroup>
1616

1717
<ItemGroup Condition="'$(SpectreBuildMode)' == ''">
18-
<ProjectFile Include="msvcp_2_netfx\msvcp_2.nativeproj" Condition="'$(BuildArchitecture)' != 'chpe'" />
18+
<ProjectFile Include="msvcp_2_netfx\msvcp_2.vcxproj" Condition="'$(BuildArchitecture)' != 'chpe'" />
1919
</ItemGroup>
2020

2121
<Import Project="$(RepoSrc)\tools\Microsoft.DevDiv.Traversal.targets" />

Diff for: ‎stl/msbuild/stl_2/xmd/msvcp_2_app/msvcp_2.nativeproj renamed to ‎stl/msbuild/stl_2/xmd/msvcp_2_app/msvcp_2.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<PropertyGroup Label="Globals">
88
<ProjectGuid>{EFC70BD7-F82E-4951-8F60-468B164BF419}</ProjectGuid>
9-
<UseRetailTargets>false</UseRetailTargets>
9+
<UseRetailTargets>true</UseRetailTargets>
1010
</PropertyGroup>
1111
<Import Project="$([MSBuild]::GetPathOfFileAbove(VCTools.Cpp.Default.props))" />
1212
<PropertyGroup>

Diff for: ‎stl/msbuild/stl_2/xmd/msvcp_2_kernel32/msvcp_2.nativeproj renamed to ‎stl/msbuild/stl_2/xmd/msvcp_2_kernel32/msvcp_2.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<PropertyGroup Label="Globals">
88
<ProjectGuid>{3CFB766B-CCA6-4078-9A03-CAE24FF65373}</ProjectGuid>
9-
<UseRetailTargets>false</UseRetailTargets>
9+
<UseRetailTargets>true</UseRetailTargets>
1010
</PropertyGroup>
1111
<Import Project="$([MSBuild]::GetPathOfFileAbove(VCTools.Cpp.Default.props))" />
1212
<PropertyGroup>

Diff for: ‎stl/msbuild/stl_2/xmd/msvcp_2_netfx/msvcp_2.nativeproj renamed to ‎stl/msbuild/stl_2/xmd/msvcp_2_netfx/msvcp_2.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<PropertyGroup Label="Globals">
88
<ProjectGuid>{4A10E59B-BC11-478F-A911-4985F503B489}</ProjectGuid>
9-
<UseRetailTargets>false</UseRetailTargets>
9+
<UseRetailTargets>true</UseRetailTargets>
1010
</PropertyGroup>
1111
<Import Project="$([MSBuild]::GetPathOfFileAbove(VCTools.Cpp.Default.props))" />
1212
<PropertyGroup>

Diff for: ‎stl/msbuild/stl_2/xmd/msvcp_2_onecore/msvcp_2.nativeproj renamed to ‎stl/msbuild/stl_2/xmd/msvcp_2_onecore/msvcp_2.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<PropertyGroup Label="Globals">
88
<ProjectGuid>{4897703D-D42F-4CF6-B4C1-B7CFD3D9F054}</ProjectGuid>
9-
<UseRetailTargets>false</UseRetailTargets>
9+
<UseRetailTargets>true</UseRetailTargets>
1010
</PropertyGroup>
1111
<Import Project="$([MSBuild]::GetPathOfFileAbove(VCTools.Cpp.Default.props))" />
1212
<PropertyGroup>

Diff for: ‎stl/msbuild/stl_asan/dirs.proj

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
77
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\crt-common.settings.targets" />
88

99
<ItemGroup>
10-
<ProjectFile Include="stl_asan.nativeproj" />
10+
<ProjectFile Include="stl_asan.vcxproj" />
1111
</ItemGroup>
1212

1313
<Import Project="$(RepoSrc)\tools\Microsoft.DevDiv.Traversal.targets" />

Diff for: ‎stl/msbuild/stl_asan/stl_asan.files.settings.targets

+1-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
-->
77

88
<ItemGroup>
9-
<BuildFiles Include="
10-
$(CrtRoot)\github\stl\src\asan.cpp;
11-
">
12-
<BuildAs>nativecpp</BuildAs>
13-
</BuildFiles>
9+
<ClCompile Include="$(CrtRoot)\github\stl\src\asan.cpp" />
1410
</ItemGroup>
1511

1612
</Project>

Diff for: ‎stl/msbuild/stl_asan/stl_asan.nativeproj renamed to ‎stl/msbuild/stl_asan/stl_asan.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<PropertyGroup Label="Globals">
88
<ProjectGuid>{B8236181-0F0C-465B-8729-36944CBF324A}</ProjectGuid>
9-
<UseRetailTargets>false</UseRetailTargets>
9+
<UseRetailTargets>true</UseRetailTargets>
1010
</PropertyGroup>
1111
<Import Project="$([MSBuild]::GetPathOfFileAbove(VCTools.Cpp.Default.props))" />
1212
<PropertyGroup>

Diff for: ‎stl/msbuild/stl_atomic_wait/md/dirs.proj

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
77
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\crt-common.settings.targets" />
88

99
<ItemGroup>
10-
<ProjectFile Include="msvcp_atomic_wait_app\msvcp_atomic_wait.nativeproj" />
11-
<ProjectFile Include="msvcp_atomic_wait_kernel32\msvcp_atomic_wait.nativeproj" />
12-
<ProjectFile Include="msvcp_atomic_wait_onecore\msvcp_atomic_wait.nativeproj" />
13-
<ProjectFile Include="msvcp_atomic_wait_netfx\msvcp_atomic_wait.nativeproj" Condition="'$(BuildArchitecture)' != 'chpe'" />
10+
<ProjectFile Include="msvcp_atomic_wait_app\msvcp_atomic_wait.vcxproj" />
11+
<ProjectFile Include="msvcp_atomic_wait_kernel32\msvcp_atomic_wait.vcxproj" />
12+
<ProjectFile Include="msvcp_atomic_wait_onecore\msvcp_atomic_wait.vcxproj" />
13+
<ProjectFile Include="msvcp_atomic_wait_netfx\msvcp_atomic_wait.vcxproj" Condition="'$(BuildArchitecture)' != 'chpe'" />
1414
</ItemGroup>
1515

1616
<Import Project="$(RepoSrc)\tools\Microsoft.DevDiv.Traversal.targets" />

Diff for: ‎stl/msbuild/stl_atomic_wait/md/msvcp_atomic_wait_app/msvcp_atomic_wait.nativeproj renamed to ‎stl/msbuild/stl_atomic_wait/md/msvcp_atomic_wait_app/msvcp_atomic_wait.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<PropertyGroup Label="Globals">
88
<ProjectGuid>{99C61FE5-793F-4D49-82F6-27938575B058}</ProjectGuid>
9-
<UseRetailTargets>false</UseRetailTargets>
9+
<UseRetailTargets>true</UseRetailTargets>
1010
</PropertyGroup>
1111
<Import Project="$([MSBuild]::GetPathOfFileAbove(VCTools.Cpp.Default.props))" />
1212
<PropertyGroup>

Diff for: ‎stl/msbuild/stl_atomic_wait/md/msvcp_atomic_wait_kernel32/msvcp_atomic_wait.nativeproj renamed to ‎stl/msbuild/stl_atomic_wait/md/msvcp_atomic_wait_kernel32/msvcp_atomic_wait.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<PropertyGroup Label="Globals">
88
<ProjectGuid>{2C785D3F-9961-46E9-A202-D410DAD6269D}</ProjectGuid>
9-
<UseRetailTargets>false</UseRetailTargets>
9+
<UseRetailTargets>true</UseRetailTargets>
1010
</PropertyGroup>
1111
<Import Project="$([MSBuild]::GetPathOfFileAbove(VCTools.Cpp.Default.props))" />
1212
<PropertyGroup>

Diff for: ‎stl/msbuild/stl_atomic_wait/md/msvcp_atomic_wait_netfx/msvcp_atomic_wait.nativeproj renamed to ‎stl/msbuild/stl_atomic_wait/md/msvcp_atomic_wait_netfx/msvcp_atomic_wait.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<PropertyGroup Label="Globals">
88
<ProjectGuid>{B0D8709C-8649-43DF-AB53-AA05134A9B83}</ProjectGuid>
9-
<UseRetailTargets>false</UseRetailTargets>
9+
<UseRetailTargets>true</UseRetailTargets>
1010
</PropertyGroup>
1111
<Import Project="$([MSBuild]::GetPathOfFileAbove(VCTools.Cpp.Default.props))" />
1212
<PropertyGroup>

Diff for: ‎stl/msbuild/stl_atomic_wait/md/msvcp_atomic_wait_onecore/msvcp_atomic_wait.nativeproj renamed to ‎stl/msbuild/stl_atomic_wait/md/msvcp_atomic_wait_onecore/msvcp_atomic_wait.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<PropertyGroup Label="Globals">
88
<ProjectGuid>{22F86914-609E-4BF5-A1DA-2804C1251044}</ProjectGuid>
9-
<UseRetailTargets>false</UseRetailTargets>
9+
<UseRetailTargets>true</UseRetailTargets>
1010
</PropertyGroup>
1111
<Import Project="$([MSBuild]::GetPathOfFileAbove(VCTools.Cpp.Default.props))" />
1212
<PropertyGroup>

0 commit comments

Comments
 (0)