Skip to content

Commit 8500198

Browse files
nohwndnohwnd
authored
Fix playground (#4420)
1 parent 8e64247 commit 8500198

File tree

4 files changed

+27
-31
lines changed

4 files changed

+27
-31
lines changed

‎playground/TestPlatform.Playground/Environment.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ internal class EnvironmentVariables
1414
["VSTEST_RUNNER_DEBUG_ATTACHVS"] = "0",
1515
["VSTEST_HOST_DEBUG_ATTACHVS"] = "0",
1616
["VSTEST_DATACOLLECTOR_DEBUG_ATTACHVS"] = "0",
17-
["VSTEST_EXPERIMENTAL_FORWARD_OUTPUT_FEATURE"] = "1"
17+
["VSTEST_EXPERIMENTAL_FORWARD_OUTPUT_FEATURE"] = "0"
1818
};
1919

2020
}

‎playground/TestPlatform.Playground/Program.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ static void Main()
8888
""";
8989

9090
var sources = new[] {
91-
Path.Combine(playground, "MSTest1", "bin", "Debug", "net472", "MSTest1.dll"),
92-
//Path.Combine(playground, "MSTest2", "bin", "Debug", "net472", "MSTest2.dll"),
93-
//Path.Combine(playground, "MSTest1", "bin", "Debug", "net5.0", "MSTest1.dll"),
91+
Path.Combine(playground, "bin", "MSTest1", "Debug", "net472", "MSTest1.dll"),
92+
// Path.Combine(playground, "bin", "MSTest2", "Debug", "net472", "MSTest2.dll"),
93+
// Path.Combine(playground, "bin", "MSTest1", "Debug", "net5.0", "MSTest1.dll"),
9494
};
9595

9696
//// Console mode

‎playground/TestPlatform.Playground/TestPlatform.Playground.csproj

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -38,44 +38,40 @@
3838
<Reference Include="Microsoft.CSharp" />
3939
</ItemGroup>
4040

41-
<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition=" '$(OS)' == 'WINDOWS_NT' ">
41+
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
4242
<PropertyGroup>
43-
<SourcePath>$(RepoRoot)src\</SourcePath>
43+
<SourcePath>$(RepoRoot)artifacts\</SourcePath>
4444
<DestinationPath>$(TargetDir)vstest.console\</DestinationPath>
4545
</PropertyGroup>
4646

4747
<ItemGroup>
48-
<FileToCopy Include="$(SourcePath)vstest.console\bin\$(Configuration)\$(NetFrameworkMinimum)\**\*.*" SubFolder="" />
49-
<FileToCopy Include="$(SourcePath)Microsoft.TestPlatform.TestHostProvider\bin\$(Configuration)\$(NetFrameworkMinimum)\**\*.*" SubFolder="Extensions\" />
48+
<FileToCopy Include="$(SourcePath)bin\vstest.console\$(Configuration)\$(NetFrameworkMinimum)\win7-x64\**\*.*" SubFolder="" />
49+
<FileToCopy Include="$(SourcePath)bin\Microsoft.TestPlatform.TestHostProvider\$(Configuration)\$(NetFrameworkMinimum)\**\*.*" SubFolder="Extensions\" />
5050

5151
<!-- copy net462, net47, net471, net472 and net48 testhosts" -->
52-
<FileToCopy Include="$(SourcePath)testhost.x86\bin\$(Configuration)\$(NetFrameworkMinimum)\win7-x86\**\*.*" SubFolder="TestHostNetFramework\" />
53-
<FileToCopy Include="$(SourcePath)testhost\bin\$(Configuration)\$(NetFrameworkMinimum)\win7-x64\**\*.*" SubFolder="TestHostNetFramework\" />
54-
<FileToCopy Include="$(SourcePath)testhost.x86\bin\$(Configuration)\net47\win7-x86\**\*.*" SubFolder="TestHostNetFramework\" />
55-
<FileToCopy Include="$(SourcePath)testhost\bin\$(Configuration)\net47\win7-x64\**\*.*" SubFolder="TestHostNetFramework\" />
56-
<FileToCopy Include="$(SourcePath)testhost.x86\bin\$(Configuration)\net471\win7-x86\**\*.*" SubFolder="TestHostNetFramework\" />
57-
<FileToCopy Include="$(SourcePath)testhost\bin\$(Configuration)\net471\win7-x64\**\*.*" SubFolder="TestHostNetFramework\" />
58-
<FileToCopy Include="$(SourcePath)testhost.x86\bin\$(Configuration)\net472\win7-x86\**\*.*" SubFolder="TestHostNetFramework\" />
59-
<FileToCopy Include="$(SourcePath)testhost\bin\$(Configuration)\net472\win7-x64\**\*.*" SubFolder="TestHostNetFramework\" />
60-
<FileToCopy Include="$(SourcePath)testhost.x86\bin\$(Configuration)\net48\win7-x86\**\*.*" SubFolder="TestHostNetFramework\" />
61-
<FileToCopy Include="$(SourcePath)testhost\bin\$(Configuration)\net48\win7-x64\**\*.*" SubFolder="TestHostNetFramework\" />
52+
<FileToCopy Include="$(SourcePath)bin\testhost.x86\$(Configuration)\$(NetFrameworkMinimum)\win7-x86\**\*.*" SubFolder="TestHostNetFramework\" />
53+
<FileToCopy Include="$(SourcePath)bin\testhost\$(Configuration)\$(NetFrameworkMinimum)\win7-x64\**\*.*" SubFolder="TestHostNetFramework\" />
54+
<FileToCopy Include="$(SourcePath)bin\testhost.x86\$(Configuration)\net47\win7-x86\**\*.*" SubFolder="TestHostNetFramework\" />
55+
<FileToCopy Include="$(SourcePath)bin\testhost\$(Configuration)\net47\win7-x64\**\*.*" SubFolder="TestHostNetFramework\" />
56+
<FileToCopy Include="$(SourcePath)bin\testhost.x86\$(Configuration)\net471\win7-x86\**\*.*" SubFolder="TestHostNetFramework\" />
57+
<FileToCopy Include="$(SourcePath)bin\testhost\$(Configuration)\net471\win7-x64\**\*.*" SubFolder="TestHostNetFramework\" />
58+
<FileToCopy Include="$(SourcePath)bin\testhost.x86\$(Configuration)\net472\win7-x86\**\*.*" SubFolder="TestHostNetFramework\" />
59+
<FileToCopy Include="$(SourcePath)bin\testhost\$(Configuration)\net472\win7-x64\**\*.*" SubFolder="TestHostNetFramework\" />
60+
<FileToCopy Include="$(SourcePath)bin\testhost.x86\$(Configuration)\net48\win7-x86\**\*.*" SubFolder="TestHostNetFramework\" />
61+
<FileToCopy Include="$(SourcePath)bin\testhost\$(Configuration)\net48\win7-x64\**\*.*" SubFolder="TestHostNetFramework\" />
6262

6363
<!-- copy datacollectors" -->
64-
<FileToCopy Include="$(SourcePath)datacollector\bin\$(Configuration)\net472\**\*.*" SubFolder="" />
65-
<FileToCopy Include="$(SourcePath)Microsoft.TestPlatform.Extensions.BlameDataCollector\bin\$(Configuration)\net472\**\*.*" SubFolder="Extensions\" />
66-
<FileToCopy Include="$(SourcePath)DataCollectors\Microsoft.TestPlatform.Extensions.EventLogCollector\bin\$(Configuration)\$(NetFrameworkMinimum)\**\*.*" SubFolder="Extensions\" />
67-
<FileToCopy Include="$(SourcePath)DataCollectors\DumpMinitool\bin\$(Configuration)\$(NetFrameworkMinimum)\win7-x64\**\*.*" SubFolder="Extensions\blame\" />
68-
<FileToCopy Include="$(SourcePath)DataCollectors\DumpMinitool.x86\bin\$(Configuration)\$(NetFrameworkMinimum)\win7-x86\**\*.*" SubFolder="Extensions\blame\" />
69-
<FileToCopy Include="$(SourcePath)DataCollectors\DumpMinitool.arm64\bin\$(Configuration)\$(NetFrameworkMinimum)\win10-arm64\**\*.*" SubFolder="Extensions\blame\" />
64+
<FileToCopy Include="$(SourcePath)bin\datacollector\$(Configuration)\net472\win7-x64\**\*.*" SubFolder="" />
65+
<FileToCopy Include="$(SourcePath)bin\Microsoft.TestPlatform.Extensions.BlameDataCollector\$(Configuration)\net472\**\*.*" SubFolder="Extensions\" />
66+
<FileToCopy Include="$(SourcePath)bin\DataCollectors\Microsoft.TestPlatform.Extensions.EventLogCollector\$(Configuration)\$(NetFrameworkMinimum)\**\*.*" SubFolder="Extensions\" />
67+
<FileToCopy Include="$(SourcePath)bin\DataCollectors\DumpMinitool\$(Configuration)\$(NetFrameworkMinimum)\win7-x64\**\*.*" SubFolder="Extensions\blame\" />
68+
<FileToCopy Include="$(SourcePath)bin\DataCollectors\DumpMinitool.x86\$(Configuration)\$(NetFrameworkMinimum)\win7-x86\**\*.*" SubFolder="Extensions\blame\" />
69+
<FileToCopy Include="$(SourcePath)bin\DataCollectors\DumpMinitool.arm64\$(Configuration)\$(NetFrameworkMinimum)\win10-arm64\**\*.*" SubFolder="Extensions\blame\" />
7070
</ItemGroup>
7171

72-
<Copy SourceFiles="@(FileToCopy)"
73-
DestinationFiles="@(FileToCopy -> '$(DestinationPath)\%(SubFolder)\%(RecursiveDir)%(Filename)%(Extension)')"
74-
SkipUnchangedFiles="True" OverwriteReadOnlyFiles="True" Retries="3" RetryDelayMilliseconds="500"
75-
UseHardlinksIfPossible="False" UseSymboliclinksIfPossible="False" ErrorIfLinkFails="False"
76-
Condition="@(FileToCopy->Count()) > 0">
72+
<Copy SourceFiles="@(FileToCopy)" DestinationFiles="@(FileToCopy -> '$(DestinationPath)\%(SubFolder)\%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="True" OverwriteReadOnlyFiles="True" Retries="3" RetryDelayMilliseconds="500" UseHardlinksIfPossible="False" UseSymboliclinksIfPossible="False" ErrorIfLinkFails="False" Condition="@(FileToCopy-&gt;Count()) &gt; 0">
7773

78-
<Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
74+
<Output TaskParameter="DestinationFiles" ItemName="FileWrites" />
7975
</Copy>
8076
</Target>
8177
</Project>

‎src/Microsoft.TestPlatform.Execution.Shared/DebuggerBreakpoint.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ private static bool AttachVs(Process process, int? vsPid)
108108
var parent = Path.GetDirectoryName(Assembly.GetEntryAssembly()!.Location);
109109
while (parent != null)
110110
{
111-
var path = Path.Combine(parent, @"src\AttachVS\bin\Debug\net472\AttachVS.exe");
111+
var path = Path.Combine(parent, @"artifacts\bin\AttachVS\Debug\net472\AttachVS.exe");
112112
Debug.WriteLine($"Looking for AttachVS in: {path}.");
113113
if (File.Exists(path))
114114
{

0 commit comments

Comments
 (0)