diff --git a/.gitignore b/.gitignore index 3272b33978..c00b373fc6 100644 --- a/.gitignore +++ b/.gitignore @@ -43,4 +43,3 @@ signalr-client/ dist/ global.json BenchmarkDotNet.Artifacts/ -korebuild-lock.txt diff --git a/Directory.Build.props b/Directory.Build.props index 703ef79722..b51ed60133 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,5 +1,6 @@ - - + + + Microsoft ASP.NET Core @@ -9,7 +10,6 @@ $(MSBuildThisFileDirectory)build\Key.snk true true - $(VersionSuffix)-$(BuildNumber) true diff --git a/Directory.Build.targets b/Directory.Build.targets index bc118fd907..e83ff95e39 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,14 +1,5 @@ - - - - <_BootstrapperFile Condition=" $([MSBuild]::IsOSUnixLike()) ">build.sh - <_BootstrapperFile Condition="! $([MSBuild]::IsOSUnixLike()) ">build.cmd - <_BootstrapperError> - Package references have not been pinned. Run './$(_BootstrapperFile) /t:Pin'. - Also, you can run './$(_BootstrapperFile) /t:Restore' which will pin *and* restore packages. '$(_BootstrapperFile)' can be found in '$(MSBuildThisFileDirectory)'. - - - - - + + + $(MicrosoftNETCoreApp20PackageVersion) + diff --git a/NuGet.config b/NuGet.config index 20060c934e..4e8a1f6de1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,6 +3,7 @@ + diff --git a/README.md b/README.md index 99df101349..bbc6ba4d96 100644 --- a/README.md +++ b/README.md @@ -34,9 +34,8 @@ npm install @aspnet/signalr-client --registry https://dotnet.myget.org/f/aspnetc ## Building from source -To run a complete build on command line only, execute `build.cmd` or `build.sh` without arguments. The build requires NodeJS (6.9 or newer) and npm to be installed on the machine. +To run a complete build on command line only, execute `build.cmd` or `build.sh` without arguments. -Before opening this project in Visual Studio or VS Code, execute `build.cmd /t:Restore` (Windows) or `./build.sh /t:Restore` (Linux/macOS). -This will execute only the part of the build script that downloads and initializes a few required build tools and packages. +The build requires NodeJS (6.9 or newer) and npm to be installed on the machine. See [developer documentation](https://github.com/aspnet/Home/wiki) for more details. diff --git a/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj b/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj index 7c517bb405..b9ad8ab3b8 100644 --- a/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj +++ b/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj @@ -7,7 +7,7 @@ - + - \ No newline at end of file + diff --git a/build/dependencies.props b/build/dependencies.props new file mode 100644 index 0000000000..8608bcaf2e --- /dev/null +++ b/build/dependencies.props @@ -0,0 +1,72 @@ + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + 0.10.9 + 2.4.337 + 3.1.0 + 2.1.0-preview1-15549 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 0.5.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 4.4.0 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.0.0 + 15.3.0 + 4.7.49 + 0.9.0-beta2 + 10.0.1 + 1.2.4 + 0.1.0-e170811-6 + 0.1.0-e170811-6 + 0.1.0-e170811-6 + 0.1.0-e170811-6 + 4.4.0-preview3-25519-03 + 4.4.0 + 3.1.1 + 4.3.0 + 4.4.0 + 0.1.0-e170811-6 + 2.3.0 + 2.3.0 + + + diff --git a/build/repo.props b/build/repo.props index 5f01300f5d..53eb29bb1d 100644 --- a/build/repo.props +++ b/build/repo.props @@ -1,7 +1,10 @@  - - + + + Internal.AspNetCore.Universe.Lineup + https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json + diff --git a/build/repo.targets b/build/repo.targets index 150d34afcc..f79e66d1f8 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -1,4 +1,4 @@ - + diff --git a/client-ts/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 index 546fccb509..7464ac2aa9 100644 --- a/client-ts/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 @@ -10,13 +10,13 @@ - - - - - - - + + + + + + + diff --git a/korebuild-lock.txt b/korebuild-lock.txt new file mode 100644 index 0000000000..45463cc71e --- /dev/null +++ b/korebuild-lock.txt @@ -0,0 +1,2 @@ +version:2.1.0-preview1-15549 +commithash:f570e08585fec510dd60cd4bfe8795388b757a95 diff --git a/samples/ChatSample/ChatSample.csproj b/samples/ChatSample/ChatSample.csproj index 4bcc1d26b2..21cda3884f 100644 --- a/samples/ChatSample/ChatSample.csproj +++ b/samples/ChatSample/ChatSample.csproj @@ -14,32 +14,29 @@ - - - KRB4002 - - - - - - - - - - - + + + + + + + + + + + All - - + + All - - - - - - + + + + + + diff --git a/samples/ClientSample/ClientSample.csproj b/samples/ClientSample/ClientSample.csproj index 42b7b1b8f3..d252aa3b78 100644 --- a/samples/ClientSample/ClientSample.csproj +++ b/samples/ClientSample/ClientSample.csproj @@ -12,9 +12,9 @@ - - - + + + diff --git a/samples/SocialWeather/SocialWeather.csproj b/samples/SocialWeather/SocialWeather.csproj index f615c91952..138ca90938 100644 --- a/samples/SocialWeather/SocialWeather.csproj +++ b/samples/SocialWeather/SocialWeather.csproj @@ -11,14 +11,14 @@ - - - - - - - - + + + + + + + + diff --git a/samples/SocketsSample/SocketsSample.csproj b/samples/SocketsSample/SocketsSample.csproj index 230097a8ca..e41fd288d1 100644 --- a/samples/SocketsSample/SocketsSample.csproj +++ b/samples/SocketsSample/SocketsSample.csproj @@ -12,17 +12,17 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index fa2a600aeb..54ffcd996f 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -9,6 +9,6 @@ - + diff --git a/src/Microsoft.AspNetCore.SignalR.Client.Core/Microsoft.AspNetCore.SignalR.Client.Core.csproj b/src/Microsoft.AspNetCore.SignalR.Client.Core/Microsoft.AspNetCore.SignalR.Client.Core.csproj index 3ba6091c2d..e05b0b19f7 100644 --- a/src/Microsoft.AspNetCore.SignalR.Client.Core/Microsoft.AspNetCore.SignalR.Client.Core.csproj +++ b/src/Microsoft.AspNetCore.SignalR.Client.Core/Microsoft.AspNetCore.SignalR.Client.Core.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/Microsoft.AspNetCore.SignalR.Client/Microsoft.AspNetCore.SignalR.Client.csproj b/src/Microsoft.AspNetCore.SignalR.Client/Microsoft.AspNetCore.SignalR.Client.csproj index f6d88657a9..bf40e005ca 100644 --- a/src/Microsoft.AspNetCore.SignalR.Client/Microsoft.AspNetCore.SignalR.Client.csproj +++ b/src/Microsoft.AspNetCore.SignalR.Client/Microsoft.AspNetCore.SignalR.Client.csproj @@ -1,4 +1,4 @@ - + Client for ASP.NET Core SignalR @@ -11,7 +11,7 @@ - + diff --git a/src/Microsoft.AspNetCore.SignalR.Common/Microsoft.AspNetCore.SignalR.Common.csproj b/src/Microsoft.AspNetCore.SignalR.Common/Microsoft.AspNetCore.SignalR.Common.csproj index ba642ea581..74d6d7217a 100644 --- a/src/Microsoft.AspNetCore.SignalR.Common/Microsoft.AspNetCore.SignalR.Common.csproj +++ b/src/Microsoft.AspNetCore.SignalR.Common/Microsoft.AspNetCore.SignalR.Common.csproj @@ -8,13 +8,13 @@ - - - - - - - + + + + + + + diff --git a/src/Microsoft.AspNetCore.SignalR.Core/Microsoft.AspNetCore.SignalR.Core.csproj b/src/Microsoft.AspNetCore.SignalR.Core/Microsoft.AspNetCore.SignalR.Core.csproj index 4cf4cba9fd..b1d6924373 100644 --- a/src/Microsoft.AspNetCore.SignalR.Core/Microsoft.AspNetCore.SignalR.Core.csproj +++ b/src/Microsoft.AspNetCore.SignalR.Core/Microsoft.AspNetCore.SignalR.Core.csproj @@ -11,13 +11,13 @@ - - - - - - - + + + + + + + diff --git a/src/Microsoft.AspNetCore.SignalR.Redis/Microsoft.AspNetCore.SignalR.Redis.csproj b/src/Microsoft.AspNetCore.SignalR.Redis/Microsoft.AspNetCore.SignalR.Redis.csproj index bf67ce4a2e..460371c6d7 100644 --- a/src/Microsoft.AspNetCore.SignalR.Redis/Microsoft.AspNetCore.SignalR.Redis.csproj +++ b/src/Microsoft.AspNetCore.SignalR.Redis/Microsoft.AspNetCore.SignalR.Redis.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/src/Microsoft.AspNetCore.Sockets.Abstractions/Microsoft.AspNetCore.Sockets.Abstractions.csproj b/src/Microsoft.AspNetCore.Sockets.Abstractions/Microsoft.AspNetCore.Sockets.Abstractions.csproj index 7069b28014..c2dba911f3 100644 --- a/src/Microsoft.AspNetCore.Sockets.Abstractions/Microsoft.AspNetCore.Sockets.Abstractions.csproj +++ b/src/Microsoft.AspNetCore.Sockets.Abstractions/Microsoft.AspNetCore.Sockets.Abstractions.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/Microsoft.AspNetCore.Sockets.Client.Http.csproj b/src/Microsoft.AspNetCore.Sockets.Client.Http/Microsoft.AspNetCore.Sockets.Client.Http.csproj index cfc57992da..d09d5db9a5 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/Microsoft.AspNetCore.Sockets.Client.Http.csproj +++ b/src/Microsoft.AspNetCore.Sockets.Client.Http/Microsoft.AspNetCore.Sockets.Client.Http.csproj @@ -15,14 +15,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Microsoft.AspNetCore.Sockets.Http/Microsoft.AspNetCore.Sockets.Http.csproj b/src/Microsoft.AspNetCore.Sockets.Http/Microsoft.AspNetCore.Sockets.Http.csproj index b900ede544..1f7ff58d7a 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/Microsoft.AspNetCore.Sockets.Http.csproj +++ b/src/Microsoft.AspNetCore.Sockets.Http/Microsoft.AspNetCore.Sockets.Http.csproj @@ -11,14 +11,14 @@ - - - - - - - - + + + + + + + + diff --git a/src/Microsoft.AspNetCore.Sockets/Microsoft.AspNetCore.Sockets.csproj b/src/Microsoft.AspNetCore.Sockets/Microsoft.AspNetCore.Sockets.csproj index a5c5a428f5..0de655a731 100644 --- a/src/Microsoft.AspNetCore.Sockets/Microsoft.AspNetCore.Sockets.csproj +++ b/src/Microsoft.AspNetCore.Sockets/Microsoft.AspNetCore.Sockets.csproj @@ -10,10 +10,10 @@ - - - - + + + + diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 3a86391d57..e9622c1545 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -2,11 +2,11 @@ - - - - - - + + + + + + diff --git a/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/Microsoft.AspNetCore.SignalR.Client.FunctionalTests.csproj b/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/Microsoft.AspNetCore.SignalR.Client.FunctionalTests.csproj index 88d202d979..9cddb97289 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/Microsoft.AspNetCore.SignalR.Client.FunctionalTests.csproj +++ b/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/Microsoft.AspNetCore.SignalR.Client.FunctionalTests.csproj @@ -8,7 +8,7 @@ - + @@ -24,13 +24,13 @@ - - - - - - - + + + + + + + diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj b/test/Microsoft.AspNetCore.SignalR.Client.Tests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj index b46c352247..2f7db53585 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj @@ -15,8 +15,8 @@ - - + + diff --git a/test/Microsoft.AspNetCore.SignalR.Redis.Tests/Microsoft.AspNetCore.SignalR.Redis.Tests.csproj b/test/Microsoft.AspNetCore.SignalR.Redis.Tests/Microsoft.AspNetCore.SignalR.Redis.Tests.csproj index cb7eb147a1..ad5dc925b5 100644 --- a/test/Microsoft.AspNetCore.SignalR.Redis.Tests/Microsoft.AspNetCore.SignalR.Redis.Tests.csproj +++ b/test/Microsoft.AspNetCore.SignalR.Redis.Tests/Microsoft.AspNetCore.SignalR.Redis.Tests.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.0;net461 @@ -16,7 +16,7 @@ - + - \ No newline at end of file + diff --git a/test/Microsoft.AspNetCore.SignalR.Tests/Microsoft.AspNetCore.SignalR.Tests.csproj b/test/Microsoft.AspNetCore.SignalR.Tests/Microsoft.AspNetCore.SignalR.Tests.csproj index 23b117da4a..c707df8c2f 100644 --- a/test/Microsoft.AspNetCore.SignalR.Tests/Microsoft.AspNetCore.SignalR.Tests.csproj +++ b/test/Microsoft.AspNetCore.SignalR.Tests/Microsoft.AspNetCore.SignalR.Tests.csproj @@ -13,7 +13,7 @@ - + @@ -29,17 +29,17 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/test/Microsoft.AspNetCore.Sockets.Tests/Microsoft.AspNetCore.Sockets.Tests.csproj b/test/Microsoft.AspNetCore.Sockets.Tests/Microsoft.AspNetCore.Sockets.Tests.csproj index b02b8025d3..c73a09bcc4 100644 --- a/test/Microsoft.AspNetCore.Sockets.Tests/Microsoft.AspNetCore.Sockets.Tests.csproj +++ b/test/Microsoft.AspNetCore.Sockets.Tests/Microsoft.AspNetCore.Sockets.Tests.csproj @@ -16,11 +16,11 @@ - - - - - + + + + + diff --git a/version.props b/version.props new file mode 100644 index 0000000000..57a881afd9 --- /dev/null +++ b/version.props @@ -0,0 +1,10 @@ + + + 1.0.0 + alpha2 + $(VersionPrefix) + $(VersionPrefix)-$(VersionSuffix)-final + t000 + $(VersionSuffix)-$(BuildNumber) + + diff --git a/version.xml b/version.xml deleted file mode 100644 index 773f910acf..0000000000 --- a/version.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - dev - 1.0.0 - alpha2 - -