Skip to content

Commit 28db5db

Browse files
BrennanConroyBrennanConroy
committed
fb
1 parent ebf136a commit 28db5db

9 files changed

+33
-22
lines changed

‎AspNetCore.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1714,7 +1714,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DelegationSite", "src\Serve
17141714
EndProject
17151715
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.HttpSys.NonHelixTests", "src\Servers\HttpSys\test\NonHelixTests\Microsoft.AspNetCore.Server.HttpSys.NonHelixTests.csproj", "{8EB0B983-8851-4565-B92F-366F1B126E61}"
17161716
EndProject
1717-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HubProxyAttributes", "src\SignalR\clients\csharp\Client.SourceGenerator\src\HubProxyAttributes\HubProxyAttributes.csproj", "{FF358174-C540-4FDD-BA8A-8B1589FDEE94}"
1717+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.Client.SourceGenerator.HubProxyAttributes", "src\SignalR\clients\csharp\Client.SourceGenerator\src\HubProxyAttributes\Microsoft.AspNetCore.SignalR.Client.SourceGenerator.HubProxyAttributes.csproj", "{FF358174-C540-4FDD-BA8A-8B1589FDEE94}"
17181718
EndProject
17191719
Global
17201720
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎eng/Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@
218218
$(RepoRoot)src\Mvc\**\src\*.csproj;
219219
$(RepoRoot)src\Azure\**\src\*.csproj;
220220
$(RepoRoot)src\SignalR\**\src\*.csproj;
221+
$(RepoRoot)src\SignalR\**\Client.SourceGenerator\**\*.csproj;
221222
$(RepoRoot)src\Components\**\src\*.csproj;
222223
$(RepoRoot)src\FileProviders\**\src\*.csproj;
223224
$(RepoRoot)src\Configuration.KeyPerFile\**\src\*.csproj;

‎eng/ProjectReferences.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,6 @@
127127
<ProjectReferenceProvider Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" ProjectPath="$(RepoRoot)src\Azure\AzureAppServices.HostingStartup\src\Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj" />
128128
<ProjectReferenceProvider Include="Microsoft.AspNetCore.AzureAppServicesIntegration" ProjectPath="$(RepoRoot)src\Azure\AzureAppServicesIntegration\src\Microsoft.AspNetCore.AzureAppServicesIntegration.csproj" />
129129
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR.Client.Core" ProjectPath="$(RepoRoot)src\SignalR\clients\csharp\Client.Core\src\Microsoft.AspNetCore.SignalR.Client.Core.csproj" />
130-
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR.Client.SourceGenerator" ProjectPath="$(RepoRoot)src\SignalR\clients\csharp\Client.SourceGenerator\src\gen\Microsoft.AspNetCore.SignalR.Client.SourceGenerator.csproj" />
131-
<ProjectReferenceProvider Include="HubProxyAttributes" ProjectPath="$(RepoRoot)src\SignalR\clients\csharp\Client.SourceGenerator\src\HubProxyAttributes\HubProxyAttributes.csproj" />
132130
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR.Client" ProjectPath="$(RepoRoot)src\SignalR\clients\csharp\Client\src\Microsoft.AspNetCore.SignalR.Client.csproj" />
133131
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Http.Connections.Client" ProjectPath="$(RepoRoot)src\SignalR\clients\csharp\Http.Connections.Client\src\Microsoft.AspNetCore.Http.Connections.Client.csproj" />
134132
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Http.Connections.Common" ProjectPath="$(RepoRoot)src\SignalR\common\Http.Connections.Common\src\Microsoft.AspNetCore.Http.Connections.Common.csproj" />
@@ -141,6 +139,8 @@
141139
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR" ProjectPath="$(RepoRoot)src\SignalR\server\SignalR\src\Microsoft.AspNetCore.SignalR.csproj" />
142140
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR.Specification.Tests" ProjectPath="$(RepoRoot)src\SignalR\server\Specification.Tests\src\Microsoft.AspNetCore.SignalR.Specification.Tests.csproj" />
143141
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" ProjectPath="$(RepoRoot)src\SignalR\server\StackExchangeRedis\src\Microsoft.AspNetCore.SignalR.StackExchangeRedis.csproj" />
142+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR.Client.SourceGenerator" ProjectPath="$(RepoRoot)src\SignalR\clients\csharp\Client.SourceGenerator\src\gen\Microsoft.AspNetCore.SignalR.Client.SourceGenerator.csproj" />
143+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR.Client.SourceGenerator.HubProxyAttributes" ProjectPath="$(RepoRoot)src\SignalR\clients\csharp\Client.SourceGenerator\src\HubProxyAttributes\Microsoft.AspNetCore.SignalR.Client.SourceGenerator.HubProxyAttributes.csproj" />
144144
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.Authorization" ProjectPath="$(RepoRoot)src\Components\Authorization\src\Microsoft.AspNetCore.Components.Authorization.csproj" />
145145
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components" ProjectPath="$(RepoRoot)src\Components\Components\src\Microsoft.AspNetCore.Components.csproj" />
146146
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.Forms" ProjectPath="$(RepoRoot)src\Components\Forms\src\Microsoft.AspNetCore.Components.Forms.csproj" />

‎src/SignalR/SignalR.slnf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"src\\DataProtection\\Abstractions\\src\\Microsoft.AspNetCore.DataProtection.Abstractions.csproj",
66
"src\\DataProtection\\Cryptography.Internal\\src\\Microsoft.AspNetCore.Cryptography.Internal.csproj",
77
"src\\DataProtection\\DataProtection\\src\\Microsoft.AspNetCore.DataProtection.csproj",
8+
"src\\Extensions\\Features\\src\\Microsoft.Extensions.Features.csproj",
89
"src\\FileProviders\\Embedded\\src\\Microsoft.Extensions.FileProviders.Embedded.csproj",
910
"src\\Hosting\\Abstractions\\src\\Microsoft.AspNetCore.Hosting.Abstractions.csproj",
1011
"src\\Hosting\\Hosting\\src\\Microsoft.AspNetCore.Hosting.csproj",
@@ -13,7 +14,6 @@
1314
"src\\Hosting\\TestHost\\src\\Microsoft.AspNetCore.TestHost.csproj",
1415
"src\\Http\\Authentication.Abstractions\\src\\Microsoft.AspNetCore.Authentication.Abstractions.csproj",
1516
"src\\Http\\Authentication.Core\\src\\Microsoft.AspNetCore.Authentication.Core.csproj",
16-
"src\\Extensions\\Features\\src\\Microsoft.Extensions.Features.csproj",
1717
"src\\Http\\Headers\\src\\Microsoft.Net.Http.Headers.csproj",
1818
"src\\Http\\Http.Abstractions\\src\\Microsoft.AspNetCore.Http.Abstractions.csproj",
1919
"src\\Http\\Http.Extensions\\src\\Microsoft.AspNetCore.Http.Extensions.csproj",
@@ -40,9 +40,9 @@
4040
"src\\Servers\\Kestrel\\Core\\src\\Microsoft.AspNetCore.Server.Kestrel.Core.csproj",
4141
"src\\Servers\\Kestrel\\Kestrel\\src\\Microsoft.AspNetCore.Server.Kestrel.csproj",
4242
"src\\Servers\\Kestrel\\Transport.Sockets\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj",
43-
"src\\SignalR\\clients\\csharp\\Client.SourceGenerator\\src\\gen\\Microsoft.AspNetCore.SignalR.Client.SourceGenerator.csproj",
44-
"src\\SignalR\\clients\\csharp\\Client.SourceGenerator\\src\\HubProxyAttributes\\HubProxyAttributes.csproj",
4543
"src\\SignalR\\clients\\csharp\\Client.Core\\src\\Microsoft.AspNetCore.SignalR.Client.Core.csproj",
44+
"src\\SignalR\\clients\\csharp\\Client.SourceGenerator\\src\\HubProxyAttributes\\Microsoft.AspNetCore.SignalR.Client.SourceGenerator.HubProxyAttributes.csproj",
45+
"src\\SignalR\\clients\\csharp\\Client.SourceGenerator\\src\\gen\\Microsoft.AspNetCore.SignalR.Client.SourceGenerator.csproj",
4646
"src\\SignalR\\clients\\csharp\\Client\\src\\Microsoft.AspNetCore.SignalR.Client.csproj",
4747
"src\\SignalR\\clients\\csharp\\Client\\test\\FunctionalTests\\Microsoft.AspNetCore.SignalR.Client.FunctionalTests.csproj",
4848
"src\\SignalR\\clients\\csharp\\Client\\test\\UnitTests\\Microsoft.AspNetCore.SignalR.Client.Tests.csproj",
@@ -74,4 +74,4 @@
7474
"src\\WebEncoders\\src\\Microsoft.Extensions.WebEncoders.csproj"
7575
]
7676
}
77-
}
77+
}

‎src/SignalR/clients/csharp/Client.SourceGenerator/src/HubProxyAttributes/HubProxyAttributes.cs renamed to ‎src/SignalR/clients/csharp/Client.SourceGenerator/src/HubProxyAttributes/HubClientProxyAttribute.cs

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,14 @@
66
namespace Microsoft.AspNetCore.SignalR.Client
77
{
88
/// <summary>
9+
/// Provides information for generating strongly typed SignalR client callbacks.
910
/// Place this attribute on a method with the following syntax:
1011
/// <code>
1112
/// public static partial IDisposable RegisterCallbacks&lt;T&gt;(this HubConnection connection, T proxy);
1213
/// </code>
1314
/// </summary>
14-
[AttributeUsage(AttributeTargets.Method)]
15-
public class HubClientProxyAttribute : Attribute
16-
{
17-
}
18-
19-
/// <summary>
20-
/// Place this attribute on a method with the following syntax:
21-
/// <code>
22-
/// public static partial T GetProxy&lt;T&gt;(this HubConnection connection);
23-
/// </code>
24-
/// </summary>
25-
[AttributeUsage(AttributeTargets.Method)]
26-
public class HubServerProxyAttribute : Attribute
15+
[AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
16+
public sealed class HubClientProxyAttribute : Attribute
2717
{
2818
}
2919
}

‎src/SignalR/clients/csharp/Client.SourceGenerator/src/HubProxyAttributes/HubServerProxyAttribute.cs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
using System;
5+
6+
namespace Microsoft.AspNetCore.SignalR.Client
7+
{
8+
/// <summary>
9+
/// Provides information for generating strongly typed SignalR server invocations from the client.
10+
/// Place this attribute on a method with the following syntax:
11+
/// <code>
12+
/// public static partial T GetProxy&lt;T&gt;(this HubConnection connection);
13+
/// </code>
14+
/// </summary>
15+
[AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
16+
public sealed class HubServerProxyAttribute : Attribute
17+
{
18+
}
19+
}

‎src/SignalR/clients/csharp/Client.SourceGenerator/src/HubProxyAttributes/HubProxyAttributes.csproj renamed to ‎src/SignalR/clients/csharp/Client.SourceGenerator/src/HubProxyAttributes/Microsoft.AspNetCore.SignalR.Client.SourceGenerator.HubProxyAttributes.csproj

File renamed without changes.

‎src/SignalR/clients/csharp/Client.SourceGenerator/src/gen/Microsoft.AspNetCore.SignalR.Client.SourceGenerator.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<Reference Include="HubProxyAttributes" />
16+
<Reference Include="Microsoft.AspNetCore.SignalR.Client.SourceGenerator.HubProxyAttributes" ReferenceOutputAssembly="false" />
1717
</ItemGroup>
1818

1919
<ItemGroup>
2020
<None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
2121
<!-- The source generator includes some attributes to be used by user code to influence the source generated code -->
22-
<None Include="$(OutputPath)\HubProxyAttributes.dll" Pack="true" PackagePath="lib/netstandard2.0" Visible="false" />
22+
<None Include="$(OutputPath)\Microsoft.AspNetCore.SignalR.Client.SourceGenerator.HubProxyAttributes.dll" Pack="true" PackagePath="lib/netstandard2.0" Visible="false" />
2323
</ItemGroup>
2424

2525
</Project>

‎src/SignalR/clients/csharp/Client/test/UnitTests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<Reference Include="Microsoft.AspNetCore.SignalR" />
2323
<Reference Include="Microsoft.AspNetCore.SignalR.Client.Core" />
2424
<Reference Include="Microsoft.AspNetCore.SignalR.Client.SourceGenerator" OutputItemType="Analyzer" ReferenceOutputAssembly="true" />
25+
<Reference Include="Microsoft.AspNetCore.SignalR.Client.SourceGenerator.HubProxyAttributes" />
2526
</ItemGroup>
2627

2728
</Project>

0 commit comments

Comments
 (0)