Skip to content

Commit 23d1d11

Browse files
pranavkmwtgodbe
authored andcommitted
Revert "Guarantee ordering for SignalR client HttpConnection.send (#10780)" (#10916)
This reverts commit b1a2928.
1 parent b1a2928 commit 23d1d11

File tree

22 files changed

+18226
-1298
lines changed

22 files changed

+18226
-1298
lines changed

build/repo.props

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

eng/targets/Npm.Common.targets

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
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>
1413
</PropertyGroup>
1514

1615
<Target Name="_CheckForInvalidConfiguration">
@@ -48,26 +47,12 @@
4847

4948
<Target Name="Pack" Condition="'$(IsPackable)' == 'true'" DependsOnTargets="$(PackDependsOn)">
5049
<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-
7156
<Yarn Command="version --no-git-tag-version --new-version $(PackageVersion)" />
7257
<Yarn Command="pack --filename $(PackageFileName)" />
7358

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-
dist/Debug/
2+
*.js.map

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

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

99
<ItemGroup>
10-
<ProjectReference Include="..\..\SignalR\clients\ts\signalr\signalr.npmproj" />
11-
<ProjectReference Include="..\..\SignalR\clients\ts\signalr-protocol-msgpack\signalr-protocol-msgpack.npmproj" />
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" />
1215
</ItemGroup>
1316

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

16-
<Target Name="Restore" />
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>
1728

1829
</Project>

src/Components/Browser.JS/dist/.gitattributes

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

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

Lines changed: 15020 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)