Skip to content

Commit b1a2928

Browse files
pranavkmdougbu
authored andcommitted
Guarantee ordering for SignalR client HttpConnection.send (#10780)
* Revert "Revert "Add an option to SignalR to guarantee ordering of send events… (#10807)" - This reverts commit 39a9d63. * Fixup build
1 parent 289dd6a commit b1a2928

File tree

22 files changed

+1298
-18226
lines changed

22 files changed

+1298
-18226
lines changed

build/repo.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@
126126
<NodeJsProjects Include="
127127
$(RepoRoot)src\SignalR\**\*.npmproj;
128128
$(RepoRoot)src\Middleware\**\*.npmproj;
129-
$(RepoRoot)src\Components\Browser.JS\**\*.npmproj;
130129
"
131130
RestoreInParallel="false"
132131
Exclude="@(ProjectToExclude)" />

eng/targets/Npm.Common.targets

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)' == ''">$(MSBuildProjectDirectory)\obj\</BaseIntermediateOutputPath>
1111
<IntermediateOutputPath>$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)'))$(Configuration)\</IntermediateOutputPath>
1212
<InstallArgs Condition="'$(RestoreLockedMode)' == 'true'">--frozen-lockfile</InstallArgs>
13+
<_BackupPackageJson>$(IntermediateOutputPath)$(MSBuildProjectName).package.json.bak</_BackupPackageJson>
1314
</PropertyGroup>
1415

1516
<Target Name="_CheckForInvalidConfiguration">
@@ -47,12 +48,26 @@
4748

4849
<Target Name="Pack" Condition="'$(IsPackable)' == 'true'" DependsOnTargets="$(PackDependsOn)">
4950
<PropertyGroup>
50-
<_BackupPackageJson>$(IntermediateOutputPath)$(MSBuildProjectName).package.json.bak</_BackupPackageJson>
5151
<_PackageTargetPath>$(MSBuildProjectDirectory)\$(PackageFileName)</_PackageTargetPath>
5252
</PropertyGroup>
5353

5454
<Copy SourceFiles="$(PackageJson)" DestinationFiles="$(_BackupPackageJson)" />
5555

56+
<ReadLinesFromFile File="$(PackageJson)" Condition="@(ReplacePackageContent->Count()) != 0 AND $([MSBuild]::IsOSPlatform('Windows'))">
57+
<Output TaskParameter="Lines" ItemName="PackageJsonContent" />
58+
</ReadLinesFromFile>
59+
60+
<PropertyGroup Condition="@(PackageJsonContent->Count()) > 0">
61+
<_PackageJsonContent>@(PackageJsonContent->'%(Identity)', '%0a')</_PackageJsonContent>
62+
<_PackageJsonContent>$(_PackageJsonContent.Replace('%(ReplacePackageContent.Identity)', '%(ReplacePackageContent.ReplaceWith)'))</_PackageJsonContent>
63+
</PropertyGroup>
64+
65+
<WriteLinesToFile
66+
File="$(PackageJson)"
67+
Lines="$(_PackageJsonContent)"
68+
Condition="@(ReplacePackageContent->Count()) != 0 AND $([MSBuild]::IsOSPlatform('Windows'))"
69+
Overwrite="true" />
70+
5671
<Yarn Command="version --no-git-tag-version --new-version $(PackageVersion)" />
5772
<Yarn Command="pack --filename $(PackageFileName)" />
5873

src/Components/Browser.JS/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
node_modules/
2-
*.js.map
2+
dist/Debug/

src/Components/Browser.JS/Microsoft.AspNetCore.Components.Browser.JS.npmproj

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,12 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<WebpackInputs Include="src\**\*.ts" />
11-
<WebPackOutputs Include="dist\Debug\blazor.webassembly.js" />
12-
<WebPackOutputs Include="dist\Release\blazor.webassembly.js" />
13-
<WebPackOutputs Include="dist\Debug\blazor.server.js" />
14-
<WebPackOutputs Include="dist\Release\blazor.server.js" />
10+
<ProjectReference Include="..\..\SignalR\clients\ts\signalr\signalr.npmproj" />
11+
<ProjectReference Include="..\..\SignalR\clients\ts\signalr-protocol-msgpack\signalr-protocol-msgpack.npmproj" />
1512
</ItemGroup>
1613

1714
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
1815

19-
<!-- Override the default 'Build' target from eng/targets/Npm.Common.targets. -->
20-
<Target Name="Build"
21-
Inputs="@(WebpackInputs)"
22-
Outputs="@(WebPackOutputs)">
23-
<RemoveDir Directories="dist" />
24-
25-
<Yarn Command="run build:debug" />
26-
<Yarn Command="run build:production" />
27-
</Target>
16+
<Target Name="Restore" />
2817

2918
</Project>
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*.js -diff -merge
2+
*.js linguist-generated=true

src/Components/Browser.JS/dist/Debug/blazor.server.js

Lines changed: 0 additions & 15020 deletions
This file was deleted.

0 commit comments

Comments
 (0)