diff --git a/SignalR.sln b/SignalR.sln
index dff6189146..ae8e0443b1 100644
--- a/SignalR.sln
+++ b/SignalR.sln
@@ -37,7 +37,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChatSample", "samples\ChatS
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SocialWeather", "samples\SocialWeather\SocialWeather.csproj", "{8D789F94-CB74-45FD-ACE7-92AF6E55042E}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.SignalR.Test.Server", "test\Microsoft.AspNetCore.SignalR.Test.Server\Microsoft.AspNetCore.SignalR.Test.Server.csproj", "{A0BF246B-FE7D-4E12-99BF-FFDC131B85D8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.SignalR.Test.Server", "client-ts\Microsoft.AspNetCore.SignalR.Test.Server\Microsoft.AspNetCore.SignalR.Test.Server.csproj", "{A0BF246B-FE7D-4E12-99BF-FFDC131B85D8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.SignalR.Tests", "test\Microsoft.AspNetCore.SignalR.Tests\Microsoft.AspNetCore.SignalR.Tests.csproj", "{1CE2B3BE-056C-41E3-A5F5-6A1EF1D288BA}"
EndProject
@@ -59,7 +59,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Socket
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Sockets.Common.Tests", "test\Microsoft.AspNetCore.Sockets.Common.Tests\Microsoft.AspNetCore.Sockets.Common.Tests.csproj", "{B0D32729-48AA-4841-B52A-2A61B60EED61}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.Client.TS", "src\Microsoft.AspNetCore.SignalR.Client.TS\Microsoft.AspNetCore.SignalR.Client.TS.csproj", "{333526A4-633B-491A-AC45-CC62A0012D1C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.Client.TS", "client-ts\Microsoft.AspNetCore.SignalR.Client.TS\Microsoft.AspNetCore.SignalR.Client.TS.csproj", "{333526A4-633B-491A-AC45-CC62A0012D1C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/build/repo.targets b/build/repo.targets
index 27006f18d3..6b1af40c6b 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -1,6 +1,6 @@
-
+
diff --git a/.npmignore b/client-ts/.npmignore
similarity index 100%
rename from .npmignore
rename to client-ts/.npmignore
diff --git a/test/Microsoft.AspNetCore.Client.SignalR.TS.Tests/Connection.spec.ts b/client-ts/Microsoft.AspNetCore.Client.SignalR.TS.Tests/Connection.spec.ts
similarity index 73%
rename from test/Microsoft.AspNetCore.Client.SignalR.TS.Tests/Connection.spec.ts
rename to client-ts/Microsoft.AspNetCore.Client.SignalR.TS.Tests/Connection.spec.ts
index 9233c3d1de..2f5003de99 100644
--- a/test/Microsoft.AspNetCore.Client.SignalR.TS.Tests/Connection.spec.ts
+++ b/client-ts/Microsoft.AspNetCore.Client.SignalR.TS.Tests/Connection.spec.ts
@@ -1,6 +1,6 @@
-import {IHttpClient} from "../../src/Microsoft.AspNetCore.SignalR.Client.TS/HttpClient"
-import { Connection } from "../../src/Microsoft.AspNetCore.SignalR.Client.TS/Connection"
-import { ISignalROptions } from "../../src/Microsoft.AspNetCore.SignalR.Client.TS/ISignalROptions"
+import { IHttpClient } from "../Microsoft.AspNetCore.SignalR.Client.TS/HttpClient"
+import { Connection } from "../Microsoft.AspNetCore.SignalR.Client.TS/Connection"
+import { ISignalROptions } from "../Microsoft.AspNetCore.SignalR.Client.TS/ISignalROptions"
describe("Connection", () => {
it("starting connection fails if getting id fails", async (done) => {
diff --git a/test/Microsoft.AspNetCore.Client.SignalR.TS.Tests/Formatters.spec.ts b/client-ts/Microsoft.AspNetCore.Client.SignalR.TS.Tests/Formatters.spec.ts
similarity index 92%
rename from test/Microsoft.AspNetCore.Client.SignalR.TS.Tests/Formatters.spec.ts
rename to client-ts/Microsoft.AspNetCore.Client.SignalR.TS.Tests/Formatters.spec.ts
index be8bbf200f..d980478845 100644
--- a/test/Microsoft.AspNetCore.Client.SignalR.TS.Tests/Formatters.spec.ts
+++ b/client-ts/Microsoft.AspNetCore.Client.SignalR.TS.Tests/Formatters.spec.ts
@@ -1,5 +1,5 @@
-import { TextMessageFormat, ServerSentEventsFormat } from "../../src/Microsoft.AspNetCore.SignalR.Client.TS/Formatters"
-import { Message, MessageType } from "../../src/Microsoft.AspNetCore.SignalR.Client.TS/Message";
+import { TextMessageFormat, ServerSentEventsFormat } from "../Microsoft.AspNetCore.SignalR.Client.TS/Formatters"
+import { Message, MessageType } from "../Microsoft.AspNetCore.SignalR.Client.TS/Message";
describe("Text Message Formatter", () => {
it("should return empty array on empty input", () => {
diff --git a/test/Microsoft.AspNetCore.Client.SignalR.TS.Tests/jasmine.json b/client-ts/Microsoft.AspNetCore.Client.SignalR.TS.Tests/jasmine.json
similarity index 100%
rename from test/Microsoft.AspNetCore.Client.SignalR.TS.Tests/jasmine.json
rename to client-ts/Microsoft.AspNetCore.Client.SignalR.TS.Tests/jasmine.json
diff --git a/test/Microsoft.AspNetCore.Client.SignalR.TS.Tests/tsconfig.json b/client-ts/Microsoft.AspNetCore.Client.SignalR.TS.Tests/tsconfig.json
similarity index 91%
rename from test/Microsoft.AspNetCore.Client.SignalR.TS.Tests/tsconfig.json
rename to client-ts/Microsoft.AspNetCore.Client.SignalR.TS.Tests/tsconfig.json
index 801b4441dd..d1e6f57eac 100644
--- a/test/Microsoft.AspNetCore.Client.SignalR.TS.Tests/tsconfig.json
+++ b/client-ts/Microsoft.AspNetCore.Client.SignalR.TS.Tests/tsconfig.json
@@ -9,7 +9,7 @@
"removeComments": false,
"noImplicitAny": true,
"suppressImplicitAnyIndexErrors": true,
- "outDir": "../../dist/test"
+ "outDir": "../dist/test"
},
"include": [
"./**/*",
diff --git a/src/Microsoft.AspNetCore.SignalR.Client.TS/Common.ts b/client-ts/Microsoft.AspNetCore.SignalR.Client.TS/Common.ts
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR.Client.TS/Common.ts
rename to client-ts/Microsoft.AspNetCore.SignalR.Client.TS/Common.ts
diff --git a/src/Microsoft.AspNetCore.SignalR.Client.TS/Connection.ts b/client-ts/Microsoft.AspNetCore.SignalR.Client.TS/Connection.ts
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR.Client.TS/Connection.ts
rename to client-ts/Microsoft.AspNetCore.SignalR.Client.TS/Connection.ts
diff --git a/src/Microsoft.AspNetCore.SignalR.Client.TS/Formatters.ts b/client-ts/Microsoft.AspNetCore.SignalR.Client.TS/Formatters.ts
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR.Client.TS/Formatters.ts
rename to client-ts/Microsoft.AspNetCore.SignalR.Client.TS/Formatters.ts
diff --git a/src/Microsoft.AspNetCore.SignalR.Client.TS/HttpClient.ts b/client-ts/Microsoft.AspNetCore.SignalR.Client.TS/HttpClient.ts
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR.Client.TS/HttpClient.ts
rename to client-ts/Microsoft.AspNetCore.SignalR.Client.TS/HttpClient.ts
diff --git a/src/Microsoft.AspNetCore.SignalR.Client.TS/HubConnection.ts b/client-ts/Microsoft.AspNetCore.SignalR.Client.TS/HubConnection.ts
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR.Client.TS/HubConnection.ts
rename to client-ts/Microsoft.AspNetCore.SignalR.Client.TS/HubConnection.ts
diff --git a/src/Microsoft.AspNetCore.SignalR.Client.TS/ISignalROptions.ts b/client-ts/Microsoft.AspNetCore.SignalR.Client.TS/ISignalROptions.ts
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR.Client.TS/ISignalROptions.ts
rename to client-ts/Microsoft.AspNetCore.SignalR.Client.TS/ISignalROptions.ts
diff --git a/src/Microsoft.AspNetCore.SignalR.Client.TS/Message.ts b/client-ts/Microsoft.AspNetCore.SignalR.Client.TS/Message.ts
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR.Client.TS/Message.ts
rename to client-ts/Microsoft.AspNetCore.SignalR.Client.TS/Message.ts
diff --git a/src/Microsoft.AspNetCore.SignalR.Client.TS/Microsoft.AspNetCore.SignalR.Client.TS.csproj b/client-ts/Microsoft.AspNetCore.SignalR.Client.TS/Microsoft.AspNetCore.SignalR.Client.TS.csproj
similarity index 92%
rename from src/Microsoft.AspNetCore.SignalR.Client.TS/Microsoft.AspNetCore.SignalR.Client.TS.csproj
rename to client-ts/Microsoft.AspNetCore.SignalR.Client.TS/Microsoft.AspNetCore.SignalR.Client.TS.csproj
index 05f039824c..588030670b 100644
--- a/src/Microsoft.AspNetCore.SignalR.Client.TS/Microsoft.AspNetCore.SignalR.Client.TS.csproj
+++ b/client-ts/Microsoft.AspNetCore.SignalR.Client.TS/Microsoft.AspNetCore.SignalR.Client.TS.csproj
@@ -8,7 +8,7 @@
- $(MSBuildThisFileDirectory)..\..\dist\
+ $(MSBuildThisFileDirectory)..\dist\
diff --git a/src/Microsoft.AspNetCore.SignalR.Client.TS/Transports.ts b/client-ts/Microsoft.AspNetCore.SignalR.Client.TS/Transports.ts
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR.Client.TS/Transports.ts
rename to client-ts/Microsoft.AspNetCore.SignalR.Client.TS/Transports.ts
diff --git a/src/Microsoft.AspNetCore.SignalR.Client.TS/gulpfile.js b/client-ts/Microsoft.AspNetCore.SignalR.Client.TS/gulpfile.js
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR.Client.TS/gulpfile.js
rename to client-ts/Microsoft.AspNetCore.SignalR.Client.TS/gulpfile.js
diff --git a/src/Microsoft.AspNetCore.SignalR.Client.TS/index.ts b/client-ts/Microsoft.AspNetCore.SignalR.Client.TS/index.ts
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR.Client.TS/index.ts
rename to client-ts/Microsoft.AspNetCore.SignalR.Client.TS/index.ts
diff --git a/src/Microsoft.AspNetCore.SignalR.Client.TS/tsconfig.json b/client-ts/Microsoft.AspNetCore.SignalR.Client.TS/tsconfig.json
similarity index 92%
rename from src/Microsoft.AspNetCore.SignalR.Client.TS/tsconfig.json
rename to client-ts/Microsoft.AspNetCore.SignalR.Client.TS/tsconfig.json
index 970ccb7a15..3ad06379a3 100644
--- a/src/Microsoft.AspNetCore.SignalR.Client.TS/tsconfig.json
+++ b/client-ts/Microsoft.AspNetCore.SignalR.Client.TS/tsconfig.json
@@ -9,7 +9,7 @@
"removeComments": false,
"noImplicitAny": true,
"suppressImplicitAnyIndexErrors": true,
- "outDir": "../../dist/src",
+ "outDir": "../dist/src",
"declaration": true
},
"include": [
diff --git a/test/Microsoft.AspNetCore.SignalR.Test.Server/.gitignore b/client-ts/Microsoft.AspNetCore.SignalR.Test.Server/.gitignore
similarity index 100%
rename from test/Microsoft.AspNetCore.SignalR.Test.Server/.gitignore
rename to client-ts/Microsoft.AspNetCore.SignalR.Test.Server/.gitignore
diff --git a/test/Microsoft.AspNetCore.SignalR.Test.Server/EchoEndPoint.cs b/client-ts/Microsoft.AspNetCore.SignalR.Test.Server/EchoEndPoint.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.SignalR.Test.Server/EchoEndPoint.cs
rename to client-ts/Microsoft.AspNetCore.SignalR.Test.Server/EchoEndPoint.cs
diff --git a/test/Microsoft.AspNetCore.SignalR.Test.Server/Microsoft.AspNetCore.SignalR.Test.Server.csproj b/client-ts/Microsoft.AspNetCore.SignalR.Test.Server/Microsoft.AspNetCore.SignalR.Test.Server.csproj
similarity index 73%
rename from test/Microsoft.AspNetCore.SignalR.Test.Server/Microsoft.AspNetCore.SignalR.Test.Server.csproj
rename to client-ts/Microsoft.AspNetCore.SignalR.Test.Server/Microsoft.AspNetCore.SignalR.Test.Server.csproj
index 2e11c8a38c..3f00ac60ef 100644
--- a/test/Microsoft.AspNetCore.SignalR.Test.Server/Microsoft.AspNetCore.SignalR.Test.Server.csproj
+++ b/client-ts/Microsoft.AspNetCore.SignalR.Test.Server/Microsoft.AspNetCore.SignalR.Test.Server.csproj
@@ -8,7 +8,7 @@
-
+
@@ -19,12 +19,12 @@
-
-
+
+
-
diff --git a/test/Microsoft.AspNetCore.SignalR.Test.Server/Program.cs b/client-ts/Microsoft.AspNetCore.SignalR.Test.Server/Program.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.SignalR.Test.Server/Program.cs
rename to client-ts/Microsoft.AspNetCore.SignalR.Test.Server/Program.cs
diff --git a/test/Microsoft.AspNetCore.SignalR.Test.Server/Startup.cs b/client-ts/Microsoft.AspNetCore.SignalR.Test.Server/Startup.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.SignalR.Test.Server/Startup.cs
rename to client-ts/Microsoft.AspNetCore.SignalR.Test.Server/Startup.cs
diff --git a/test/Microsoft.AspNetCore.SignalR.Test.Server/TestHub.cs b/client-ts/Microsoft.AspNetCore.SignalR.Test.Server/TestHub.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.SignalR.Test.Server/TestHub.cs
rename to client-ts/Microsoft.AspNetCore.SignalR.Test.Server/TestHub.cs
diff --git a/test/Microsoft.AspNetCore.SignalR.Test.Server/web.config b/client-ts/Microsoft.AspNetCore.SignalR.Test.Server/web.config
similarity index 100%
rename from test/Microsoft.AspNetCore.SignalR.Test.Server/web.config
rename to client-ts/Microsoft.AspNetCore.SignalR.Test.Server/web.config
diff --git a/test/Microsoft.AspNetCore.SignalR.Test.Server/wwwroot/connectionTests.html b/client-ts/Microsoft.AspNetCore.SignalR.Test.Server/wwwroot/connectionTests.html
similarity index 100%
rename from test/Microsoft.AspNetCore.SignalR.Test.Server/wwwroot/connectionTests.html
rename to client-ts/Microsoft.AspNetCore.SignalR.Test.Server/wwwroot/connectionTests.html
diff --git a/test/Microsoft.AspNetCore.SignalR.Test.Server/wwwroot/js/common.js b/client-ts/Microsoft.AspNetCore.SignalR.Test.Server/wwwroot/js/common.js
similarity index 100%
rename from test/Microsoft.AspNetCore.SignalR.Test.Server/wwwroot/js/common.js
rename to client-ts/Microsoft.AspNetCore.SignalR.Test.Server/wwwroot/js/common.js
diff --git a/test/Microsoft.AspNetCore.SignalR.Test.Server/wwwroot/js/connectionTests.js b/client-ts/Microsoft.AspNetCore.SignalR.Test.Server/wwwroot/js/connectionTests.js
similarity index 100%
rename from test/Microsoft.AspNetCore.SignalR.Test.Server/wwwroot/js/connectionTests.js
rename to client-ts/Microsoft.AspNetCore.SignalR.Test.Server/wwwroot/js/connectionTests.js
diff --git a/test/Microsoft.AspNetCore.SignalR.Test.Server/wwwroot/js/hubConnectionTests.js b/client-ts/Microsoft.AspNetCore.SignalR.Test.Server/wwwroot/js/hubConnectionTests.js
similarity index 100%
rename from test/Microsoft.AspNetCore.SignalR.Test.Server/wwwroot/js/hubConnectionTests.js
rename to client-ts/Microsoft.AspNetCore.SignalR.Test.Server/wwwroot/js/hubConnectionTests.js
diff --git a/test/Microsoft.AspNetCore.SignalR.Test.Server/wwwroot/js/webSocketTests.js b/client-ts/Microsoft.AspNetCore.SignalR.Test.Server/wwwroot/js/webSocketTests.js
similarity index 100%
rename from test/Microsoft.AspNetCore.SignalR.Test.Server/wwwroot/js/webSocketTests.js
rename to client-ts/Microsoft.AspNetCore.SignalR.Test.Server/wwwroot/js/webSocketTests.js
diff --git a/package.json b/client-ts/package.json
similarity index 80%
rename from package.json
rename to client-ts/package.json
index 3f6b2d20fa..2327283d87 100644
--- a/package.json
+++ b/client-ts/package.json
@@ -9,8 +9,8 @@
},
"scripts": {
"gulp": "gulp",
- "pretest": "tsc -p test/Microsoft.AspNetCore.Client.SignalR.TS.Tests",
- "test": "jasmine JASMINE_CONFIG_PATH=test/Microsoft.AspNetCore.Client.SignalR.TS.Tests/jasmine.json"
+ "pretest": "tsc -p Microsoft.AspNetCore.Client.SignalR.TS.Tests",
+ "test": "jasmine JASMINE_CONFIG_PATH=Microsoft.AspNetCore.Client.SignalR.TS.Tests/jasmine.json"
},
"repository": {
"type": "git",
diff --git a/samples/ChatSample/ChatSample.csproj b/samples/ChatSample/ChatSample.csproj
index 568f5d6983..f66a2798bd 100644
--- a/samples/ChatSample/ChatSample.csproj
+++ b/samples/ChatSample/ChatSample.csproj
@@ -12,7 +12,7 @@
-
+
@@ -39,7 +39,7 @@
-
diff --git a/samples/SocketsSample/SocketsSample.csproj b/samples/SocketsSample/SocketsSample.csproj
index 67ca283a99..88e2824add 100644
--- a/samples/SocketsSample/SocketsSample.csproj
+++ b/samples/SocketsSample/SocketsSample.csproj
@@ -11,7 +11,7 @@
-
+
@@ -20,7 +20,7 @@
-