huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reorganize helix files (#7353)

This commit is contained in:
Hao Kung 2019-02-07 16:27:48 -08:00 committed by GitHub
parent ff83aea5fe
commit 26acbc3861
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Directory.Build.targets
View File

@ -137,17 +137,17 @@
<!-- Windows NetCore -->
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework' AND $(IsWindowsHelixQueue)" >
<_CopyItems Include="$(MSBuildThisFileDirectory)test\vstest\runtests.cmd" />
<_CopyItems Include="$(MSBuildThisFileDirectory)eng\helix\vstest\runtests.cmd" />
</ItemGroup>
<!-- Windows NetFramework -->
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' AND $(IsWindowsHelixQueue)" >
<_CopyItems Include="$(MSBuildThisFileDirectory)test\xunit\runtests.cmd" />
<_CopyItems Include="$(MSBuildThisFileDirectory)eng\helix\xunit\runtests.cmd" />
</ItemGroup>
<!-- NonWindows -->
<ItemGroup Condition="!$(IsWindowsHelixQueue)" >
<_CopyItems Include="$(MSBuildThisFileDirectory)test\vstest\runtests.sh" />
<_CopyItems Include="$(MSBuildThisFileDirectory)eng\helix\vstest\runtests.sh" />
</ItemGroup>
<Copy SourceFiles="@(_CopyItems)" DestinationFolder="$(PublishAbsoluteDir)" />

2
build/repo.targets
View File

@ -131,7 +131,7 @@
<PropertyGroup>
<HelixTestProjects>@(HelixTestProject)</HelixTestProjects>
</PropertyGroup>
<MSBuild Projects="$(MSBuildThisFileDirectory)..\test\helix.proj"
<MSBuild Projects="$(MSBuildThisFileDirectory)..\eng\helix\helix.proj"
Targets="Test"
Properties="ProjectsToTest=$(HelixTestProjects)"
ContinueOnError="ErrorAndStop"

2
test/helix.proj → eng/helix/helix.proj
View File

@ -29,7 +29,7 @@
<HelixBuild>private-$(USERNAME)</HelixBuild>
<HelixBuild Condition=" '$(USERNAME)' == '' ">private-$(USER)</HelixBuild>
<HelixBuild Condition=" '$(CI)' == 'true' ">$(BUILD_BUILDNUMBER)</HelixBuild>
<WaitForWorkItemCompletion>true</WaitForWorkItemCompletion>
<WaitForWorkItemCompletion Condition=" '$(CI)' == 'true' ">true</WaitForWorkItemCompletion>
<FailOnMissionControlTestFailure>true</FailOnMissionControlTestFailure>
<EnableAzurePipelinesReporter>false</EnableAzurePipelinesReporter>
<IsExternal>true</IsExternal>

0
test/vstest/runtests.cmd → eng/helix/vstest/runtests.cmd
View File

0
test/vstest/runtests.sh → eng/helix/vstest/runtests.sh
View File

0
test/xunit/runtests.cmd → eng/helix/xunit/runtests.cmd
View File

2
src/Components/Blazor/Build/test/Microsoft.AspNetCore.Blazor.Build.Tests.csproj
View File

@ -30,7 +30,7 @@
<ItemGroup>
<ProjectReference Include="..\..\testassets\StandaloneApp\StandaloneApp.csproj" />
<Compile Include="..\..\..\..\..\test\xunit\SkipOnHelixAttribute.cs" />
<Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
<Compile Include="$(ComponentsSharedSourceRoot)test\**\*.cs" LinkBase="Helpers" />
</ItemGroup>

2
src/DataProtection/Extensions/test/Microsoft.AspNetCore.DataProtection.Extensions.Tests.csproj
View File

@ -7,7 +7,7 @@
<ItemGroup>
<Compile Include="..\..\shared\test\*.cs" />
<Content Include="TestFiles\**\*" CopyToOutputDirectory="PreserveNewest" />
<Compile Include="..\..\..\..\test\xunit\SkipOnHelixAttribute.cs" />
<Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
</ItemGroup>
<ItemGroup>

2
src/Hosting/Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj
View File

@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="..\..\..\..\test\xunit\SkipOnHelixAttribute.cs" />
<Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
<Content Include="testroot\**\*" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
</ItemGroup>

2
src/Identity/ApiAuthorization.IdentityServer/test/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Tests.csproj
View File

@ -6,7 +6,7 @@
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" />
<Compile Include="..\..\..\..\test\xunit\SkipOnHelixAttribute.cs" />
<Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
</ItemGroup>
<ItemGroup>

2
src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj
View File

@ -6,7 +6,7 @@
<ItemGroup>
<Compile Include="$(IdentityTestSharedSourceRoot)**\*.cs" />
<Compile Include="..\..\..\..\test\xunit\SkipOnHelixAttribute.cs" />
<Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
</ItemGroup>
<ItemGroup>

2
src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj
View File

@ -7,7 +7,7 @@
<ItemGroup>
<Compile Include="$(SharedSourceRoot)NullScope.cs" />
<Compile Include="$(KestrelSharedSourceRoot)test\*.cs" LinkBase="shared" />
<Compile Include="..\..\..\..\..\test\xunit\SkipOnHelixAttribute.cs" />
<Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
<Content Include="$(KestrelSharedSourceRoot)test\TestCertificates\*.pfx" LinkBase="shared\TestCertificates" CopyToOutputDirectory="PreserveNewest" />
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">

2
src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj
View File

@ -13,7 +13,7 @@
<Compile Include="$(KestrelSharedSourceRoot)test\TransportTestHelpers\IWebHostPortExtensions.cs" LinkBase="shared" />
<Compile Include="$(KestrelSharedSourceRoot)test\TestResources.cs" LinkBase="shared" />
<Content Include="$(KestrelSharedSourceRoot)test\TestCertificates\*.pfx" LinkBase="shared\TestCertificates" CopyToOutputDirectory="PreserveNewest" />
<Compile Include="..\..\..\..\..\test\xunit\SkipOnHelixAttribute.cs" />
<Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
</ItemGroup>
<ItemGroup>

2
src/Servers/Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj
View File

@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="..\..\..\..\..\test\xunit\SkipOnHelixAttribute.cs" />
<Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
<Compile Include="..\BindTests\**\*.cs" />
<Compile Include="..\Libuv.FunctionalTests\TransportSelector.cs" />
<Compile Include="$(SharedSourceRoot)NullScope.cs" />

2
src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj
View File

@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="..\..\..\..\..\test\xunit\SkipOnHelixAttribute.cs" />
<Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
<Compile Include="..\BindTests\**\*.cs" />
<Compile Include="..\Sockets.FunctionalTests\TransportSelector.cs" />
<Compile Include="$(SharedSourceRoot)NullScope.cs" />

0
test/xunit/SkipOnHelixAttribute.cs → src/Shared/test/SkipOnHelixAttribute.cs
View File

2
src/Tools/FirstRunCertGenerator/test/Microsoft.AspNetCore.DeveloperCertificates.XPlat.Tests.csproj
View File

@ -6,7 +6,7 @@
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.DeveloperCertificates.XPlat" />
<Compile Include="..\..\..\..\test\xunit\SkipOnHelixAttribute.cs" />
<Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
</ItemGroup>
</Project>