Skip to content

Commit e5a169a

Browse files
ras0219-msftras0219-msft
committed
Adjusted Project UIDs for dev12
1 parent c401809 commit e5a169a

File tree

18 files changed

+71
-89
lines changed

18 files changed

+71
-89
lines changed

‎Release/samples/BingRequest/BingRequest120/BingRequest120.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
</ItemDefinitionGroup>
187187
<ItemGroup>
188188
<ProjectReference Include="$(CasablancaSrcDir)\build\vs12\casablanca120.vcxproj">
189-
<Project>{90D85FF4-F0AE-4816-923F-0EF2758F30AB}</Project>
189+
<Project>{1014C621-BC2D-4813-B8C1-6D83AD6F9249}</Project>
190190
</ProjectReference>
191191
</ItemGroup>
192192
<ItemGroup>

‎Release/samples/BlackJack/BlackJack_Client/BlackJack_Client120/BlackJack_Client120.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
</ItemGroup>
199199
<ItemGroup>
200200
<ProjectReference Include="$(CasablancaSrcDir)\build\vs12\casablanca120.vcxproj">
201-
<Project>{90D85FF4-F0AE-4816-923F-0EF2758F30AB}</Project>
201+
<Project>{1014C621-BC2D-4813-B8C1-6D83AD6F9249}</Project>
202202
</ProjectReference>
203203
</ItemGroup>
204204
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

‎Release/samples/BlackJack/BlackJack_Server/BlackJack_Server120/BlackJack_Server120.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@
204204
</ItemGroup>
205205
<ItemGroup>
206206
<ProjectReference Include="$(CasablancaSrcDir)\build\vs12\casablanca120.vcxproj">
207-
<Project>{90D85FF4-F0AE-4816-923F-0EF2758F30AB}</Project>
207+
<Project>{1014C621-BC2D-4813-B8C1-6D83AD6F9249}</Project>
208208
</ProjectReference>
209209
</ItemGroup>
210210
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

‎Release/samples/CasaLens/CasaLens120/CasaLens120.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
</ItemDefinitionGroup>
124124
<ItemGroup>
125125
<ProjectReference Include="$(CasablancaSrcDir)\build\vs12\casablanca120.vcxproj">
126-
<Project>{90D85FF4-F0AE-4816-923F-0EF2758F30AB}</Project>
126+
<Project>{1014C621-BC2D-4813-B8C1-6D83AD6F9249}</Project>
127127
</ProjectReference>
128128
</ItemGroup>
129129
<ItemGroup>

‎Release/samples/Oauth1Client/Oauth1Client120/Oauth1Client120.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
</ItemGroup>
199199
<ItemGroup>
200200
<ProjectReference Include="$(CasablancaSrcDir)\build\vs12\casablanca120.vcxproj">
201-
<Project>{90D85FF4-F0AE-4816-923F-0EF2758F30AB}</Project>
201+
<Project>{1014C621-BC2D-4813-B8C1-6D83AD6F9249}</Project>
202202
</ProjectReference>
203203
</ItemGroup>
204204
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

‎Release/samples/Oauth2Client/Oauth2Client120/Oauth2Client120.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
</ItemGroup>
199199
<ItemGroup>
200200
<ProjectReference Include="$(CasablancaSrcDir)\build\vs12\casablanca120.vcxproj">
201-
<Project>{90D85FF4-F0AE-4816-923F-0EF2758F30AB}</Project>
201+
<Project>{1014C621-BC2D-4813-B8C1-6D83AD6F9249}</Project>
202202
</ProjectReference>
203203
</ItemGroup>
204204
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

‎Release/samples/SearchFile/SearchFile120/SearchFile120.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
</ItemDefinitionGroup>
177177
<ItemGroup>
178178
<ProjectReference Include="$(CasablancaSrcDir)\build\vs12\casablanca120.vcxproj">
179-
<Project>{90D85FF4-F0AE-4816-923F-0EF2758F30AB}</Project>
179+
<Project>{1014C621-BC2D-4813-B8C1-6D83AD6F9249}</Project>
180180
</ProjectReference>
181181
</ItemGroup>
182182
<ItemGroup>

‎Release/tests/common/utilities/vs12/CommonUtilities120.vcxproj

Lines changed: 22 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(_NTDRIVE)$(_NTROOT)\vctools\cpp_rest\cpprest.razzle.props" Condition="exists('$(_NTDRIVE)$(_NTROOT)\vctools\cpp_rest\cpprest.razzle.props')" />
44
<ItemGroup Label="ProjectConfigurations">
@@ -84,17 +84,15 @@
8484
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CommonTestIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8585
</ClCompile>
8686
</ItemDefinitionGroup>
87-
8887
<!-- If testing against a VS installation, need to include the libs. -->
8988
<ItemDefinitionGroup Condition="'$(BuildAgainstVSInstallation)'!=''">
90-
<Link>
91-
<AdditionalLibraryDirectories>$(CasablancaVSLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
92-
</Link>
93-
<Link>
94-
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
95-
</Link>
89+
<Link>
90+
<AdditionalLibraryDirectories>$(CasablancaVSLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
91+
</Link>
92+
<Link>
93+
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
94+
</Link>
9695
</ItemDefinitionGroup>
97-
9896
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9997
<ClCompile>
10098
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -182,7 +180,7 @@
182180
</Link>
183181
</ItemDefinitionGroup>
184182
<ItemGroup>
185-
<ClCompile Include="..\os_utilities.cpp" />
183+
<ClCompile Include="..\os_utilities.cpp" />
186184
<ClCompile Include="..\stdafx.cpp">
187185
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
188186
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader>
@@ -205,31 +203,26 @@
205203
<ProjectReference Include="$(TestRoot)\Common\TestRunner\VS12\TestRunner120.vcxproj">
206204
<Project>{6490C580-DD4A-4F2D-A345-732C5148349F}</Project>
207205
</ProjectReference>
208-
</ItemGroup>
209-
210-
<ItemGroup Condition="'$(BuildAgainstVSInstallation)'==''">
211-
<ProjectReference Include="$(CasablancaSrcDir)\build\vs12\casablanca120.vcxproj">
212-
<Project>{90D85FF4-F0AE-4816-923F-0EF2758F30AB}</Project>
206+
<ProjectReference Include="$(CasablancaSrcDir)\build\vs12\casablanca120.vcxproj">
207+
<Project>{1014c621-bc2d-4813-b8c1-6d83ad6f9249}</Project>
213208
</ProjectReference>
214209
</ItemGroup>
215-
216210
<!-- After the build copy the installed Casablanca binaries into the test directory -->
217211
<Target Name="CopyCasablancaInstalledBinaries" Condition="'$(BuildAgainstVSInstallation)'!=''" AfterTargets="AfterBuild">
218212
<ItemGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
219-
<CasablancaBinaries Include="$(CasablancaVSSdkDir)\bin\x86\Debug\*.*" />
220-
</ItemGroup>
221-
<ItemGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
222-
<CasablancaBinaries Include="$(CasablancaVSSdkDir)\bin\x86\Release\*.*" />
223-
</ItemGroup>
224-
<ItemGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
225-
<CasablancaBinaries Include="$(CasablancaVSSdkDir)\bin\x64\Debug\*.*" />
226-
</ItemGroup>
227-
<ItemGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
228-
<CasablancaBinaries Include="$(CasablancaVSSdkDir)\bin\x64\Release\*.*" />
229-
</ItemGroup>
230-
<Copy SourceFiles="@(CasablancaBinaries)" DestinationFolder="$(OutDir)" />
213+
<CasablancaBinaries Include="$(CasablancaVSSdkDir)\bin\x86\Debug\*.*" />
214+
</ItemGroup>
215+
<ItemGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
216+
<CasablancaBinaries Include="$(CasablancaVSSdkDir)\bin\x86\Release\*.*" />
217+
</ItemGroup>
218+
<ItemGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
219+
<CasablancaBinaries Include="$(CasablancaVSSdkDir)\bin\x64\Debug\*.*" />
220+
</ItemGroup>
221+
<ItemGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
222+
<CasablancaBinaries Include="$(CasablancaVSSdkDir)\bin\x64\Release\*.*" />
223+
</ItemGroup>
224+
<Copy SourceFiles="@(CasablancaBinaries)" DestinationFolder="$(OutDir)" />
231225
</Target>
232-
233226
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
234227
<Import Project="$(BuildRoot)\cpprest.razzle.targets" Condition="'$(BuildInRazzle)'!=''" />
235228
<ImportGroup Label="ExtensionTargets">

‎Release/tests/functional/http/client/vs12/HttpClient120_test.vcxproj

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(_NTDRIVE)$(_NTROOT)\vctools\cpp_rest\cpprest.razzle.props" Condition="exists('$(_NTDRIVE)$(_NTROOT)\vctools\cpp_rest\cpprest.razzle.props')" />
44
<ItemGroup Label="ProjectConfigurations">
@@ -103,7 +103,7 @@
103103
<SubSystem>Windows</SubSystem>
104104
<GenerateDebugInformation>true</GenerateDebugInformation>
105105
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
106-
<AdditionalDependencies>Winhttp.lib;httpapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
106+
<AdditionalDependencies>Winhttp.lib;httpapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
107107
</Link>
108108
</ItemDefinitionGroup>
109109
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -117,7 +117,7 @@
117117
<SubSystem>Windows</SubSystem>
118118
<GenerateDebugInformation>true</GenerateDebugInformation>
119119
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
120-
<AdditionalDependencies>Winhttp.lib;httpapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
120+
<AdditionalDependencies>Winhttp.lib;httpapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
121121
</Link>
122122
</ItemDefinitionGroup>
123123
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -131,7 +131,7 @@
131131
<SubSystem>Windows</SubSystem>
132132
<GenerateDebugInformation>true</GenerateDebugInformation>
133133
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
134-
<AdditionalDependencies>Winhttp.lib;httpapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
134+
<AdditionalDependencies>Winhttp.lib;httpapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
135135
</Link>
136136
</ItemDefinitionGroup>
137137
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -149,7 +149,7 @@
149149
<EnableCOMDATFolding>true</EnableCOMDATFolding>
150150
<OptimizeReferences>true</OptimizeReferences>
151151
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
152-
<AdditionalDependencies>Winhttp.lib;httpapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
152+
<AdditionalDependencies>Winhttp.lib;httpapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
153153
</Link>
154154
</ItemDefinitionGroup>
155155
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
@@ -167,7 +167,7 @@
167167
<EnableCOMDATFolding>true</EnableCOMDATFolding>
168168
<OptimizeReferences>true</OptimizeReferences>
169169
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
170-
<AdditionalDependencies>Winhttp.lib;httpapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
170+
<AdditionalDependencies>Winhttp.lib;httpapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
171171
</Link>
172172
</ItemDefinitionGroup>
173173
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -185,25 +185,23 @@
185185
<EnableCOMDATFolding>true</EnableCOMDATFolding>
186186
<OptimizeReferences>true</OptimizeReferences>
187187
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
188-
<AdditionalDependencies>Winhttp.lib;httpapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
188+
<AdditionalDependencies>Winhttp.lib;httpapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
189189
</Link>
190190
</ItemDefinitionGroup>
191191
<ItemGroup>
192192
<ProjectReference Include="$(TestRoot)\Common\utilities\vs12\CommonUtilities120.vcxproj">
193193
<Project>{0c9d50d9-94fb-4732-a4ad-58e068315bb2}</Project>
194194
</ProjectReference>
195+
<ProjectReference Include="$(CasablancaSrcDir)\build\vs12\casablanca120.vcxproj">
196+
<Project>{1014c621-bc2d-4813-b8c1-6d83ad6f9249}</Project>
197+
</ProjectReference>
195198
<ProjectReference Include="..\..\utilities\vs12\HttpTestUtilities120.vcxproj">
196199
<Project>{6837625b-c0db-4fd0-aee2-19699031b76e}</Project>
197200
</ProjectReference>
198201
<ProjectReference Include="$(TestRoot)\Common\UnitTestpp\vs12\UnitTestpp120.vcxproj">
199202
<Project>{3EB86C0D-432C-4FFC-BAD4-8DF4EFC7D0FF}</Project>
200203
</ProjectReference>
201204
</ItemGroup>
202-
<ItemGroup Condition="'$(BuildAgainstVSInstallation)'==''">
203-
<ProjectReference Include="$(CasablancaSrcDir)\build\vs12\casablanca120.vcxproj">
204-
<Project>{90D85FF4-F0AE-4816-923F-0EF2758F30AB}</Project>
205-
</ProjectReference>
206-
</ItemGroup>
207205
<ItemGroup>
208206
<ClInclude Include="..\http_client_tests.h" />
209207
<ClInclude Include="..\stdafx.h" />
@@ -244,4 +242,4 @@
244242
<Import Project="$(BuildRoot)\cpprest.razzle.targets" Condition="'$(BuildInRazzle)'!=''" />
245243
<ImportGroup Label="ExtensionTargets">
246244
</ImportGroup>
247-
</Project>
245+
</Project>

‎Release/tests/functional/http/listener/vs12/HttpListener120_test.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
<Project>{6837625b-c0db-4fd0-aee2-19699031b76e}</Project>
198198
</ProjectReference>
199199
<ProjectReference Include="$(CasablancaSrcDir)\build\vs12\casablanca120.vcxproj">
200-
<Project>{90D85FF4-F0AE-4816-923F-0EF2758F30AB}</Project>
200+
<Project>{1014C621-BC2D-4813-B8C1-6D83AD6F9249}</Project>
201201
</ProjectReference>
202202
<ProjectReference Include="$(TestRoot)\Common\UnitTestpp\vs12\UnitTestpp120.vcxproj">
203203
<Project>{3EB86C0D-432C-4FFC-BAD4-8DF4EFC7D0FF}</Project>

0 commit comments

Comments
 (0)