Skip to content

Commit 195b387

Browse files
marcpopMSFTmarcpopMSFT
authored
Merge pull request #25057 from dotnet/marcpopMSFT-smallerhelixchange
Next helix test move
2 parents c06cbe6 + c98a357 commit 195b387

File tree

6 files changed

+34
-23
lines changed

6 files changed

+34
-23
lines changed

‎build/RunTestsOnHelix.cmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ FOR /F "tokens=*" %%g IN ('PowerShell -ExecutionPolicy ByPass [System.IO.Path]::
2323
set TestExecutionDirectory=%TEMP%\dotnetSdkTests\%RandomDirectoryName%
2424
set DOTNET_CLI_HOME=%TestExecutionDirectory%\.dotnet
2525
mkdir %TestExecutionDirectory%
26-
robocopy %HELIX_CORRELATION_PAYLOAD%\t\TestExecutionDirectoryFiles %TestExecutionDirectory%
26+
robocopy %HELIX_CORRELATION_PAYLOAD%\t\TestExecutionDirectoryFiles %TestExecutionDirectory% /s
2727

2828
REM call dotnet new so the first run message doesn't interfere with the first test
29-
dotnet new
29+
dotnet new --debug:ephemeral-hive
3030
REM avoid potetial cocurrency issues when nuget is creating nuget.config
3131
dotnet nuget list source

‎build/RunTestsOnHelix.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ export DOTNET_CLI_HOME=$TestExecutionDirectory/.dotnet
1515
cp -a $HELIX_CORRELATION_PAYLOAD/t/TestExecutionDirectoryFiles/. $TestExecutionDirectory/
1616

1717
# call dotnet new so the first run message doesn't interfere with the first test
18-
dotnet new
18+
dotnet new --debug:ephemeral-hive
1919
# avoid potetial concurrency issues when nuget is creating nuget.config
2020
dotnet nuget list source

‎src/Tests/EndToEnd.Tests/EndToEnd.Tests.csproj

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<PropertyGroup>
3+
<OutDirName>Tests\$(MSBuildProjectName)</OutDirName>
4+
</PropertyGroup>
5+
6+
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
7+
28
<PropertyGroup>
39
<TargetFramework>$(ToolsetTargetFramework)</TargetFramework>
410
<OutputType>Exe</OutputType>
@@ -8,4 +14,6 @@
814
<ItemGroup>
915
<ProjectReference Include="..\Microsoft.NET.TestFramework\Microsoft.NET.TestFramework.csproj" />
1016
</ItemGroup>
17+
18+
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
1119
</Project>

‎src/Tests/UnitTests.proj

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@
3434
<Target Name="CopyHelixFiles" AfterTargets="Publish">
3535

3636
<ItemGroup>
37-
<BuiltSdks Include="$(RepoRoot)\artifacts\bin\$(Configuration)\Sdks\**\*.*"/>
37+
<BuiltSdks Include="$(RepoRoot)artifacts\bin\$(Configuration)\Sdks\**\*.*"/>
3838

3939
<!-- All the following files are just to get full framework msbuild while avoid to duplicated arcade logic by copying
4040
arcade and run it -->
41-
<Engfolder Include="$(RepoRoot)\eng\**\*.*"/>
42-
<DotToolsFolder Include="$(RepoRoot)\.tools\**\*.*"/>
43-
<GlobalJson Include="$(RepoRoot)\global.json"/>
41+
<Engfolder Include="$(RepoRoot)eng\**\*.*"/>
42+
<DotToolsFolder Include="$(RepoRoot).tools\**\*.*"/>
43+
<GlobalJson Include="$(RepoRoot)global.json"/>
4444
<!-- Get full framework msbuild end -->
4545

4646
<!-- include .dotnet folder. So there is no extra first run experience run during the test -->
@@ -52,14 +52,18 @@
5252
<TestExecutionDirectoryFiles Include="$(ArtifactsTmpDir)NuGet.config"/>
5353
<TestExecutionDirectoryFiles Include="$(ArtifactsTmpDir)Directory.Build.props"/>
5454
<TestExecutionDirectoryFiles Include="$(ArtifactsTmpDir)Directory.Build.targets"/>
55-
56-
<FilesInHelixRoot Include="$(RepoRoot)\artifacts\tmp\$(Configuration)\NuGet.config"/>
57-
<FilesInHelixRoot Condition="$([MSBuild]::IsOSPlatform(`Windows`))" Include="$(RepoRoot)\build\RunTestsOnHelix.cmd"/>
58-
<FilesInHelixRoot Condition=" '$([MSBuild]::IsOSPlatform(`Windows`))' == 'false' " Include="$(RepoRoot)\build\RunTestsOnHelix.sh"/>
55+
<TestExecutionDirectoryFiles Include="$(RepoRoot)testAsset.props"/>
56+
<TestExecutionDirectoryFiles Include="$(RepoRoot)eng\Versions.props">
57+
<DestinationFolder>eng/</DestinationFolder>
58+
</TestExecutionDirectoryFiles>
59+
60+
<FilesInHelixRoot Include="$(RepoRoot)artifacts\tmp\$(Configuration)\NuGet.config"/>
61+
<FilesInHelixRoot Condition="$([MSBuild]::IsOSPlatform(`Windows`))" Include="$(RepoRoot)build\RunTestsOnHelix.cmd"/>
62+
<FilesInHelixRoot Condition=" '$([MSBuild]::IsOSPlatform(`Windows`))' == 'false' " Include="$(RepoRoot)build\RunTestsOnHelix.sh"/>
5963
</ItemGroup>
6064

6165
<PropertyGroup>
62-
<HelixPayloadOnHost>$(RepoRoot)\artifacts\tmp\Helixpayload</HelixPayloadOnHost>
66+
<HelixPayloadOnHost>$(RepoRoot)artifacts\tmp\Helixpayload</HelixPayloadOnHost>
6367
</PropertyGroup>
6468

6569
<Copy SourceFiles="@(Engfolder)" DestinationFiles="@(Engfolder->'$(HelixPayloadOnHost)\eng\%(RecursiveDir)%(Filename)%(Extension)')" />
@@ -68,7 +72,7 @@
6872

6973
<Copy SourceFiles="@(FilesInHelixRoot)" DestinationFiles="@(FilesInHelixRoot->'$(HelixPayloadOnHost)\%(RecursiveDir)%(Filename)%(Extension)')" />
7074

71-
<Copy SourceFiles="@(TestExecutionDirectoryFiles)" DestinationFiles="@(TestExecutionDirectoryFiles->'$(HelixPayloadOnHost)\TestExecutionDirectoryFiles\%(RecursiveDir)%(Filename)%(Extension)')" />
75+
<Copy SourceFiles="@(TestExecutionDirectoryFiles)" DestinationFiles="@(TestExecutionDirectoryFiles->'$(HelixPayloadOnHost)\TestExecutionDirectoryFiles\%(RecursiveDir)%(DestinationFolder)%(Filename)%(Extension)')" />
7276
<Copy SourceFiles="@(DotnetCliHome)" DestinationFiles="@(DotnetCliHome->'$(HelixPayloadOnHost)\TestExecutionDirectoryFiles\.dotnet\%(RecursiveDir)%(Filename)%(Extension)')" />
7377
<Copy SourceFiles="@(Testpackages)" DestinationFiles="@(Testpackages->'$(HelixPayloadOnHost)\TestExecutionDirectoryFiles\Testpackages\%(RecursiveDir)%(Filename)%(Extension)')" />
7478
</Target>
@@ -78,11 +82,11 @@
7882
<PropertyGroup>
7983
<HelixPreCommands Condition="!$(IsPosixShell)">call %HELIX_CORRELATION_PAYLOAD%\t\RunTestsOnHelix.cmd $(TestFullMSBuild);$(HelixPreCommands)</HelixPreCommands>
8084
<HelixPreCommands Condition="$(IsPosixShell)">. $HELIX_CORRELATION_PAYLOAD/t/RunTestsOnHelix.sh;$(HelixPreCommands)</HelixPreCommands>
81-
<TestDotnetRoot>$(RepoRoot)\artifacts\bin\redist\$(Configuration)\dotnet</TestDotnetRoot>
85+
<TestDotnetRoot>$(RepoRoot)artifacts\bin\redist\$(Configuration)\dotnet</TestDotnetRoot>
8286
<TestDotnetVersion>$(Version)</TestDotnetVersion>
83-
<MSBuildSdkResolverDir>$(RepoRoot)\artifacts\bin\Microsoft.DotNet.MSBuildSdkResolver</MSBuildSdkResolverDir>
84-
<HelixStage0Targz>$(RepoRoot)\artifacts\tmp\HelixStage0.tar.gz</HelixStage0Targz>
85-
<MicrosoftNETBuildExtensions>$(RepoRoot)\artifacts\bin\$(Configuration)\Sdks\Microsoft.NET.Build.Extensions</MicrosoftNETBuildExtensions>
87+
<MSBuildSdkResolverDir>$(RepoRoot)artifacts\bin\Microsoft.DotNet.MSBuildSdkResolver</MSBuildSdkResolverDir>
88+
<HelixStage0Targz>$(RepoRoot)artifacts\tmp\HelixStage0.tar.gz</HelixStage0Targz>
89+
<MicrosoftNETBuildExtensions>$(RepoRoot)artifacts\bin\$(Configuration)\Sdks\Microsoft.NET.Build.Extensions</MicrosoftNETBuildExtensions>
8690
</PropertyGroup>
8791

8892
<TarGzFileCreateFromDirectory
@@ -122,6 +126,6 @@
122126
<Target Name="CreateLocalHelixTestLayout" DependsOnTargets="AppendHelixPreCommand">
123127
<CreateLocalHelixTestLayout
124128
HelixCorrelationPayload="@(HelixCorrelationPayload)"
125-
TestOutputDirectory="$(RepoRoot)\artifacts\bin\localHelixTestLayout" />
129+
TestOutputDirectory="$(RepoRoot)artifacts\bin\localHelixTestLayout" />
126130
</Target>
127131
</Project>

‎src/Tests/dotnet-workload-install.Tests/GivenDotnetWorkloadInstall.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ public void GivenWorkloadInstallItWarnsWhenTheWorkloadIsAlreadyInstalled()
487487
Directory.GetFiles(installRecordPath).Count().Should().Be(2);
488488
}
489489

490-
[Fact]
490+
[Fact(Skip="https://github.com/dotnet/sdk/issues/25175")]
491491
public void HideManifestUpdateCheckWhenVerbosityIsQuiet()
492492
{
493493
var command = new DotnetCommand(Log);
@@ -502,7 +502,7 @@ public void HideManifestUpdateCheckWhenVerbosityIsQuiet()
502502
}
503503

504504

505-
[Theory]
505+
[Theory(Skip="https://github.com/dotnet/sdk/issues/25175")]
506506
[InlineData("--verbosity:minimal")]
507507
[InlineData("--verbosity:normal")]
508508
public void HideManifestUpdatesWhenVerbosityIsMinimalOrNormal(string verbosityFlag)
@@ -518,7 +518,7 @@ public void HideManifestUpdatesWhenVerbosityIsMinimalOrNormal(string verbosityFl
518518
.NotHaveStdOutContaining(Workloads.Workload.Install.LocalizableStrings.AdManifestUpdated);
519519
}
520520

521-
[Theory]
521+
[Theory(Skip="https://github.com/dotnet/sdk/issues/25175")]
522522
[InlineData("--verbosity:detailed")]
523523
[InlineData("--verbosity:diagnostic")]
524524
public void ShowManifestUpdatesWhenVerbosityIsDetailedOrDiagnostic(string verbosityFlag)

‎src/Tests/testsProjectCannotRunOnHelixList.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
Microsoft.DotNet.Cli.Utils.Tests
2-
EndToEnd.Tests
32
Microsoft.DotNet.Tools.Tests.Utilities.Tests
43
dotnet.Tests
54
msbuild.Integration.Tests

0 commit comments

Comments
 (0)