Skip to content

Commit 1f464df

Browse files
Merge branch 'main' into evgenyfedorov2/log_buffering
2 parents f7eaab1 + 7d9d589 commit 1f464df

File tree

192 files changed

+8798
-2442
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

192 files changed

+8798
-2442
lines changed

.github/workflows/azure-sync-checkdiff.ps1

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

.github/workflows/azure-sync.yml

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

NuGet.config

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,27 @@
22
<configuration>
33
<packageSources>
44
<clear />
5+
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6+
<!-- Begin: Package sources from dotnet-aspnetcore -->
7+
<add key="darc-pub-dotnet-aspnetcore-401ae7c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-401ae7cb/nuget/v3/index.json" />
8+
<!-- End: Package sources from dotnet-aspnetcore -->
9+
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
510
<!-- Arcade -->
11+
<add key="darc-pub-dotnet-aspnetcore-be19faf1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-be19faf1/nuget/v3/index.json" />
612
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
713
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
814
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
9-
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
10-
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
1115
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
1216
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
13-
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
14-
<add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
1517
<!-- Used for the Rich Navigation indexing task -->
1618
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
1719
</packageSources>
1820
<!-- Define mappings by adding package patterns beneath the target source.
1921
https://aka.ms/nuget-package-source-mapping -->
2022
<packageSourceMapping>
23+
<packageSource key="darc-pub-dotnet-aspnetcore-be19faf1">
24+
<package pattern="*" />
25+
</packageSource>
2126
<packageSource key="dotnet-public">
2227
<package pattern="*" />
2328
</packageSource>

eng/MSBuild/Shared.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
<ItemGroup Condition="'$(InjectSharedRentedSpan)' == 'true'">
1515
<Compile Include="$(MSBuildThisFileDirectory)\..\..\src\Shared\RentedSpan\*.cs" LinkBase="Shared\RentedSpan" />
1616
</ItemGroup>
17+
18+
<ItemGroup Condition="'$(InjectSharedServerSentEvents)' == 'true'">
19+
<Compile Include="$(MSBuildThisFileDirectory)\..\..\src\Shared\ServerSentEvents\*.cs" LinkBase="Shared\ServerSentEvents" />
20+
</ItemGroup>
1721

1822
<ItemGroup Condition="'$(InjectSharedNumericExtensions)' == 'true'">
1923
<Compile Include="$(MSBuildThisFileDirectory)\..\..\src\Shared\NumericExtensions\*.cs" LinkBase="Shared\NumericExtensions" />

0 commit comments

Comments
 (0)