|
12 | 12 | <TestProjects Include="$(SolutionDir)test\signalrclienttests\Build\VS\signalrclienttests.vcxproj" />
|
13 | 13 | <TestProjects Include="$(SolutionDir)test\signalrclient-e2e-tests\Build\VS\signalrclient-e2e-tests.vcxproj" />
|
14 | 14 | </ItemGroup>
|
15 |
| - |
| 15 | + |
16 | 16 | <ItemGroup>
|
17 | 17 | <ManagedProjects Include="$(SolutionDir)test\signalrclient-testhost\signalrclient-testhost.csproj" />
|
18 | 18 | <!--
|
19 | 19 | <ManagedProjects Include="$(SolutionDir)\samples\SignalRServer\SignalRServer.csproj" />
|
20 | 20 | -->
|
21 | 21 | </ItemGroup>
|
22 |
| - |
| 22 | + |
23 | 23 | <ItemGroup>
|
24 | 24 | <!--
|
25 | 25 | <SampleProjects Include="$(SolutionDir)\samples\PersistentConnectionSample\PersistentConnectionSample.vcxproj" />
|
|
41 | 41 | <MSBuild Targets="$(BuildTargets)"
|
42 | 42 | Projects="@(TestProjects)"
|
43 | 43 | Properties="Configuration=$(Configuration);Platform=$(Platform);PlatformToolset=$(PlatformToolset)" />
|
44 |
| - |
| 44 | + |
45 | 45 | <MSBuild Targets="$(BuildTargets)"
|
46 | 46 | Projects="@(SampleProjects)"
|
47 | 47 | Properties="Configuration=$(Configuration);Platform=$(Platform);PlatformToolset=$(PlatformToolset)" />
|
48 |
| - |
| 48 | + |
49 | 49 | <MSBuild Targets="$(BuildTargets)"
|
50 | 50 | Projects="@(ManagedProjects)"
|
51 | 51 | Properties="Configuration=$(Configuration)" />
|
|
59 | 59 | <MSBuild Targets="Clean"
|
60 | 60 | Projects="@(SampleProjects)" />
|
61 | 61 | <MSBuild Targets="Clean"
|
62 |
| - Projects="@(ManagedProjects)" /> |
| 62 | + Projects="@(ManagedProjects)" /> |
63 | 63 | </Target>
|
64 | 64 |
|
65 | 65 | <Target Name="Rebuild">
|
|
69 | 69 | </Target>
|
70 | 70 |
|
71 | 71 | <Target Name="Test" DependsOnTargets="Build">
|
72 |
| - <Exec Command="$(OutDir)\signalrclienttests.exe --gtest_output=xml:$(OutDir)\test_results.xml" /> |
| 72 | + <Exec Command="$(OutDir)\signalrclienttests.exe --gtest_output=xml:$(OutDir)test_results.xml" /> |
73 | 73 | <ExecAsync Executable="$(SolutionDir)test\signalrclient-testhost\bin\$(Configuration)\signalrclient-testhost.exe" Arguments="60000" />
|
74 | 74 | <!-- give the host some time to open the port otherwise the first tests may fail on slow machines-->
|
75 | 75 | <Sleep TimeoutMs="3000" />
|
76 |
| - <Exec Command="$(OutDir)\signalrclient-e2e-tests.exe --gtest_output=xml:$(OutDir)\e2e_test_results.xml" /> |
| 76 | + <Exec Command="$(OutDir)\signalrclient-e2e-tests.exe --gtest_output=xml:$(OutDir)e2e_test_results.xml" /> |
77 | 77 | <Exec Command="taskkill /IM signalrclient-testhost.exe /F" ContinueOnError="true" />
|
78 | 78 | </Target>
|
79 | 79 |
|
|
87 | 87 | <NuGetArtifactsPath>$(MSBuildThisFileDirectory)..\NuGet\</NuGetArtifactsPath>
|
88 | 88 | <NuSpecTemplatePath>$(NuGetArtifactsPath)signalrclientcpp.nuspec.template</NuSpecTemplatePath>
|
89 | 89 | <PackageOutputDir>$(SolutionDir)artifacts\build</PackageOutputDir>
|
90 |
| - <PrivateSymbols>$(SolutionDir)bin\Symbols\</PrivateSymbols> |
| 90 | + <PrivateSymbols>$(SolutionDir)bin\Symbols\$(PlatformToolset)\</PrivateSymbols> |
91 | 91 | </PropertyGroup>
|
92 | 92 |
|
93 | 93 | <ItemGroup>
|
|
115 | 115 | Projects="@(Projects)"
|
116 | 116 | Properties="Configuration=$(Configuration);Platform=$(Platform);PlatformToolset=$(PlatformToolset)" />
|
117 | 117 | <Copy SourceFiles="$(OutputPath)dll\$(SignalrClientTargetName).lib" DestinationFolder="$(PackageSourceNative)lib\$(Platform)\$(PlatformToolset)\$(Configuration)" />
|
118 |
| - |
| 118 | + |
119 | 119 | <Copy SourceFiles="$(OutputPath)dll\$(SignalrClientTargetName).dll" DestinationFolder="$(PackageSourceNative)dll\$(Platform)\$(PlatformToolset)\$(Configuration)" />
|
120 | 120 | <Copy SourceFiles="$(OutputPath)dll\$(SignalrClientTargetName).pub.pdb" DestinationFiles="$(PackageSourceNative)dll\$(Platform)\$(PlatformToolset)\$(Configuration)\$(SignalrClientTargetName).pdb" />
|
121 | 121 | <Copy SourceFiles="$(OutputPath)dll\$(SignalrClientTargetName).pdb" DestinationFiles="$(PrivateSymbols)$(Platform)\$(PlatformToolset)\$(Configuration)\$(SignalrClientTargetName).pdb" />
|
|
0 commit comments