From 5d84c92b746eaad111b143e62d4621291df9c46f Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Wed, 17 Oct 2018 14:27:00 -0700
Subject: [PATCH] Reorganize source code in preparation to move into
aspnet/AspNetCore
Prior to reorganiziation, this source code was found in https://github.com/aspnet/WebSockets/tree/67f2c3149efd03511794ed64726a196ee0b1ab36
---
.appveyor.yml | 23 --
.gitattributes | 52 ----
.github/ISSUE_TEMPLATE.md | 3 -
.travis.yml | 29 ---
CONTRIBUTING.md | 4 -
LICENSE.txt | 14 --
NuGet.config | 7 -
build.cmd | 2 -
build.sh | 8 -
korebuild-lock.txt | 2 -
korebuild.json | 4 -
run.cmd | 2 -
run.ps1 | 196 ---------------
run.sh | 231 ------------------
.gitignore => src/WebSockets/.gitignore | 0
.../WebSockets/Directory.Build.props | 0
.../WebSockets/Directory.Build.targets | 0
.../WebSockets/NuGetPackageVerifier.json | 0
README.md => src/WebSockets/README.md | 0
.../WebSockets/WebSockets.sln | 0
{build => src/WebSockets/build}/Key.snk | Bin
.../WebSockets/build}/dependencies.props | 0
{build => src/WebSockets/build}/repo.props | 0
{build => src/WebSockets/build}/repo.targets | 0
.../WebSockets/build}/setup-wstest.ps1 | 0
.../WebSockets/build}/setup-wstest.sh | 0
{build => src/WebSockets/build}/sources.props | 0
.../AutobahnTestAppAspNet4.csproj.aspnet4 | 0
.../AutobahnTestAppAspNet4/EchoSocket.ashx | 0
.../AutobahnTestAppAspNet4/EchoSocket.ashx.cs | 0
.../Properties/AssemblyInfo.cs | 0
.../AutobahnTestAppAspNet4/Web.Debug.config | 0
.../AutobahnTestAppAspNet4/Web.Release.config | 0
.../AutobahnTestAppAspNet4/Web.config | 0
.../AutobahnTestAppAspNet4/packages.config | 0
.../AutobahnTestAppAspNet4/wstest-spec.json | 0
.../AutobahnTestAppHttpListener/App.config | 0
.../AutobahnTestAppHttpListener.csproj.net461 | 0
.../AutobahnTestAppHttpListener/Program.cs | 0
.../Properties/AssemblyInfo.cs | 0
.../samples}/EchoApp/EchoApp.csproj | 0
.../WebSockets/samples}/EchoApp/Program.cs | 0
.../EchoApp/Properties/launchSettings.json | 0
.../WebSockets/samples}/EchoApp/Startup.cs | 0
.../samples}/EchoApp/wwwroot/index.html | 0
.../WebSockets/samples}/TestServer/App.config | 0
.../WebSockets/samples}/TestServer/Program.cs | 0
.../TestServer/Properties/AssemblyInfo.cs | 0
.../samples}/TestServer/TestServer.csproj | 0
.../src}/Directory.Build.props | 0
.../ExtendedWebSocketAcceptContext.cs | 0
.../Internal/Constants.cs | 0
.../Internal/HandshakeHelpers.cs | 0
.../Microsoft.AspNetCore.WebSockets.csproj | 0
.../WebSocketMiddleware.cs | 0
.../WebSocketMiddlewareExtensions.cs | 0
.../WebSocketOptions.cs | 0
.../baseline.netcore.json | 0
.../AutobahnTestApp/AutobahnTestApp.csproj | 0
.../test}/AutobahnTestApp/Program.cs | 0
.../Properties/launchSettings.json | 0
.../test}/AutobahnTestApp/README.md | 0
.../test}/AutobahnTestApp/Startup.cs | 0
.../TestResources/testCert.pfx | Bin
.../TestResources/testCert.txt | 0
.../scripts/RunAutobahnTests.ps1 | 0
.../scripts/autobahn.spec.json | 0
.../WebSockets/test}/Directory.Build.props | 0
.../Autobahn/AutobahnCaseResult.cs | 0
.../Autobahn/AutobahnExpectations.cs | 0
.../Autobahn/AutobahnResult.cs | 0
.../Autobahn/AutobahnServerResult.cs | 0
.../Autobahn/AutobahnSpec.cs | 0
.../Autobahn/AutobahnTester.cs | 0
.../Autobahn/Executable.cs | 0
.../Autobahn/Expectation.cs | 0
.../Autobahn/ServerSpec.cs | 0
.../Autobahn/Wstest.cs | 0
.../AutobahnTests.cs | 0
.../Helpers.cs | 0
.../Http.config | 0
...pNetCore.WebSockets.ConformanceTest.csproj | 0
.../SkipIfWsTestNotPresentAttribute.cs | 0
.../BufferStream.cs | 0
.../DuplexStream.cs | 0
.../IWebHostPortExtensions.cs | 0
.../KestrelWebSocketHelpers.cs | 0
...icrosoft.AspNetCore.WebSockets.Test.csproj | 0
.../SendReceiveTests.cs | 0
.../WebSocketMiddlewareTests.cs | 0
.../WebSocketPair.cs | 0
version.props => src/WebSockets/version.props | 0
92 files changed, 577 deletions(-)
delete mode 100644 .appveyor.yml
delete mode 100644 .gitattributes
delete mode 100644 .github/ISSUE_TEMPLATE.md
delete mode 100644 .travis.yml
delete mode 100644 CONTRIBUTING.md
delete mode 100644 LICENSE.txt
delete mode 100644 NuGet.config
delete mode 100644 build.cmd
delete mode 100755 build.sh
delete mode 100644 korebuild-lock.txt
delete mode 100644 korebuild.json
delete mode 100644 run.cmd
delete mode 100644 run.ps1
delete mode 100755 run.sh
rename .gitignore => src/WebSockets/.gitignore (100%)
rename Directory.Build.props => src/WebSockets/Directory.Build.props (100%)
rename Directory.Build.targets => src/WebSockets/Directory.Build.targets (100%)
rename NuGetPackageVerifier.json => src/WebSockets/NuGetPackageVerifier.json (100%)
rename README.md => src/WebSockets/README.md (100%)
rename WebSockets.sln => src/WebSockets/WebSockets.sln (100%)
rename {build => src/WebSockets/build}/Key.snk (100%)
rename {build => src/WebSockets/build}/dependencies.props (100%)
rename {build => src/WebSockets/build}/repo.props (100%)
rename {build => src/WebSockets/build}/repo.targets (100%)
rename {build => src/WebSockets/build}/setup-wstest.ps1 (100%)
rename {build => src/WebSockets/build}/setup-wstest.sh (100%)
rename {build => src/WebSockets/build}/sources.props (100%)
rename {samples => src/WebSockets/samples}/AutobahnTestAppAspNet4/AutobahnTestAppAspNet4.csproj.aspnet4 (100%)
rename {samples => src/WebSockets/samples}/AutobahnTestAppAspNet4/EchoSocket.ashx (100%)
rename {samples => src/WebSockets/samples}/AutobahnTestAppAspNet4/EchoSocket.ashx.cs (100%)
rename {samples => src/WebSockets/samples}/AutobahnTestAppAspNet4/Properties/AssemblyInfo.cs (100%)
rename {samples => src/WebSockets/samples}/AutobahnTestAppAspNet4/Web.Debug.config (100%)
rename {samples => src/WebSockets/samples}/AutobahnTestAppAspNet4/Web.Release.config (100%)
rename {samples => src/WebSockets/samples}/AutobahnTestAppAspNet4/Web.config (100%)
rename {samples => src/WebSockets/samples}/AutobahnTestAppAspNet4/packages.config (100%)
rename {samples => src/WebSockets/samples}/AutobahnTestAppAspNet4/wstest-spec.json (100%)
rename {samples => src/WebSockets/samples}/AutobahnTestAppHttpListener/App.config (100%)
rename {samples => src/WebSockets/samples}/AutobahnTestAppHttpListener/AutobahnTestAppHttpListener.csproj.net461 (100%)
rename {samples => src/WebSockets/samples}/AutobahnTestAppHttpListener/Program.cs (100%)
rename {samples => src/WebSockets/samples}/AutobahnTestAppHttpListener/Properties/AssemblyInfo.cs (100%)
rename {samples => src/WebSockets/samples}/EchoApp/EchoApp.csproj (100%)
rename {samples => src/WebSockets/samples}/EchoApp/Program.cs (100%)
rename {samples => src/WebSockets/samples}/EchoApp/Properties/launchSettings.json (100%)
rename {samples => src/WebSockets/samples}/EchoApp/Startup.cs (100%)
rename {samples => src/WebSockets/samples}/EchoApp/wwwroot/index.html (100%)
rename {samples => src/WebSockets/samples}/TestServer/App.config (100%)
rename {samples => src/WebSockets/samples}/TestServer/Program.cs (100%)
rename {samples => src/WebSockets/samples}/TestServer/Properties/AssemblyInfo.cs (100%)
rename {samples => src/WebSockets/samples}/TestServer/TestServer.csproj (100%)
rename src/{ => WebSockets/src}/Directory.Build.props (100%)
rename src/{ => WebSockets/src}/Microsoft.AspNetCore.WebSockets/ExtendedWebSocketAcceptContext.cs (100%)
rename src/{ => WebSockets/src}/Microsoft.AspNetCore.WebSockets/Internal/Constants.cs (100%)
rename src/{ => WebSockets/src}/Microsoft.AspNetCore.WebSockets/Internal/HandshakeHelpers.cs (100%)
rename src/{ => WebSockets/src}/Microsoft.AspNetCore.WebSockets/Microsoft.AspNetCore.WebSockets.csproj (100%)
rename src/{ => WebSockets/src}/Microsoft.AspNetCore.WebSockets/WebSocketMiddleware.cs (100%)
rename src/{ => WebSockets/src}/Microsoft.AspNetCore.WebSockets/WebSocketMiddlewareExtensions.cs (100%)
rename src/{ => WebSockets/src}/Microsoft.AspNetCore.WebSockets/WebSocketOptions.cs (100%)
rename src/{ => WebSockets/src}/Microsoft.AspNetCore.WebSockets/baseline.netcore.json (100%)
rename {test => src/WebSockets/test}/AutobahnTestApp/AutobahnTestApp.csproj (100%)
rename {test => src/WebSockets/test}/AutobahnTestApp/Program.cs (100%)
rename {test => src/WebSockets/test}/AutobahnTestApp/Properties/launchSettings.json (100%)
rename {test => src/WebSockets/test}/AutobahnTestApp/README.md (100%)
rename {test => src/WebSockets/test}/AutobahnTestApp/Startup.cs (100%)
rename {test => src/WebSockets/test}/AutobahnTestApp/TestResources/testCert.pfx (100%)
rename {test => src/WebSockets/test}/AutobahnTestApp/TestResources/testCert.txt (100%)
rename {test => src/WebSockets/test}/AutobahnTestApp/scripts/RunAutobahnTests.ps1 (100%)
rename {test => src/WebSockets/test}/AutobahnTestApp/scripts/autobahn.spec.json (100%)
rename {test => src/WebSockets/test}/Directory.Build.props (100%)
rename {test => src/WebSockets/test}/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnCaseResult.cs (100%)
rename {test => src/WebSockets/test}/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnExpectations.cs (100%)
rename {test => src/WebSockets/test}/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnResult.cs (100%)
rename {test => src/WebSockets/test}/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnServerResult.cs (100%)
rename {test => src/WebSockets/test}/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnSpec.cs (100%)
rename {test => src/WebSockets/test}/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnTester.cs (100%)
rename {test => src/WebSockets/test}/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/Executable.cs (100%)
rename {test => src/WebSockets/test}/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/Expectation.cs (100%)
rename {test => src/WebSockets/test}/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/ServerSpec.cs (100%)
rename {test => src/WebSockets/test}/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/Wstest.cs (100%)
rename {test => src/WebSockets/test}/Microsoft.AspNetCore.WebSockets.ConformanceTest/AutobahnTests.cs (100%)
rename {test => src/WebSockets/test}/Microsoft.AspNetCore.WebSockets.ConformanceTest/Helpers.cs (100%)
rename {test => src/WebSockets/test}/Microsoft.AspNetCore.WebSockets.ConformanceTest/Http.config (100%)
rename {test => src/WebSockets/test}/Microsoft.AspNetCore.WebSockets.ConformanceTest/Microsoft.AspNetCore.WebSockets.ConformanceTest.csproj (100%)
rename {test => src/WebSockets/test}/Microsoft.AspNetCore.WebSockets.ConformanceTest/SkipIfWsTestNotPresentAttribute.cs (100%)
rename {test => src/WebSockets/test}/Microsoft.AspNetCore.WebSockets.Test/BufferStream.cs (100%)
rename {test => src/WebSockets/test}/Microsoft.AspNetCore.WebSockets.Test/DuplexStream.cs (100%)
rename {test => src/WebSockets/test}/Microsoft.AspNetCore.WebSockets.Test/IWebHostPortExtensions.cs (100%)
rename {test => src/WebSockets/test}/Microsoft.AspNetCore.WebSockets.Test/KestrelWebSocketHelpers.cs (100%)
rename {test => src/WebSockets/test}/Microsoft.AspNetCore.WebSockets.Test/Microsoft.AspNetCore.WebSockets.Test.csproj (100%)
rename {test => src/WebSockets/test}/Microsoft.AspNetCore.WebSockets.Test/SendReceiveTests.cs (100%)
rename {test => src/WebSockets/test}/Microsoft.AspNetCore.WebSockets.Test/WebSocketMiddlewareTests.cs (100%)
rename {test => src/WebSockets/test}/Microsoft.AspNetCore.WebSockets.Test/WebSocketPair.cs (100%)
rename version.props => src/WebSockets/version.props (100%)
diff --git a/.appveyor.yml b/.appveyor.yml
deleted file mode 100644
index d1d38b8e18b..00000000000
--- a/.appveyor.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-init:
-- git config --global core.autocrlf true
-environment:
- AUTOBAHN_SUITES_LOG: 1
- global:
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
- DOTNET_CLI_TELEMETRY_OPTOUT: 1
- ASPNETCORE_WSTEST_PATH: $(APPVEYOR_BUILD_FOLDER)/vendor/virtualenv/Scripts/wstest.exe
-cache:
-- vendor\VCForPython27.msi
-branches:
- only:
- - dev
- - /^release\/.*$/
- - /^(.*\/)?ci-.*$/
-install:
-- ps: .\build\setup-wstest.ps1
-build_script:
-- ps: .\run.ps1 default-build
-clone_depth: 1
-test: 'off'
-deploy: 'off'
-os: Visual Studio 2017
diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index c2f0f842733..00000000000
--- a/.gitattributes
+++ /dev/null
@@ -1,52 +0,0 @@
-*.doc diff=astextplain
-*.DOC diff=astextplain
-*.docx diff=astextplain
-*.DOCX diff=astextplain
-*.dot diff=astextplain
-*.DOT diff=astextplain
-*.pdf diff=astextplain
-*.PDF diff=astextplain
-*.rtf diff=astextplain
-*.RTF diff=astextplain
-
-*.jpg binary
-*.png binary
-*.gif binary
-
-*.cs text=auto diff=csharp
-*.vb text=auto
-*.resx text=auto
-*.c text=auto
-*.cpp text=auto
-*.cxx text=auto
-*.h text=auto
-*.hxx text=auto
-*.py text=auto
-*.rb text=auto
-*.java text=auto
-*.html text=auto
-*.htm text=auto
-*.css text=auto
-*.scss text=auto
-*.sass text=auto
-*.less text=auto
-*.js text=auto
-*.lisp text=auto
-*.clj text=auto
-*.sql text=auto
-*.php text=auto
-*.lua text=auto
-*.m text=auto
-*.asm text=auto
-*.erl text=auto
-*.fs text=auto
-*.fsx text=auto
-*.hs text=auto
-
-*.csproj text=auto
-*.vbproj text=auto
-*.fsproj text=auto
-*.dbproj text=auto
-*.sln text=auto eol=crlf
-
-*.sh eol=lf
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 101a084f0aa..00000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,3 +0,0 @@
-THIS ISSUE TRACKER IS CLOSED - please log new issues here: https://github.com/aspnet/Home/issues
-
-For information about this change, see https://github.com/aspnet/Announcements/issues/283
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 81bf8af485b..00000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-language: csharp
-sudo: false
-dist: trusty
-env:
- global:
- - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
- - DOTNET_CLI_TELEMETRY_OPTOUT: 1
- - AUTOBAHN_SUITES_LOG: 1
- - ASPNETCORE_WSTEST_PATH: $TRAVIS_BUILD_DIR/.virtualenv/bin/wstest
-mono: none
-python:
-- pypy
-os:
-- linux
-- osx
-osx_image: xcode8.2
-addons:
- apt:
- packages:
- - libunwind8
-branches:
- only:
- - dev
- - /^release\/.*$/
- - /^(.*\/)?ci-.*$/
-install:
-- ./build/setup-wstest.sh
-script:
-- ./build.sh
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 64ff041d5ca..00000000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,4 +0,0 @@
-Contributing
-======
-
-Information on contributing to this repo is in the [Contributing Guide](https://github.com/aspnet/Home/blob/dev/CONTRIBUTING.md) in the Home repo.
diff --git a/LICENSE.txt b/LICENSE.txt
deleted file mode 100644
index 7b2956eceee..00000000000
--- a/LICENSE.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Copyright (c) .NET Foundation and Contributors
-
-All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
-License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed
-under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for the
-specific language governing permissions and limitations under the License.
diff --git a/NuGet.config b/NuGet.config
deleted file mode 100644
index e32bddfd514..00000000000
--- a/NuGet.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
- <packageSources>
- <clear />
- <!-- Restore sources should be defined in build/sources.props. -->
- </packageSources>
-</configuration>
diff --git a/build.cmd b/build.cmd
deleted file mode 100644
index c0050bda125..00000000000
--- a/build.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-@ECHO OFF
-PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0run.ps1' default-build %*; exit $LASTEXITCODE"
diff --git a/build.sh b/build.sh
deleted file mode 100755
index 98a4b227658..00000000000
--- a/build.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-# Call "sync" between "chmod" and execution to prevent "text file busy" error in Docker (aufs)
-chmod +x "$DIR/run.sh"; sync
-"$DIR/run.sh" default-build "$@"
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
deleted file mode 100644
index 1dfc352a0ae..00000000000
--- a/korebuild-lock.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-version:2.1.3-rtm-15802
-commithash:a7c08b45b440a7d2058a0aa1eaa3eb6ba811976a
diff --git a/korebuild.json b/korebuild.json
deleted file mode 100644
index 678d8bb9483..00000000000
--- a/korebuild.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.1/tools/korebuild.schema.json",
- "channel": "release/2.1"
-}
diff --git a/run.cmd b/run.cmd
deleted file mode 100644
index d52d5c7e689..00000000000
--- a/run.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-@ECHO OFF
-PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0run.ps1' %*; exit $LASTEXITCODE"
diff --git a/run.ps1 b/run.ps1
deleted file mode 100644
index 27dcf848f84..00000000000
--- a/run.ps1
+++ /dev/null
@@ -1,196 +0,0 @@
-#!/usr/bin/env powershell
-#requires -version 4
-
-<#
-.SYNOPSIS
-Executes KoreBuild commands.
-
-.DESCRIPTION
-Downloads korebuild if required. Then executes the KoreBuild command. To see available commands, execute with `-Command help`.
-
-.PARAMETER Command
-The KoreBuild command to run.
-
-.PARAMETER Path
-The folder to build. Defaults to the folder containing this script.
-
-.PARAMETER Channel
-The channel of KoreBuild to download. Overrides the value from the config file.
-
-.PARAMETER DotNetHome
-The directory where .NET Core tools will be stored.
-
-.PARAMETER ToolsSource
-The base url where build tools can be downloaded. Overrides the value from the config file.
-
-.PARAMETER Update
-Updates KoreBuild to the latest version even if a lock file is present.
-
-.PARAMETER ConfigFile
-The path to the configuration file that stores values. Defaults to korebuild.json.
-
-.PARAMETER ToolsSourceSuffix
-The Suffix to append to the end of the ToolsSource. Useful for query strings in blob stores.
-
-.PARAMETER Arguments
-Arguments to be passed to the command
-
-.NOTES
-This function will create a file $PSScriptRoot/korebuild-lock.txt. This lock file can be committed to source, but does not have to be.
-When the lockfile is not present, KoreBuild will create one using latest available version from $Channel.
-
-The $ConfigFile is expected to be an JSON file. It is optional, and the configuration values in it are optional as well. Any options set
-in the file are overridden by command line parameters.
-
-.EXAMPLE
-Example config file:
-```json
-{
- "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
- "channel": "dev",
- "toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools"
-}
-```
-#>
-[CmdletBinding(PositionalBinding = $false)]
-param(
- [Parameter(Mandatory = $true, Position = 0)]
- [string]$Command,
- [string]$Path = $PSScriptRoot,
- [Alias('c')]
- [string]$Channel,
- [Alias('d')]
- [string]$DotNetHome,
- [Alias('s')]
- [string]$ToolsSource,
- [Alias('u')]
- [switch]$Update,
- [string]$ConfigFile,
- [string]$ToolsSourceSuffix,
- [Parameter(ValueFromRemainingArguments = $true)]
- [string[]]$Arguments
-)
-
-Set-StrictMode -Version 2
-$ErrorActionPreference = 'Stop'
-
-#
-# Functions
-#
-
-function Get-KoreBuild {
-
- $lockFile = Join-Path $Path 'korebuild-lock.txt'
-
- if (!(Test-Path $lockFile) -or $Update) {
- Get-RemoteFile "$ToolsSource/korebuild/channels/$Channel/latest.txt" $lockFile $ToolsSourceSuffix
- }
-
- $version = Get-Content $lockFile | Where-Object { $_ -like 'version:*' } | Select-Object -first 1
- if (!$version) {
- Write-Error "Failed to parse version from $lockFile. Expected a line that begins with 'version:'"
- }
- $version = $version.TrimStart('version:').Trim()
- $korebuildPath = Join-Paths $DotNetHome ('buildtools', 'korebuild', $version)
-
- if (!(Test-Path $korebuildPath)) {
- Write-Host -ForegroundColor Magenta "Downloading KoreBuild $version"
- New-Item -ItemType Directory -Path $korebuildPath | Out-Null
- $remotePath = "$ToolsSource/korebuild/artifacts/$version/korebuild.$version.zip"
-
- try {
- $tmpfile = Join-Path ([IO.Path]::GetTempPath()) "KoreBuild-$([guid]::NewGuid()).zip"
- Get-RemoteFile $remotePath $tmpfile $ToolsSourceSuffix
- if (Get-Command -Name 'Expand-Archive' -ErrorAction Ignore) {
- # Use built-in commands where possible as they are cross-plat compatible
- Expand-Archive -Path $tmpfile -DestinationPath $korebuildPath
- }
- else {
- # Fallback to old approach for old installations of PowerShell
- Add-Type -AssemblyName System.IO.Compression.FileSystem
- [System.IO.Compression.ZipFile]::ExtractToDirectory($tmpfile, $korebuildPath)
- }
- }
- catch {
- Remove-Item -Recurse -Force $korebuildPath -ErrorAction Ignore
- throw
- }
- finally {
- Remove-Item $tmpfile -ErrorAction Ignore
- }
- }
-
- return $korebuildPath
-}
-
-function Join-Paths([string]$path, [string[]]$childPaths) {
- $childPaths | ForEach-Object { $path = Join-Path $path $_ }
- return $path
-}
-
-function Get-RemoteFile([string]$RemotePath, [string]$LocalPath, [string]$RemoteSuffix) {
- if ($RemotePath -notlike 'http*') {
- Copy-Item $RemotePath $LocalPath
- return
- }
-
- $retries = 10
- while ($retries -gt 0) {
- $retries -= 1
- try {
- Invoke-WebRequest -UseBasicParsing -Uri $($RemotePath + $RemoteSuffix) -OutFile $LocalPath
- return
- }
- catch {
- Write-Verbose "Request failed. $retries retries remaining"
- }
- }
-
- Write-Error "Download failed: '$RemotePath'."
-}
-
-#
-# Main
-#
-
-# Load configuration or set defaults
-
-$Path = Resolve-Path $Path
-if (!$ConfigFile) { $ConfigFile = Join-Path $Path 'korebuild.json' }
-
-if (Test-Path $ConfigFile) {
- try {
- $config = Get-Content -Raw -Encoding UTF8 -Path $ConfigFile | ConvertFrom-Json
- if ($config) {
- if (!($Channel) -and (Get-Member -Name 'channel' -InputObject $config)) { [string] $Channel = $config.channel }
- if (!($ToolsSource) -and (Get-Member -Name 'toolsSource' -InputObject $config)) { [string] $ToolsSource = $config.toolsSource}
- }
- }
- catch {
- Write-Warning "$ConfigFile could not be read. Its settings will be ignored."
- Write-Warning $Error[0]
- }
-}
-
-if (!$DotNetHome) {
- $DotNetHome = if ($env:DOTNET_HOME) { $env:DOTNET_HOME } `
- elseif ($env:USERPROFILE) { Join-Path $env:USERPROFILE '.dotnet'} `
- elseif ($env:HOME) {Join-Path $env:HOME '.dotnet'}`
- else { Join-Path $PSScriptRoot '.dotnet'}
-}
-
-if (!$Channel) { $Channel = 'dev' }
-if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' }
-
-# Execute
-
-$korebuildPath = Get-KoreBuild
-Import-Module -Force -Scope Local (Join-Path $korebuildPath 'KoreBuild.psd1')
-
-try {
- Set-KoreBuildSettings -ToolsSource $ToolsSource -DotNetHome $DotNetHome -RepoPath $Path -ConfigFile $ConfigFile
- Invoke-KoreBuildCommand $Command @Arguments
-}
-finally {
- Remove-Module 'KoreBuild' -ErrorAction Ignore
-}
diff --git a/run.sh b/run.sh
deleted file mode 100755
index 834961fc3a5..00000000000
--- a/run.sh
+++ /dev/null
@@ -1,231 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-#
-# variables
-#
-
-RESET="\033[0m"
-RED="\033[0;31m"
-YELLOW="\033[0;33m"
-MAGENTA="\033[0;95m"
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-[ -z "${DOTNET_HOME:-}" ] && DOTNET_HOME="$HOME/.dotnet"
-verbose=false
-update=false
-repo_path="$DIR"
-channel=''
-tools_source=''
-tools_source_suffix=''
-
-#
-# Functions
-#
-__usage() {
- echo "Usage: $(basename "${BASH_SOURCE[0]}") command [options] [[--] <Arguments>...]"
- echo ""
- echo "Arguments:"
- echo " command The command to be run."
- echo " <Arguments>... Arguments passed to the command. Variable number of arguments allowed."
- echo ""
- echo "Options:"
- echo " --verbose Show verbose output."
- echo " -c|--channel <CHANNEL> The channel of KoreBuild to download. Overrides the value from the config file.."
- echo " --config-file <FILE> The path to the configuration file that stores values. Defaults to korebuild.json."
- echo " -d|--dotnet-home <DIR> The directory where .NET Core tools will be stored. Defaults to '\$DOTNET_HOME' or '\$HOME/.dotnet."
- echo " --path <PATH> The directory to build. Defaults to the directory containing the script."
- echo " -s|--tools-source|-ToolsSource <URL> The base url where build tools can be downloaded. Overrides the value from the config file."
- echo " --tools-source-suffix|-ToolsSourceSuffix <SUFFIX> The suffix to append to tools-source. Useful for query strings."
- echo " -u|--update Update to the latest KoreBuild even if the lock file is present."
- echo ""
- echo "Description:"
- echo " This function will create a file \$DIR/korebuild-lock.txt. This lock file can be committed to source, but does not have to be."
- echo " When the lockfile is not present, KoreBuild will create one using latest available version from \$channel."
-
- if [[ "${1:-}" != '--no-exit' ]]; then
- exit 2
- fi
-}
-
-get_korebuild() {
- local version
- local lock_file="$repo_path/korebuild-lock.txt"
- if [ ! -f "$lock_file" ] || [ "$update" = true ]; then
- __get_remote_file "$tools_source/korebuild/channels/$channel/latest.txt" "$lock_file" "$tools_source_suffix"
- fi
- version="$(grep 'version:*' -m 1 "$lock_file")"
- if [[ "$version" == '' ]]; then
- __error "Failed to parse version from $lock_file. Expected a line that begins with 'version:'"
- return 1
- fi
- version="$(echo "${version#version:}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
- local korebuild_path="$DOTNET_HOME/buildtools/korebuild/$version"
-
- {
- if [ ! -d "$korebuild_path" ]; then
- mkdir -p "$korebuild_path"
- local remote_path="$tools_source/korebuild/artifacts/$version/korebuild.$version.zip"
- tmpfile="$(mktemp)"
- echo -e "${MAGENTA}Downloading KoreBuild ${version}${RESET}"
- if __get_remote_file "$remote_path" "$tmpfile" "$tools_source_suffix"; then
- unzip -q -d "$korebuild_path" "$tmpfile"
- fi
- rm "$tmpfile" || true
- fi
-
- source "$korebuild_path/KoreBuild.sh"
- } || {
- if [ -d "$korebuild_path" ]; then
- echo "Cleaning up after failed installation"
- rm -rf "$korebuild_path" || true
- fi
- return 1
- }
-}
-
-__error() {
- echo -e "${RED}error: $*${RESET}" 1>&2
-}
-
-__warn() {
- echo -e "${YELLOW}warning: $*${RESET}"
-}
-
-__machine_has() {
- hash "$1" > /dev/null 2>&1
- return $?
-}
-
-__get_remote_file() {
- local remote_path=$1
- local local_path=$2
- local remote_path_suffix=$3
-
- if [[ "$remote_path" != 'http'* ]]; then
- cp "$remote_path" "$local_path"
- return 0
- fi
-
- local failed=false
- if __machine_has wget; then
- wget --tries 10 --quiet -O "$local_path" "${remote_path}${remote_path_suffix}" || failed=true
- else
- failed=true
- fi
-
- if [ "$failed" = true ] && __machine_has curl; then
- failed=false
- curl --retry 10 -sSL -f --create-dirs -o "$local_path" "${remote_path}${remote_path_suffix}" || failed=true
- fi
-
- if [ "$failed" = true ]; then
- __error "Download failed: $remote_path" 1>&2
- return 1
- fi
-}
-
-#
-# main
-#
-
-command="${1:-}"
-shift
-
-while [[ $# -gt 0 ]]; do
- case $1 in
- -\?|-h|--help)
- __usage --no-exit
- exit 0
- ;;
- -c|--channel|-Channel)
- shift
- channel="${1:-}"
- [ -z "$channel" ] && __usage
- ;;
- --config-file|-ConfigFile)
- shift
- config_file="${1:-}"
- [ -z "$config_file" ] && __usage
- if [ ! -f "$config_file" ]; then
- __error "Invalid value for --config-file. $config_file does not exist."
- exit 1
- fi
- ;;
- -d|--dotnet-home|-DotNetHome)
- shift
- DOTNET_HOME="${1:-}"
- [ -z "$DOTNET_HOME" ] && __usage
- ;;
- --path|-Path)
- shift
- repo_path="${1:-}"
- [ -z "$repo_path" ] && __usage
- ;;
- -s|--tools-source|-ToolsSource)
- shift
- tools_source="${1:-}"
- [ -z "$tools_source" ] && __usage
- ;;
- --tools-source-suffix|-ToolsSourceSuffix)
- shift
- tools_source_suffix="${1:-}"
- [ -z "$tools_source_suffix" ] && __usage
- ;;
- -u|--update|-Update)
- update=true
- ;;
- --verbose|-Verbose)
- verbose=true
- ;;
- --)
- shift
- break
- ;;
- *)
- break
- ;;
- esac
- shift
-done
-
-if ! __machine_has unzip; then
- __error 'Missing required command: unzip'
- exit 1
-fi
-
-if ! __machine_has curl && ! __machine_has wget; then
- __error 'Missing required command. Either wget or curl is required.'
- exit 1
-fi
-
-[ -z "${config_file:-}" ] && config_file="$repo_path/korebuild.json"
-if [ -f "$config_file" ]; then
- if __machine_has jq ; then
- if jq '.' "$config_file" >/dev/null ; then
- config_channel="$(jq -r 'select(.channel!=null) | .channel' "$config_file")"
- config_tools_source="$(jq -r 'select(.toolsSource!=null) | .toolsSource' "$config_file")"
- else
- __warn "$config_file is invalid JSON. Its settings will be ignored."
- fi
- elif __machine_has python ; then
- if python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then
- config_channel="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")"
- config_tools_source="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")"
- else
- __warn "$config_file is invalid JSON. Its settings will be ignored."
- fi
- else
- __warn 'Missing required command: jq or pyton. Could not parse the JSON file. Its settings will be ignored.'
- fi
-
- [ ! -z "${config_channel:-}" ] && channel="$config_channel"
- [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source"
-fi
-
-[ -z "$channel" ] && channel='dev'
-[ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools'
-
-get_korebuild
-set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$repo_path" "$config_file"
-invoke_korebuild_command "$command" "$@"
diff --git a/.gitignore b/src/WebSockets/.gitignore
similarity index 100%
rename from .gitignore
rename to src/WebSockets/.gitignore
diff --git a/Directory.Build.props b/src/WebSockets/Directory.Build.props
similarity index 100%
rename from Directory.Build.props
rename to src/WebSockets/Directory.Build.props
diff --git a/Directory.Build.targets b/src/WebSockets/Directory.Build.targets
similarity index 100%
rename from Directory.Build.targets
rename to src/WebSockets/Directory.Build.targets
diff --git a/NuGetPackageVerifier.json b/src/WebSockets/NuGetPackageVerifier.json
similarity index 100%
rename from NuGetPackageVerifier.json
rename to src/WebSockets/NuGetPackageVerifier.json
diff --git a/README.md b/src/WebSockets/README.md
similarity index 100%
rename from README.md
rename to src/WebSockets/README.md
diff --git a/WebSockets.sln b/src/WebSockets/WebSockets.sln
similarity index 100%
rename from WebSockets.sln
rename to src/WebSockets/WebSockets.sln
diff --git a/build/Key.snk b/src/WebSockets/build/Key.snk
similarity index 100%
rename from build/Key.snk
rename to src/WebSockets/build/Key.snk
diff --git a/build/dependencies.props b/src/WebSockets/build/dependencies.props
similarity index 100%
rename from build/dependencies.props
rename to src/WebSockets/build/dependencies.props
diff --git a/build/repo.props b/src/WebSockets/build/repo.props
similarity index 100%
rename from build/repo.props
rename to src/WebSockets/build/repo.props
diff --git a/build/repo.targets b/src/WebSockets/build/repo.targets
similarity index 100%
rename from build/repo.targets
rename to src/WebSockets/build/repo.targets
diff --git a/build/setup-wstest.ps1 b/src/WebSockets/build/setup-wstest.ps1
similarity index 100%
rename from build/setup-wstest.ps1
rename to src/WebSockets/build/setup-wstest.ps1
diff --git a/build/setup-wstest.sh b/src/WebSockets/build/setup-wstest.sh
similarity index 100%
rename from build/setup-wstest.sh
rename to src/WebSockets/build/setup-wstest.sh
diff --git a/build/sources.props b/src/WebSockets/build/sources.props
similarity index 100%
rename from build/sources.props
rename to src/WebSockets/build/sources.props
diff --git a/samples/AutobahnTestAppAspNet4/AutobahnTestAppAspNet4.csproj.aspnet4 b/src/WebSockets/samples/AutobahnTestAppAspNet4/AutobahnTestAppAspNet4.csproj.aspnet4
similarity index 100%
rename from samples/AutobahnTestAppAspNet4/AutobahnTestAppAspNet4.csproj.aspnet4
rename to src/WebSockets/samples/AutobahnTestAppAspNet4/AutobahnTestAppAspNet4.csproj.aspnet4
diff --git a/samples/AutobahnTestAppAspNet4/EchoSocket.ashx b/src/WebSockets/samples/AutobahnTestAppAspNet4/EchoSocket.ashx
similarity index 100%
rename from samples/AutobahnTestAppAspNet4/EchoSocket.ashx
rename to src/WebSockets/samples/AutobahnTestAppAspNet4/EchoSocket.ashx
diff --git a/samples/AutobahnTestAppAspNet4/EchoSocket.ashx.cs b/src/WebSockets/samples/AutobahnTestAppAspNet4/EchoSocket.ashx.cs
similarity index 100%
rename from samples/AutobahnTestAppAspNet4/EchoSocket.ashx.cs
rename to src/WebSockets/samples/AutobahnTestAppAspNet4/EchoSocket.ashx.cs
diff --git a/samples/AutobahnTestAppAspNet4/Properties/AssemblyInfo.cs b/src/WebSockets/samples/AutobahnTestAppAspNet4/Properties/AssemblyInfo.cs
similarity index 100%
rename from samples/AutobahnTestAppAspNet4/Properties/AssemblyInfo.cs
rename to src/WebSockets/samples/AutobahnTestAppAspNet4/Properties/AssemblyInfo.cs
diff --git a/samples/AutobahnTestAppAspNet4/Web.Debug.config b/src/WebSockets/samples/AutobahnTestAppAspNet4/Web.Debug.config
similarity index 100%
rename from samples/AutobahnTestAppAspNet4/Web.Debug.config
rename to src/WebSockets/samples/AutobahnTestAppAspNet4/Web.Debug.config
diff --git a/samples/AutobahnTestAppAspNet4/Web.Release.config b/src/WebSockets/samples/AutobahnTestAppAspNet4/Web.Release.config
similarity index 100%
rename from samples/AutobahnTestAppAspNet4/Web.Release.config
rename to src/WebSockets/samples/AutobahnTestAppAspNet4/Web.Release.config
diff --git a/samples/AutobahnTestAppAspNet4/Web.config b/src/WebSockets/samples/AutobahnTestAppAspNet4/Web.config
similarity index 100%
rename from samples/AutobahnTestAppAspNet4/Web.config
rename to src/WebSockets/samples/AutobahnTestAppAspNet4/Web.config
diff --git a/samples/AutobahnTestAppAspNet4/packages.config b/src/WebSockets/samples/AutobahnTestAppAspNet4/packages.config
similarity index 100%
rename from samples/AutobahnTestAppAspNet4/packages.config
rename to src/WebSockets/samples/AutobahnTestAppAspNet4/packages.config
diff --git a/samples/AutobahnTestAppAspNet4/wstest-spec.json b/src/WebSockets/samples/AutobahnTestAppAspNet4/wstest-spec.json
similarity index 100%
rename from samples/AutobahnTestAppAspNet4/wstest-spec.json
rename to src/WebSockets/samples/AutobahnTestAppAspNet4/wstest-spec.json
diff --git a/samples/AutobahnTestAppHttpListener/App.config b/src/WebSockets/samples/AutobahnTestAppHttpListener/App.config
similarity index 100%
rename from samples/AutobahnTestAppHttpListener/App.config
rename to src/WebSockets/samples/AutobahnTestAppHttpListener/App.config
diff --git a/samples/AutobahnTestAppHttpListener/AutobahnTestAppHttpListener.csproj.net461 b/src/WebSockets/samples/AutobahnTestAppHttpListener/AutobahnTestAppHttpListener.csproj.net461
similarity index 100%
rename from samples/AutobahnTestAppHttpListener/AutobahnTestAppHttpListener.csproj.net461
rename to src/WebSockets/samples/AutobahnTestAppHttpListener/AutobahnTestAppHttpListener.csproj.net461
diff --git a/samples/AutobahnTestAppHttpListener/Program.cs b/src/WebSockets/samples/AutobahnTestAppHttpListener/Program.cs
similarity index 100%
rename from samples/AutobahnTestAppHttpListener/Program.cs
rename to src/WebSockets/samples/AutobahnTestAppHttpListener/Program.cs
diff --git a/samples/AutobahnTestAppHttpListener/Properties/AssemblyInfo.cs b/src/WebSockets/samples/AutobahnTestAppHttpListener/Properties/AssemblyInfo.cs
similarity index 100%
rename from samples/AutobahnTestAppHttpListener/Properties/AssemblyInfo.cs
rename to src/WebSockets/samples/AutobahnTestAppHttpListener/Properties/AssemblyInfo.cs
diff --git a/samples/EchoApp/EchoApp.csproj b/src/WebSockets/samples/EchoApp/EchoApp.csproj
similarity index 100%
rename from samples/EchoApp/EchoApp.csproj
rename to src/WebSockets/samples/EchoApp/EchoApp.csproj
diff --git a/samples/EchoApp/Program.cs b/src/WebSockets/samples/EchoApp/Program.cs
similarity index 100%
rename from samples/EchoApp/Program.cs
rename to src/WebSockets/samples/EchoApp/Program.cs
diff --git a/samples/EchoApp/Properties/launchSettings.json b/src/WebSockets/samples/EchoApp/Properties/launchSettings.json
similarity index 100%
rename from samples/EchoApp/Properties/launchSettings.json
rename to src/WebSockets/samples/EchoApp/Properties/launchSettings.json
diff --git a/samples/EchoApp/Startup.cs b/src/WebSockets/samples/EchoApp/Startup.cs
similarity index 100%
rename from samples/EchoApp/Startup.cs
rename to src/WebSockets/samples/EchoApp/Startup.cs
diff --git a/samples/EchoApp/wwwroot/index.html b/src/WebSockets/samples/EchoApp/wwwroot/index.html
similarity index 100%
rename from samples/EchoApp/wwwroot/index.html
rename to src/WebSockets/samples/EchoApp/wwwroot/index.html
diff --git a/samples/TestServer/App.config b/src/WebSockets/samples/TestServer/App.config
similarity index 100%
rename from samples/TestServer/App.config
rename to src/WebSockets/samples/TestServer/App.config
diff --git a/samples/TestServer/Program.cs b/src/WebSockets/samples/TestServer/Program.cs
similarity index 100%
rename from samples/TestServer/Program.cs
rename to src/WebSockets/samples/TestServer/Program.cs
diff --git a/samples/TestServer/Properties/AssemblyInfo.cs b/src/WebSockets/samples/TestServer/Properties/AssemblyInfo.cs
similarity index 100%
rename from samples/TestServer/Properties/AssemblyInfo.cs
rename to src/WebSockets/samples/TestServer/Properties/AssemblyInfo.cs
diff --git a/samples/TestServer/TestServer.csproj b/src/WebSockets/samples/TestServer/TestServer.csproj
similarity index 100%
rename from samples/TestServer/TestServer.csproj
rename to src/WebSockets/samples/TestServer/TestServer.csproj
diff --git a/src/Directory.Build.props b/src/WebSockets/src/Directory.Build.props
similarity index 100%
rename from src/Directory.Build.props
rename to src/WebSockets/src/Directory.Build.props
diff --git a/src/Microsoft.AspNetCore.WebSockets/ExtendedWebSocketAcceptContext.cs b/src/WebSockets/src/Microsoft.AspNetCore.WebSockets/ExtendedWebSocketAcceptContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.WebSockets/ExtendedWebSocketAcceptContext.cs
rename to src/WebSockets/src/Microsoft.AspNetCore.WebSockets/ExtendedWebSocketAcceptContext.cs
diff --git a/src/Microsoft.AspNetCore.WebSockets/Internal/Constants.cs b/src/WebSockets/src/Microsoft.AspNetCore.WebSockets/Internal/Constants.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.WebSockets/Internal/Constants.cs
rename to src/WebSockets/src/Microsoft.AspNetCore.WebSockets/Internal/Constants.cs
diff --git a/src/Microsoft.AspNetCore.WebSockets/Internal/HandshakeHelpers.cs b/src/WebSockets/src/Microsoft.AspNetCore.WebSockets/Internal/HandshakeHelpers.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.WebSockets/Internal/HandshakeHelpers.cs
rename to src/WebSockets/src/Microsoft.AspNetCore.WebSockets/Internal/HandshakeHelpers.cs
diff --git a/src/Microsoft.AspNetCore.WebSockets/Microsoft.AspNetCore.WebSockets.csproj b/src/WebSockets/src/Microsoft.AspNetCore.WebSockets/Microsoft.AspNetCore.WebSockets.csproj
similarity index 100%
rename from src/Microsoft.AspNetCore.WebSockets/Microsoft.AspNetCore.WebSockets.csproj
rename to src/WebSockets/src/Microsoft.AspNetCore.WebSockets/Microsoft.AspNetCore.WebSockets.csproj
diff --git a/src/Microsoft.AspNetCore.WebSockets/WebSocketMiddleware.cs b/src/WebSockets/src/Microsoft.AspNetCore.WebSockets/WebSocketMiddleware.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.WebSockets/WebSocketMiddleware.cs
rename to src/WebSockets/src/Microsoft.AspNetCore.WebSockets/WebSocketMiddleware.cs
diff --git a/src/Microsoft.AspNetCore.WebSockets/WebSocketMiddlewareExtensions.cs b/src/WebSockets/src/Microsoft.AspNetCore.WebSockets/WebSocketMiddlewareExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.WebSockets/WebSocketMiddlewareExtensions.cs
rename to src/WebSockets/src/Microsoft.AspNetCore.WebSockets/WebSocketMiddlewareExtensions.cs
diff --git a/src/Microsoft.AspNetCore.WebSockets/WebSocketOptions.cs b/src/WebSockets/src/Microsoft.AspNetCore.WebSockets/WebSocketOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.WebSockets/WebSocketOptions.cs
rename to src/WebSockets/src/Microsoft.AspNetCore.WebSockets/WebSocketOptions.cs
diff --git a/src/Microsoft.AspNetCore.WebSockets/baseline.netcore.json b/src/WebSockets/src/Microsoft.AspNetCore.WebSockets/baseline.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.WebSockets/baseline.netcore.json
rename to src/WebSockets/src/Microsoft.AspNetCore.WebSockets/baseline.netcore.json
diff --git a/test/AutobahnTestApp/AutobahnTestApp.csproj b/src/WebSockets/test/AutobahnTestApp/AutobahnTestApp.csproj
similarity index 100%
rename from test/AutobahnTestApp/AutobahnTestApp.csproj
rename to src/WebSockets/test/AutobahnTestApp/AutobahnTestApp.csproj
diff --git a/test/AutobahnTestApp/Program.cs b/src/WebSockets/test/AutobahnTestApp/Program.cs
similarity index 100%
rename from test/AutobahnTestApp/Program.cs
rename to src/WebSockets/test/AutobahnTestApp/Program.cs
diff --git a/test/AutobahnTestApp/Properties/launchSettings.json b/src/WebSockets/test/AutobahnTestApp/Properties/launchSettings.json
similarity index 100%
rename from test/AutobahnTestApp/Properties/launchSettings.json
rename to src/WebSockets/test/AutobahnTestApp/Properties/launchSettings.json
diff --git a/test/AutobahnTestApp/README.md b/src/WebSockets/test/AutobahnTestApp/README.md
similarity index 100%
rename from test/AutobahnTestApp/README.md
rename to src/WebSockets/test/AutobahnTestApp/README.md
diff --git a/test/AutobahnTestApp/Startup.cs b/src/WebSockets/test/AutobahnTestApp/Startup.cs
similarity index 100%
rename from test/AutobahnTestApp/Startup.cs
rename to src/WebSockets/test/AutobahnTestApp/Startup.cs
diff --git a/test/AutobahnTestApp/TestResources/testCert.pfx b/src/WebSockets/test/AutobahnTestApp/TestResources/testCert.pfx
similarity index 100%
rename from test/AutobahnTestApp/TestResources/testCert.pfx
rename to src/WebSockets/test/AutobahnTestApp/TestResources/testCert.pfx
diff --git a/test/AutobahnTestApp/TestResources/testCert.txt b/src/WebSockets/test/AutobahnTestApp/TestResources/testCert.txt
similarity index 100%
rename from test/AutobahnTestApp/TestResources/testCert.txt
rename to src/WebSockets/test/AutobahnTestApp/TestResources/testCert.txt
diff --git a/test/AutobahnTestApp/scripts/RunAutobahnTests.ps1 b/src/WebSockets/test/AutobahnTestApp/scripts/RunAutobahnTests.ps1
similarity index 100%
rename from test/AutobahnTestApp/scripts/RunAutobahnTests.ps1
rename to src/WebSockets/test/AutobahnTestApp/scripts/RunAutobahnTests.ps1
diff --git a/test/AutobahnTestApp/scripts/autobahn.spec.json b/src/WebSockets/test/AutobahnTestApp/scripts/autobahn.spec.json
similarity index 100%
rename from test/AutobahnTestApp/scripts/autobahn.spec.json
rename to src/WebSockets/test/AutobahnTestApp/scripts/autobahn.spec.json
diff --git a/test/Directory.Build.props b/src/WebSockets/test/Directory.Build.props
similarity index 100%
rename from test/Directory.Build.props
rename to src/WebSockets/test/Directory.Build.props
diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnCaseResult.cs b/src/WebSockets/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnCaseResult.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnCaseResult.cs
rename to src/WebSockets/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnCaseResult.cs
diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnExpectations.cs b/src/WebSockets/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnExpectations.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnExpectations.cs
rename to src/WebSockets/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnExpectations.cs
diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnResult.cs b/src/WebSockets/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnResult.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnResult.cs
rename to src/WebSockets/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnResult.cs
diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnServerResult.cs b/src/WebSockets/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnServerResult.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnServerResult.cs
rename to src/WebSockets/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnServerResult.cs
diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnSpec.cs b/src/WebSockets/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnSpec.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnSpec.cs
rename to src/WebSockets/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnSpec.cs
diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnTester.cs b/src/WebSockets/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnTester.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnTester.cs
rename to src/WebSockets/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/AutobahnTester.cs
diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/Executable.cs b/src/WebSockets/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/Executable.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/Executable.cs
rename to src/WebSockets/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/Executable.cs
diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/Expectation.cs b/src/WebSockets/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/Expectation.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/Expectation.cs
rename to src/WebSockets/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/Expectation.cs
diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/ServerSpec.cs b/src/WebSockets/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/ServerSpec.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/ServerSpec.cs
rename to src/WebSockets/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/ServerSpec.cs
diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/Wstest.cs b/src/WebSockets/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/Wstest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/Wstest.cs
rename to src/WebSockets/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Autobahn/Wstest.cs
diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/AutobahnTests.cs b/src/WebSockets/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/AutobahnTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.WebSockets.ConformanceTest/AutobahnTests.cs
rename to src/WebSockets/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/AutobahnTests.cs
diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Helpers.cs b/src/WebSockets/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Helpers.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Helpers.cs
rename to src/WebSockets/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Helpers.cs
diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Http.config b/src/WebSockets/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Http.config
similarity index 100%
rename from test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Http.config
rename to src/WebSockets/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Http.config
diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Microsoft.AspNetCore.WebSockets.ConformanceTest.csproj b/src/WebSockets/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Microsoft.AspNetCore.WebSockets.ConformanceTest.csproj
similarity index 100%
rename from test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Microsoft.AspNetCore.WebSockets.ConformanceTest.csproj
rename to src/WebSockets/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/Microsoft.AspNetCore.WebSockets.ConformanceTest.csproj
diff --git a/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/SkipIfWsTestNotPresentAttribute.cs b/src/WebSockets/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/SkipIfWsTestNotPresentAttribute.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.WebSockets.ConformanceTest/SkipIfWsTestNotPresentAttribute.cs
rename to src/WebSockets/test/Microsoft.AspNetCore.WebSockets.ConformanceTest/SkipIfWsTestNotPresentAttribute.cs
diff --git a/test/Microsoft.AspNetCore.WebSockets.Test/BufferStream.cs b/src/WebSockets/test/Microsoft.AspNetCore.WebSockets.Test/BufferStream.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.WebSockets.Test/BufferStream.cs
rename to src/WebSockets/test/Microsoft.AspNetCore.WebSockets.Test/BufferStream.cs
diff --git a/test/Microsoft.AspNetCore.WebSockets.Test/DuplexStream.cs b/src/WebSockets/test/Microsoft.AspNetCore.WebSockets.Test/DuplexStream.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.WebSockets.Test/DuplexStream.cs
rename to src/WebSockets/test/Microsoft.AspNetCore.WebSockets.Test/DuplexStream.cs
diff --git a/test/Microsoft.AspNetCore.WebSockets.Test/IWebHostPortExtensions.cs b/src/WebSockets/test/Microsoft.AspNetCore.WebSockets.Test/IWebHostPortExtensions.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.WebSockets.Test/IWebHostPortExtensions.cs
rename to src/WebSockets/test/Microsoft.AspNetCore.WebSockets.Test/IWebHostPortExtensions.cs
diff --git a/test/Microsoft.AspNetCore.WebSockets.Test/KestrelWebSocketHelpers.cs b/src/WebSockets/test/Microsoft.AspNetCore.WebSockets.Test/KestrelWebSocketHelpers.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.WebSockets.Test/KestrelWebSocketHelpers.cs
rename to src/WebSockets/test/Microsoft.AspNetCore.WebSockets.Test/KestrelWebSocketHelpers.cs
diff --git a/test/Microsoft.AspNetCore.WebSockets.Test/Microsoft.AspNetCore.WebSockets.Test.csproj b/src/WebSockets/test/Microsoft.AspNetCore.WebSockets.Test/Microsoft.AspNetCore.WebSockets.Test.csproj
similarity index 100%
rename from test/Microsoft.AspNetCore.WebSockets.Test/Microsoft.AspNetCore.WebSockets.Test.csproj
rename to src/WebSockets/test/Microsoft.AspNetCore.WebSockets.Test/Microsoft.AspNetCore.WebSockets.Test.csproj
diff --git a/test/Microsoft.AspNetCore.WebSockets.Test/SendReceiveTests.cs b/src/WebSockets/test/Microsoft.AspNetCore.WebSockets.Test/SendReceiveTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.WebSockets.Test/SendReceiveTests.cs
rename to src/WebSockets/test/Microsoft.AspNetCore.WebSockets.Test/SendReceiveTests.cs
diff --git a/test/Microsoft.AspNetCore.WebSockets.Test/WebSocketMiddlewareTests.cs b/src/WebSockets/test/Microsoft.AspNetCore.WebSockets.Test/WebSocketMiddlewareTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.WebSockets.Test/WebSocketMiddlewareTests.cs
rename to src/WebSockets/test/Microsoft.AspNetCore.WebSockets.Test/WebSocketMiddlewareTests.cs
diff --git a/test/Microsoft.AspNetCore.WebSockets.Test/WebSocketPair.cs b/src/WebSockets/test/Microsoft.AspNetCore.WebSockets.Test/WebSocketPair.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.WebSockets.Test/WebSocketPair.cs
rename to src/WebSockets/test/Microsoft.AspNetCore.WebSockets.Test/WebSocketPair.cs
diff --git a/version.props b/src/WebSockets/version.props
similarity index 100%
rename from version.props
rename to src/WebSockets/version.props
--
GitLab