Skip to content

Commit 552942f

Browse files
hohonghohong
committed
merge from nativecloud
1 parent 8737b35 commit 552942f

File tree

206 files changed

+16874
-5559
lines changed

Some content is hidden

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

206 files changed

+16874
-5559
lines changed

‎Build/Common.Build.settings

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</MSBuildAllProjects>
1010
</PropertyGroup>
1111

12-
<!-- default configuration -->
12+
<!-- defualt configuration -->
1313
<PropertyGroup>
1414
<Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
1515
<Platform Condition="'$(Platform)'==''">Win32</Platform>
@@ -21,33 +21,43 @@
2121
<TargetsPath>$(BuildRoot)\Build</TargetsPath>
2222
<OsVersion>$(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion@CurrentVersion)</OsVersion>
2323
<!--If Dev10 and Dev11 are both installed, the default is to build Dev11. This can be overridden by setting the DevToolsVersion variable in powershell-->
24+
<DevToolsVersion Condition="'$(DevToolsVersion)' == '' And '$(VS120COMNTOOLS)' != ''">120</DevToolsVersion>
2425
<DevToolsVersion Condition="'$(DevToolsVersion)' == '' And '$(VS110COMNTOOLS)' != ''">110</DevToolsVersion>
2526
<DevToolsVersion Condition="'$(DevToolsVersion)' == '' And '$(VS100COMNTOOLS)' != ''">100</DevToolsVersion>
27+
<!-- ARM tools are installed in $(FrameworkSdkDir)\DesignTime\CommonConfiguration\Neutral\Windows.desktop.arm.props -->
28+
<FrameworkSdkDir Condition="'$(FrameworkSdkDir)'==''">$(WindowsSdkDir)</FrameworkSdkDir>
29+
<WindowsSDKDesktopARMSupport Condition="'$(DevToolsVersion)'=='120' AND Exists('$(FrameworkSdkDir)\DesignTime\CommonConfiguration\Neutral\Windows.desktop.arm.props')" >true</WindowsSDKDesktopARMSupport>
30+
<WindowsSDKDesktopARMSupport Condition="'$(DevToolsVersion)'=='110' AND Exists('$(FrameworkSdkDir)\DesignTime\CommonConfiguration\Neutral\Windows.desktop.arm.props')" >true</WindowsSDKDesktopARMSupport>
31+
<WindowsSDKDesktopARMSupport Condition="'$(DevToolsVersion)'=='110' AND !Exists('$(FrameworkSdkDir)\DesignTime\CommonConfiguration\Neutral\Windows.desktop.arm.props')">false</WindowsSDKDesktopARMSupport>
2632
</PropertyGroup>
2733

2834

29-
<!-- paths can be overriden by configuration -->
35+
<!-- paths can be overridden by configuration -->
3036
<PropertyGroup>
31-
<OutputPath>$(BuildRoot)\Binaries\$(Platform)\$(Configuration)\</OutputPath>
32-
<OutDir>$(OutputPath)</OutDir>
37+
<OutputPath Condition="'$(OutputPath)' == ''">$(BuildRoot)\Binaries\$(Platform)\$(Configuration)\</OutputPath>
38+
<!-- $(Configuration) below is added to place Debug/Release Casablanca bits into different folders when compiled in razzle.
39+
It does not affect NativeCloud build, because environment.casablanca.settings overrides OutDir unconditionally -->
40+
<OutDir>$(OutputPath)$(Configuration)</OutDir>
3341
<MSBuildCommunityTasksPath Condition="'$(MSBuildCommunityTasksPath)'==''">$(BuildRoot)\Build\MSBuild.Community.Tasks</MSBuildCommunityTasksPath>
3442
<WixToolPath Condition="'$(WixToolPath)'==''">$(BuildRoot)\Build\Wix\3.6\</WixToolPath>
3543
<WixExtDir Condition="'$(WixExtDir)'==''">$(WixToolPath)</WixExtDir>
3644
<TestRoot>$(BuildRoot)\Release\Tests</TestRoot>
3745
<CasablancaSrcDir>$(BuildRoot)\Release\src</CasablancaSrcDir>
46+
<CasablancaResourceDir>$(BuildRoot)\Release\Resource</CasablancaResourceDir>
3847
<CasablancaIncludeDir>$(BuildRoot)\Release\include</CasablancaIncludeDir>
3948
<CollateralsDir>$(BuildRoot)\Release\Collateral</CollateralsDir>
4049
</PropertyGroup>
4150

4251
<!-- try locating configuration file -->
4352
<Import Condition="Exists('$(BuildRoot)\..\Build\environment.casablanca.settings')" Project="$(BuildRoot)\..\Build\environment.casablanca.settings"/>
4453

45-
<!-- paths will not be overriden -->
54+
<!-- paths will not be overridden -->
4655
<PropertyGroup>
4756
<OutDir Condition="'$(OutDir)' != '' and !HasTrailingSlash('$(OutDir)')">$(OutDir)\</OutDir>
4857
</PropertyGroup>
4958

50-
<PropertyGroup Condition="'$(DevToolsVersion)' == '100'"> <PlatformToolset>v100</PlatformToolset>
59+
<PropertyGroup Condition="'$(DevToolsVersion)' == '100'">
60+
<PlatformToolset>v100</PlatformToolset>
5161
<DevEnvDir>$(VS100COMNTOOLS)..\IDE</DevEnvDir>
5262
</PropertyGroup>
5363

@@ -65,7 +75,6 @@
6575
<LuxTargetsPath>$(WixToolPath)Lux.targets</LuxTargetsPath>
6676
<LuxTasksPath >$(WixToolPath)LuxTasks.dll</LuxTasksPath>
6777

68-
6978
<!--For C#:-->
7079
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
7180
<!-- RunCodeAnalysis, false by default, is set true as necessary from the msbuild command line. -->
@@ -83,7 +92,6 @@
8392
<WholeProgramOptimization Condition="'$(WholeProgramOptimization)'=='' And '$(Configuration)'!='Debug'">true</WholeProgramOptimization>
8493
</PropertyGroup>
8594

86-
8795
<ItemDefinitionGroup>
8896
<ClCompile>
8997
<WarningLevel>Level4</WarningLevel>

‎Build/Release.Tests.settings

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,31 @@
1717
<PropertyGroup>
1818
<CommonTestIncludeDir>$(TestRoot)\Common\utilities\include;$(TestRoot)\Common\UnitTestpp</CommonTestIncludeDir>
1919
<TestListenerPath>$(TestRoot)\Functional\http\utilities\testlistener</TestListenerPath>
20-
<CasablancaIncludeDir>$(CasablancaIncludeDir);$(TestListenerPath)\include</CasablancaIncludeDir>
20+
<CasablancaIncludeDir>$(BinariesDirectory)\inc;$(CasablancaIncludeDir);$(TestListenerPath)\include;</CasablancaIncludeDir>
21+
</PropertyGroup>
22+
23+
<!-- Keeping the paths for Casablanca in VS installation in one common place instead of hardcoded in each test. -->
24+
<PropertyGroup Condition="'$(BuildAgainstVSInstallation)'!=''">
25+
<CasablancaVSSdkDir>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Casablanca\120\SDK`, `InstallDir`))</CasablancaVSSdkDir>
26+
<CasablancaVSExtentionSDKDir>C:\Program Files (x86)\Microsoft SDKs\Windows\v8.1\ExtensionSDKs\CppRESTWindowsSDK\1.0</CasablancaVSExtentionSDKDir>
27+
<CasablancaIncludeDir>$(CasablancaIncludeDir);$(CasablancaVSSdkDir)\include</CasablancaIncludeDir>
28+
<CasablancaVSLibDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(CasablancaVSSdkDir)\lib\x86\Debug\</CasablancaVSLibDir>
29+
<CasablancaVSLibDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(CasablancaVSSdkDir)\lib\x86\Release\</CasablancaVSLibDir>
30+
<CasablancaVSLibDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(CasablancaVSSdkDir)\lib\x64\Debug\</CasablancaVSLibDir>
31+
<CasablancaVSLibDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CasablancaVSSdkDir)\lib\x64\Release\</CasablancaVSLibDir>
32+
<CasablancaVSLibDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">$(CasablancaVSSdkDir)\lib\arm\Debug\</CasablancaVSLibDir>
33+
<CasablancaVSLibDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">$(CasablancaVSSdkDir)\lib\arm\Release\</CasablancaVSLibDir>
2134
</PropertyGroup>
2235

36+
<!-- Target that can be used to easily strip the AppContainer requirement from a dll -->
37+
<Target Name="StripAppContainerOnProjectDll">
38+
<Exec Command="link /edit /appcontainer:no $(OutDir)\$(ProjectName).dll" />
39+
40+
<!-- In razzle for some reason the output is in sub directory. -->
41+
<ItemGroup Condition="'$(BuildInRazzle)'!=''">
42+
<ProjectBinaries Include="$(OutDir)\*" />
43+
</ItemGroup>
44+
<Copy Condition="'$(BuildInRazzle)'!=''" SourceFiles="@(ProjectBinaries)" DestinationFolder="$(OutDir)..\" />
45+
</Target>
46+
2347
</Project>

‎Release/casablanca110.sln

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,69 +29,74 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testlistener110", "tests\Fu
2929
EndProject
3030
Global
3131
GlobalSection(TeamFoundationVersionControl) = preSolution
32-
SccNumberOfProjects = 12
32+
SccNumberOfProjects = 13
3333
SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
34-
SccTeamFoundationServer = http://tkbgitvstfat01:8080/devdiv2
34+
SccTeamFoundationServer = http://vstfdevdiv:8080/devdiv2
3535
SccProjectUniqueName0 = src\\VS11\\casablanca110.vcxproj
3636
SccProjectName0 = src/VS11
37-
SccAuxPath0 = http://tkbgitvstfat01:8080/devdiv2
37+
SccAuxPath0 = http://vstfdevdiv:8080/devdiv2
3838
SccLocalPath0 = src\\VS11
3939
SccProvider0 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
4040
SccProjectUniqueName1 = tests\\Common\\TestRunner\\VS11\\TestRunner110.vcxproj
4141
SccProjectName1 = tests/Common/TestRunner/VS11
42-
SccAuxPath1 = http://tkbgitvstfat01:8080/devdiv2
42+
SccAuxPath1 = http://vstfdevdiv:8080/devdiv2
4343
SccLocalPath1 = tests\\Common\\TestRunner\\VS11
4444
SccProvider1 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
4545
SccProjectUniqueName2 = tests\\Common\\UnitTestpp\\VS11\\TestUnitTestpp110.vcxproj
4646
SccProjectName2 = tests/Common/UnitTestpp/VS11
47-
SccAuxPath2 = http://tkbgitvstfat01:8080/devdiv2
47+
SccAuxPath2 = http://vstfdevdiv:8080/devdiv2
4848
SccLocalPath2 = tests\\Common\\UnitTestpp\\VS11
4949
SccProvider2 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
5050
SccProjectUniqueName3 = tests\\Common\\UnitTestpp\\VS11\\UnitTestpp110.vcxproj
5151
SccProjectName3 = tests/Common/UnitTestpp/VS11
52-
SccAuxPath3 = http://tkbgitvstfat01:8080/devdiv2
52+
SccAuxPath3 = http://vstfdevdiv:8080/devdiv2
5353
SccLocalPath3 = tests\\Common\\UnitTestpp\\VS11
5454
SccProvider3 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
5555
SccProjectUniqueName4 = tests\\Common\\utilities\\VS11\\CommonUtilities110.vcxproj
5656
SccProjectName4 = tests/Common/utilities/VS11
57-
SccAuxPath4 = http://tkbgitvstfat01:8080/devdiv2
57+
SccAuxPath4 = http://vstfdevdiv:8080/devdiv2
5858
SccLocalPath4 = tests\\Common\\utilities\\VS11
5959
SccProvider4 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
6060
SccProjectUniqueName5 = tests\\Functional\\http\\client\\VS11\\HttpClient110_test.vcxproj
6161
SccProjectName5 = tests/Functional/http/client/VS11
62-
SccAuxPath5 = http://tkbgitvstfat01:8080/devdiv2
62+
SccAuxPath5 = http://vstfdevdiv:8080/devdiv2
6363
SccLocalPath5 = tests\\Functional\\http\\client\\VS11
6464
SccProvider5 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
6565
SccProjectUniqueName6 = tests\\Functional\\http\\utilities\\VS11\\HttpTestUtilities110.vcxproj
6666
SccProjectName6 = tests/Functional/http/utilities/VS11
67-
SccAuxPath6 = http://tkbgitvstfat01:8080/devdiv2
67+
SccAuxPath6 = http://vstfdevdiv:8080/devdiv2
6868
SccLocalPath6 = tests\\Functional\\http\\utilities\\VS11
6969
SccProvider6 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
7070
SccProjectUniqueName7 = tests\\Functional\\json\\VS11\\JSON110_test.vcxproj
7171
SccProjectName7 = tests/Functional/json/VS11
72-
SccAuxPath7 = http://tkbgitvstfat01:8080/devdiv2
72+
SccAuxPath7 = http://vstfdevdiv:8080/devdiv2
7373
SccLocalPath7 = tests\\Functional\\json\\VS11
7474
SccProvider7 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
7575
SccProjectUniqueName8 = tests\\Functional\\misc\\atl_headers\\VS11\\header_test110.vcxproj
7676
SccProjectName8 = tests/Functional/misc/atl_headers/VS11
77-
SccAuxPath8 = http://tkbgitvstfat01:8080/devdiv2
77+
SccAuxPath8 = http://vstfdevdiv:8080/devdiv2
7878
SccLocalPath8 = tests\\Functional\\misc\\atl_headers\\VS11
7979
SccProvider8 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
8080
SccProjectUniqueName9 = tests\\Functional\\pplx\\pplx_test\\VS11\\pplx110_test.vcxproj
8181
SccProjectName9 = tests/Functional/pplx/pplx_test/VS11
82-
SccAuxPath9 = http://tkbgitvstfat01:8080/devdiv2
82+
SccAuxPath9 = http://vstfdevdiv:8080/devdiv2
8383
SccLocalPath9 = tests\\Functional\\pplx\\pplx_test\\VS11
8484
SccProvider9 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
8585
SccProjectUniqueName10 = tests\\Functional\\streams\\VS11\\streams110_test.vcxproj
8686
SccProjectName10 = tests/Functional/streams/VS11
87-
SccAuxPath10 = http://tkbgitvstfat01:8080/devdiv2
87+
SccAuxPath10 = http://vstfdevdiv:8080/devdiv2
8888
SccLocalPath10 = tests\\Functional\\streams\\VS11
8989
SccProvider10 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
9090
SccProjectUniqueName11 = tests\\Functional\\uri\\VS11\\Uri110_test.vcxproj
9191
SccProjectName11 = tests/Functional/uri/VS11
92-
SccAuxPath11 = http://tkbgitvstfat01:8080/devdiv2
92+
SccAuxPath11 = http://vstfdevdiv:8080/devdiv2
9393
SccLocalPath11 = tests\\Functional\\uri\\VS11
9494
SccProvider11 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
95+
SccProjectUniqueName12 = tests\\Functional\\http\\utilities\\testlistener\\VS11\\testlistener110.vcxproj
96+
SccProjectName12 = tests/Functional/http/utilities/testlistener/VS11
97+
SccAuxPath12 = http://vstfdevdiv:8080/devdiv2
98+
SccLocalPath12 = tests\\Functional\\http\\utilities\\testlistener\\VS11
99+
SccProvider12 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
95100
EndGlobalSection
96101
GlobalSection(SolutionConfigurationPlatforms) = preSolution
97102
Debug|ARM = Debug|ARM

‎Release/collateral/Samples/SearchFile/searchfile.cpp

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ namespace Concurrency { namespace streams {
6969
/// Parser implementation for 'matched_lines' type.
7070
/// </summary>
7171
template <typename CharType>
72-
class _type_parser<CharType, matched_lines>
72+
class type_parser<CharType, matched_lines>
7373
{
7474
public:
7575
static pplx::task<matched_lines> parse(streambuf<CharType> buffer)
@@ -144,10 +144,7 @@ static pplx::task<void> find_matches_in_file(const string_t &fileName, const std
144144
// Close the file and results stream.
145145
return inFile.close() && results.close();
146146
});
147-
})
148-
149-
// Continution to erase the bool and return task of void.
150-
.then([](std::vector<bool>) {});
147+
});
151148
}
152149

153150
/// <summary>
@@ -178,10 +175,7 @@ static pplx::task<void> write_matches_to_file(const string_t &fileName, matched_
178175
{
179176
return outFile.close();
180177
});
181-
})
182-
183-
// Continution to erase the bool and return task of void.
184-
.then([](bool) {});
178+
});
185179
}
186180

187181
#ifdef _MS_WINDOWS

‎Release/dirs.proj

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22

33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Common.Build.settings" />
44

5-
<ItemGroup>
6-
<ProjectFile Include="src\dirs.proj"/>
7-
<ProjectFile Include="samples\dirs.proj" Condition="'$(Platform)'!='ARM' or '$(WindowsSDKDesktopARMSupport)' == 'true'"/>
8-
<ProjectFile Include="tests\dirs.proj" Condition="'$(Platform)'!='ARM' or '$(WindowsSDKDesktopARMSupport)' == 'true'"/>
5+
<ItemGroup Condition="'$(BuildInRazzle)'=='' or '$(BuildAgainstVSInstallation)'==''">
6+
<ProjectFile Include="src\dirs.proj"/>
7+
</ItemGroup>
8+
9+
<ItemGroup Condition="'$(BuildInRazzle)'=='' or '$(BuildTests)'!=''">
10+
<ProjectFile Include="tests\dirs.proj" Condition="'$(Platform)'!='ARM' or '$(WindowsSDKDesktopARMSupport)' == 'true'"/>
11+
<ProjectFile Include="samples\dirs.proj" Condition="'$(Platform)'!='ARM' or '$(WindowsSDKDesktopARMSupport)' == 'true'"/>
912
</ItemGroup>
1013

1114
<Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />

0 commit comments

Comments
 (0)