-
Notifications
You must be signed in to change notification settings - Fork 100
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade sample and test version (#2028)
* Upgrade test and samples and props * Fix tests and remove not needed deps for protocol dll
- Loading branch information
Showing
56 changed files
with
159 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| <Project> | ||
| <PropertyGroup Label="Test Package Versions"> | ||
| <!--Testing: always use latest--> | ||
| <SystemIdentityModelTokensJwtPackageVersion>8.0.1</SystemIdentityModelTokensJwtPackageVersion> | ||
| <MicrosoftAspNetCoreHttpConnectionsClientPackageVersion>8.0.8</MicrosoftAspNetCoreHttpConnectionsClientPackageVersion> | ||
| <MicrosoftAspNetCoreSignalRProtocolsMessagePackPackageVersion>8.0.8</MicrosoftAspNetCoreSignalRProtocolsMessagePackPackageVersion> | ||
| <MicrosoftAspNetCoreSignalRProtocolsJsonPackageVersion>8.0.7</MicrosoftAspNetCoreSignalRProtocolsJsonPackageVersion> | ||
| <MicrosoftExtensionsLoggingPackageVersion>8.0.0</MicrosoftExtensionsLoggingPackageVersion> | ||
| <MicrosoftNETTestSdkPackageVersion>17.11.0</MicrosoftNETTestSdkPackageVersion> | ||
| <MoqPackageVersion>4.20.70</MoqPackageVersion> | ||
| <XunitPackageVersion>2.4.2</XunitPackageVersion> | ||
| <XunitRunnerVisualStudioPackageVersion>2.4.2</XunitRunnerVisualStudioPackageVersion> | ||
| <MicrosoftOwinTestingPackageVersion>4.2.2</MicrosoftOwinTestingPackageVersion> | ||
| <MicrosoftAspNetCoreTestHostPackageVersion>8.0.8</MicrosoftAspNetCoreTestHostPackageVersion> | ||
| <SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion> | ||
| <MicrosoftExtensionsLoggingTestingPackageVersion>2.1.0</MicrosoftExtensionsLoggingTestingPackageVersion> | ||
| <MicrosoftAspNetCoreTestingVersion>2.1.0</MicrosoftAspNetCoreTestingVersion> | ||
| <!--Requires old version due to the breaking change in https://github.com/Azure/azure-signalr/issues/1503--> | ||
| <MicrosoftAspNetCoreHttpConnectionsClientPackageOldVersion>1.0.0</MicrosoftAspNetCoreHttpConnectionsClientPackageOldVersion> | ||
| <E2eTestUserSecretId>E2eTestUserSecret</E2eTestUserSecretId> | ||
| </PropertyGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...t.ChatSample/AspNet.ChatSample.JavaScriptClient/AspNet.ChatSample.JavaScriptClient.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 1 addition & 2 deletions
3
...ple.NetCore31/ChatSample.NetCore31.csproj → ...s/ChatSample/ChatSample/ChatSample.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| <Project> | ||
| <Import Project="..\Directory.Build.props" /> | ||
| <Import Project="..\build\dependencies.private.props" /> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 9 additions & 16 deletions
25
src/Microsoft.Azure.SignalR.Emulator/Properties/launchSettings.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,20 @@ | ||
| { | ||
| "iisSettings": { | ||
| "windowsAuthentication": false, | ||
| "anonymousAuthentication": true, | ||
| "iisExpress": { | ||
| "applicationUrl": "http://localhost:54115", | ||
| "sslPort": 44304 | ||
| } | ||
| }, | ||
| "$schema": "http://json.schemastore.org/launchsettings.json", | ||
| "profiles": { | ||
| "IIS Express": { | ||
| "commandName": "Project", | ||
| "commandLineArgs": "start", | ||
| "environmentVariables": { | ||
| "ASPNETCORE_ENVIRONMENT": "Development" | ||
| } | ||
| }, | ||
| "Microsoft.Azure.SignalR.Emulator": { | ||
| "commandName": "Project", | ||
| "commandLineArgs": "start -p 8111", | ||
| "environmentVariables": { | ||
| "ASPNETCORE_ENVIRONMENT": "Development" | ||
| } | ||
| } | ||
| }, | ||
| "$schema": "http://json.schemastore.org/launchsettings.json", | ||
| "iisSettings": { | ||
| "windowsAuthentication": false, | ||
| "anonymousAuthentication": true, | ||
| "iisExpress": { | ||
| "applicationUrl": "http://localhost:54115", | ||
| "sslPort": 44304 | ||
| } | ||
| } | ||
| } |
24 changes: 24 additions & 0 deletions
24
src/Microsoft.Azure.SignalR.Protocols/Directory.Build.props
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| <Project> | ||
| <!-- This file is used to exclude the impact of ..\Directory.Build.props --> | ||
| <Import Project="..\..\Directory.Build.props" /> | ||
| <PropertyGroup> | ||
| <NoWarn>$(NoWarn);CS1591</NoWarn> | ||
| <GenerateDocumentationFile>true</GenerateDocumentationFile> | ||
| <PackageTags>aspnetcore;azure;signalr</PackageTags> | ||
| <EnableApiCheck>false</EnableApiCheck> | ||
| <CheckEolTargetFramework>false</CheckEolTargetFramework> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="$(MicrosoftVisualStudioEngMicroBuildCoreVersion)"> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubPackageVersion)" PrivateAssets="All" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <!-- Adding the assemblies to sign --> | ||
| <FilesToSign Include="$(OutDir)\$(RootNamespace)*.nupkg"> | ||
| <Authenticode>NuGet</Authenticode> | ||
| </FilesToSign> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| <Project> | ||
| <Import Project="..\Directory.Build.props" /> | ||
| <Import Project="..\build\dependencies.private.props" /> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
test/Microsoft.Azure.SignalR.AspNet.Tests/TestConnectionContext.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| // Copyright (c) Microsoft. All rights reserved. | ||
| // Licensed under the MIT license. See LICENSE file in the project root for full license information. | ||
|
|
||
| using System.Collections.Concurrent; | ||
| using System.Collections.Generic; | ||
| using System.IO.Pipelines; | ||
| using Microsoft.AspNetCore.Connections; | ||
| using Microsoft.AspNetCore.Http.Features; | ||
|
|
||
| namespace Microsoft.Azure.SignalR.Tests.Common; | ||
|
|
||
| internal sealed class TestConnectionContext : ConnectionContext | ||
| { | ||
| private readonly IFeatureCollection _features; | ||
|
|
||
| public TestConnectionContext() | ||
| { | ||
| _features = new FeatureCollection(); | ||
| Items = new ConcurrentDictionary<object, object>(); | ||
|
|
||
| var pipeOptions = new PipeOptions(); | ||
| var pair = DuplexPipe.CreateConnectionPair(pipeOptions, pipeOptions); | ||
| var proxyToApplication = DuplexPipe.CreateConnectionPair(pipeOptions, pipeOptions); | ||
|
|
||
| Transport = pair.Transport; | ||
| Application = pair.Application; | ||
| } | ||
|
|
||
| public override string ConnectionId { get; set; } | ||
|
|
||
| public override IFeatureCollection Features => _features; | ||
| public override IDictionary<object, object> Items { get; set; } | ||
|
|
||
| public override IDuplexPipe Transport { get; set; } | ||
|
|
||
| public IDuplexPipe Application { get; set; } | ||
| } |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.