Remove the WebSockets submodule

This commit is contained in:
Nate McMaster 2018-10-17 14:35:48 -07:00
parent 9e952a22ed
commit b1427c759b
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
7 changed files with 24 additions and 12 deletions

View File

@ -15,14 +15,21 @@ phases:
- template: .vsts-pipelines/templates/project-ci.yml@buildtools
parameters:
buildArgs: "/t:FastCheck"
- phase: DataProtection
queue: Hosted VS2017
- phase: RepoBuilds
queue:
name: Hosted VS2017
parallel: 2
matrix:
DataProtection:
_FolderName: DataProtection
WebSockets:
_FolderName: WebSockets
steps:
- script: src/DataProtection/build.cmd -ci
displayName: Run src/DataProtection/build.cmd
- script: src/$(_FolderName)/build.cmd -ci
displayName: Run src/$(_FolderName)/build.cmd
- task: PublishTestResults@2
displayName: Publish test results
condition: always()
inputs:
testRunner: vstest
testResultsFiles: 'src/DataProtection/artifacts/logs/**/*.trx'
testResultsFiles: 'src/$(_FolderName)/artifacts/logs/**/*.trx'

4
.gitmodules vendored
View File

@ -178,7 +178,3 @@
path = modules/Testing
url = https://github.com/aspnet/Testing.git
branch = release/2.1
[submodule "modules/WebSockets"]
path = modules/WebSockets
url = https://github.com/aspnet/WebSockets.git
branch = release/2.1

View File

@ -40,7 +40,7 @@
<RepositoryBuildOrder Include="ServerTests" Order="11" />
<RepositoryBuildOrder Include="Diagnostics" Order="12" />
<RepositoryBuildOrder Include="Localization" Order="12" />
<RepositoryBuildOrder Include="WebSockets" Order="13" />
<RepositoryBuildOrder Include="WebSockets" Order="13" RootPath="$(RepositoryRoot)src\WebSockets\" />
<RepositoryBuildOrder Include="Security" Order="13" />
<RepositoryBuildOrder Include="MetaPackages" Order="13" />
<RepositoryBuildOrder Include="Mvc" Order="14" />

View File

@ -87,6 +87,6 @@
<ShippedRepository Include="SignalR" />
<ShippedRepository Include="StaticFiles" />
<ShippedRepository Include="Testing" />
<ShippedRepository Include="WebSockets" />
<ShippedRepository Include="WebSockets" RootPath="$(RepositoryRoot)src\WebSockets\" />
</ItemGroup>
</Project>

@ -1 +0,0 @@
Subproject commit 67f2c3149efd03511794ed64726a196ee0b1ab36

3
src/WebSockets/build.cmd Normal file
View File

@ -0,0 +1,3 @@
@ECHO OFF
SET RepoRoot="%~dp0..\.."
%RepoRoot%\build.cmd -LockFile %RepoRoot%\korebuild-lock.txt -Path %~dp0 %*

7
src/WebSockets/build.sh Executable file
View File

@ -0,0 +1,7 @@
#!/usr/bin/env bash
set -euo pipefail
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
repo_root="$DIR/../.."
"$repo_root/build.sh" --path "$DIR" --lockfile "$repo_root/korebuild-lock.txt" "$@"