Skip to content

Commit 0cbc52c

Browse files
JunTaoLuojkotalik
authored andcommitted
Convert ServerTests to Reference and move to Server folder (#4686)
1 parent b079041 commit 0cbc52c

Some content is hidden

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

41 files changed

+283
-396
lines changed

build/buildorder.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
<ItemGroup>
1010
<RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" />
11-
<RepositoryBuildOrder Include="ServerTests" Order="11" RootPath="$(RepositoryRoot)src\ServerTests\" />
1211
<RepositoryBuildOrder Include="Mvc" Order="14" RootPath="$(RepositoryRoot)src\Mvc\" />
1312
<RepositoryBuildOrder Include="AADIntegration" Order="15" RootPath="$(RepositoryRoot)src\AADIntegration\" />
1413
<RepositoryBuildOrder Include="Identity" Order="15" RootPath="$(RepositoryRoot)src\Identity\" />

build/dependencies.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@
8080
<MicrosoftExtensionsWebEncodersPackageVersion>2.1.1</MicrosoftExtensionsWebEncodersPackageVersion>
8181

8282
<!-- These dependencies are temporary while we refactor package refs into project refs. -->
83+
<MicrosoftAspNetCoreAspNetCoreModulePackageVersion>2.1.1</MicrosoftAspNetCoreAspNetCoreModulePackageVersion>
84+
<MicrosoftAspNetCoreAspNetCoreModuleV1PackageVersion>2.1.1</MicrosoftAspNetCoreAspNetCoreModuleV1PackageVersion>
8385
<MicrosoftExtensionsBuffersTestingSourcesPackageVersion>2.1.1</MicrosoftExtensionsBuffersTestingSourcesPackageVersion>
8486
<MicrosoftAspNetCoreHostingWebHostBuilderFactorySourcesPackageVersion>2.1.1</MicrosoftAspNetCoreHostingWebHostBuilderFactorySourcesPackageVersion>
8587
<MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.5.1</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>

build/submodules.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
<!-- Test-only repos -->
4343
<Repository Include="AuthSamples" PatchPolicy="AlwaysUpdateAndCascadeVersions" RootPath="$(RepositoryRoot)src\AuthSamples\" />
4444
<Repository Include="MusicStore" PatchPolicy="AlwaysUpdateAndCascadeVersions" RootPath="$(RepositoryRoot)src\MusicStore\" />
45-
<Repository Include="ServerTests" PatchPolicy="AlwaysUpdateAndCascadeVersions" RootPath="$(RepositoryRoot)src\ServerTests\" />
4645
</ItemGroup>
4746

4847
<ItemGroup>

src/MusicStore/test/MusicStore.E2ETests/SmokeTests_X64.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public Task SmokeTests_X64_WebListener_CoreClr_Standalone()
3737
return _smokeTestRunner.SmokeTestSuite(ServerType.WebListener, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, ApplicationType.Standalone);
3838
}
3939
#if !NETCOREAPP2_0 // Avoid running CLR based tests once on netcoreapp2.0 and netcoreapp2.1 each
40-
[ConditionalFact(Skip = "https://github.com/aspnet/websdk/pull/322")]
40+
[ConditionalFact]
4141
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
4242
public Task SmokeTests_X64_IISExpress_Clr()
4343
{

src/ServerTests/.gitignore

Lines changed: 0 additions & 31 deletions
This file was deleted.

src/ServerTests/Directory.Build.props

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/ServerTests/Directory.Build.targets

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/ServerTests/NuGetPackageVerifier.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/ServerTests/README.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/ServerTests/ServerTests.sln

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)