Skip to content

Commit 04808a1

Browse files
RussKieRussKie
authored
Merge branch 'main' into dependabot/submodules/src/submodules/googletest-1d17ea1
2 parents 09d1e0b + 091da45 commit 04808a1

File tree

556 files changed

+14528
-6198
lines changed

Some content is hidden

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

556 files changed

+14528
-6198
lines changed

‎.azure/pipelines/ci-public.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ stages:
573573
agentOs: macOS
574574
timeoutInMinutes: 90
575575
isAzDOTestingJob: true
576-
buildArgs: --all --test --binaryLog "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs)
576+
buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
577577
beforeBuild:
578578
- bash: "./eng/scripts/install-nginx-mac.sh"
579579
displayName: Installing Nginx
@@ -594,7 +594,7 @@ stages:
594594
agentOs: Linux
595595
isAzDOTestingJob: true
596596
useHostedUbuntu: false
597-
buildArgs: --all --test --binaryLog "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs)
597+
buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
598598
beforeBuild:
599599
- bash: "./eng/scripts/install-nginx-linux.sh"
600600
displayName: Installing Nginx

‎.azure/pipelines/ci.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,8 @@ extends:
143143
name: NetCore1ESPool-Svc-Internal
144144
image: windows.vs2022.amd64
145145
os: windows
146+
spotBugs:
147+
enabled: false
146148
containers:
147149
alpine319WithNode:
148150
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
@@ -637,7 +639,7 @@ extends:
637639
agentOs: macOS
638640
timeoutInMinutes: 90
639641
isAzDOTestingJob: true
640-
buildArgs: --all --test --binaryLog "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs)
642+
buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
641643
beforeBuild:
642644
- bash: "./eng/scripts/install-nginx-mac.sh"
643645
displayName: Installing Nginx
@@ -658,7 +660,7 @@ extends:
658660
agentOs: Linux
659661
isAzDOTestingJob: true
660662
useHostedUbuntu: false
661-
buildArgs: --all --test --binaryLog "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs)
663+
buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
662664
beforeBuild:
663665
- bash: "./eng/scripts/install-nginx-linux.sh"
664666
displayName: Installing Nginx
@@ -704,6 +706,7 @@ extends:
704706
# Source build
705707
- template: /eng/common/templates-official/job/source-build.yml@self
706708
parameters:
709+
enableInternalSources: true
707710
platform:
708711
name: 'Managed'
709712
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'

‎.azure/pipelines/jobs/default-build.yml

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -419,25 +419,8 @@ jobs:
419419

420420
- ${{ parameters.beforeBuild }}
421421

422-
- ${{ if eq(parameters.agentOs, 'Windows') }}:
423-
- task: PowerShell@2
424-
displayName: Setup Private Feeds Credentials
425-
inputs:
426-
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
427-
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
428-
env:
429-
Token: $(dn-bot-dnceng-artifact-feeds-rw)
430-
- ${{ if ne(parameters.agentOs, 'Windows') }}:
431-
- task: Bash@3
432-
displayName: Setup Private Feeds Credentials
433-
inputs:
434-
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
435-
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
436-
env:
437-
Token: $(dn-bot-dnceng-artifact-feeds-rw)
438-
439-
# Call the NugetAuthenticate task to add creds for added feeds.
440-
- task: NuGetAuthenticate@1
422+
# - template: /eng/common/templates-official/steps/enable-internal-sources.yml@self
423+
# - template: /eng/common/templates-official/steps/enable-internal-runtimes.yml@self
441424

442425
# Add COMPlus_* environment variables to build steps.
443426
- ${{ if ne(parameters.steps, '')}}:

‎.github/policies/resourceManagement.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -497,19 +497,19 @@ configuration:
497497
branch: main
498498
then:
499499
- addMilestone:
500-
milestone: 9.0-preview6
500+
milestone: 9.0-preview7
501501
description: '[Milestone Assignments] Assign Milestone to PRs merged to the `main` branch'
502502
- if:
503503
- payloadType: Pull_Request
504504
- isAction:
505505
action: Closed
506506
- targetsBranch:
507-
branch: release/9.0-preview5
507+
branch: release/9.0-preview6
508508
then:
509509
- removeMilestone
510510
- addMilestone:
511-
milestone: 9.0-preview5
512-
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0-preview5 branch'
511+
milestone: 9.0-preview6
512+
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0-preview6 branch'
513513
- if:
514514
- payloadType: Issues
515515
- isAction:
@@ -670,7 +670,7 @@ configuration:
670670
then:
671671
- removeMilestone
672672
- addMilestone:
673-
milestone: 6.0.32
673+
milestone: 6.0.33
674674
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/6.0 branch'
675675
- if:
676676
- payloadType: Pull_Request
@@ -681,7 +681,7 @@ configuration:
681681
then:
682682
- removeMilestone
683683
- addMilestone:
684-
milestone: 8.0.7
684+
milestone: 8.0.8
685685
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/8.0 branch'
686686
- if:
687687
- payloadType: Issues

‎AspNetCore.sln

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1102,7 +1102,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "perf", "perf", "{5095E70C-6
11021102
EndProject
11031103
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.Microbenchmarks", "src\SignalR\perf\Microbenchmarks\Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj", "{A6A95BEF-7E21-4D3D-921B-F77267219D27}"
11041104
EndProject
1105-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.Tests", "src\SignalR\server\SignalR\test\Microsoft.AspNetCore.SignalR.Tests.csproj", "{4DC9C494-9867-4319-937E-5FBC0E5F5A51}"
1105+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.Tests", "src\SignalR\server\SignalR\test\Microsoft.AspNetCore.SignalR.Tests\Microsoft.AspNetCore.SignalR.Tests.csproj", "{4DC9C494-9867-4319-937E-5FBC0E5F5A51}"
11061106
EndProject
11071107
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Specification.Tests", "Specification.Tests", "{245939DA-D68D-4B5C-A95E-D3B6923614FF}"
11081108
EndProject
@@ -1816,6 +1816,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GetDocumentInsider.Tests",
18161816
EndProject
18171817
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GetDocumentSample", "src\Tools\GetDocumentInsider\sample\GetDocumentSample.csproj", "{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}"
18181818
EndProject
1819+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorUnitedApp.Client", "src\Components\Samples\BlazorUnitedApp.Client\BlazorUnitedApp.Client.csproj", "{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}"
1820+
EndProject
18191821
Global
18201822
GlobalSection(SolutionConfigurationPlatforms) = preSolution
18211823
Debug|Any CPU = Debug|Any CPU
@@ -10977,6 +10979,22 @@ Global
1097710979
{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Release|x64.Build.0 = Release|Any CPU
1097810980
{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Release|x86.ActiveCfg = Release|Any CPU
1097910981
{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Release|x86.Build.0 = Release|Any CPU
10982+
{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
10983+
{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Debug|Any CPU.Build.0 = Debug|Any CPU
10984+
{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Debug|arm64.ActiveCfg = Debug|Any CPU
10985+
{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Debug|arm64.Build.0 = Debug|Any CPU
10986+
{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Debug|x64.ActiveCfg = Debug|Any CPU
10987+
{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Debug|x64.Build.0 = Debug|Any CPU
10988+
{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Debug|x86.ActiveCfg = Debug|Any CPU
10989+
{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Debug|x86.Build.0 = Debug|Any CPU
10990+
{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Release|Any CPU.ActiveCfg = Release|Any CPU
10991+
{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Release|Any CPU.Build.0 = Release|Any CPU
10992+
{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Release|arm64.ActiveCfg = Release|Any CPU
10993+
{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Release|arm64.Build.0 = Release|Any CPU
10994+
{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Release|x64.ActiveCfg = Release|Any CPU
10995+
{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Release|x64.Build.0 = Release|Any CPU
10996+
{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Release|x86.ActiveCfg = Release|Any CPU
10997+
{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63}.Release|x86.Build.0 = Release|Any CPU
1098010998
EndGlobalSection
1098110999
GlobalSection(SolutionProperties) = preSolution
1098211000
HideSolutionNode = FALSE
@@ -11874,6 +11892,7 @@ Global
1187411892
{9536C284-65B4-4884-BB50-06D629095C3E} = {274100A5-5B2D-4EA2-AC42-A62257FC6BDC}
1187511893
{6A19D94D-2BC6-4198-BE2E-342688FDBA4B} = {A1B75FC7-A777-4412-A635-D0C9ED8FE7A0}
1187611894
{D8F7091E-A2D1-4E81-BA7C-97EAE392D683} = {A1B75FC7-A777-4412-A635-D0C9ED8FE7A0}
11895+
{757CBDE0-5D0A-4FD8-99F3-6C20BDDD4E63} = {5FE1FBC1-8CE3-4355-9866-44FE1307C5F1}
1187711896
EndGlobalSection
1187811897
GlobalSection(ExtensibilityGlobals) = postSolution
1187911898
SolutionGuid = {3E8720B3-DBDD-498C-B383-2CC32A054E8F}

‎docs/UpdatingMajorVersionAndTFM.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ Once dotnet/runtime has updated their TFM, we update ours in the dependency upda
4141
### Required changes
4242

4343
* In [eng/Versions.props](/eng/Versions.props), increment `DefaultNetCoreTargetFramework` by 1.
44+
* In [eng/Versions.props](/eng/Versions.props), **if and only if** the new TFM is LTS, update `CurrentLtsTargetFramework` to match `DefaultNetCoreTargetFramework`
4445
* In [eng/SourceBuild.props](/eng/SourceBuild.props), update `SourceBuildTargetFrameworkFilter` to include the current TFM.
4546
* Do a global repo search for the current version string, and update almost everything by 1 (e.g. find `net8`, replace with `net9`). See the PR linked above for examples - this shouldn't be done blindly, but on a case-by-case basis. Most things should be updated, and most choices should be obvious.
4647
* Exceptions to this are [eng/tools/RepoTasks/RepoTasks.csproj](/eng/tools/RepoTasks/RepoTasks.csproj) and [eng/tools/RepoTasks/RepoTasks.tasks](/eng/tools/RepoTasks/RepoTasks.tasks). These build without the workarounds from [eng/tools/GenerateFiles/Directory.Build.targets.in](/eng/tools/GenerateFiles/Directory.Build.targets.in), and need to be kept at the previous TFM until we get an SDK containing a runtime with the new TFM. Generally this means we have to hard-code the previous TFM for these files, rather than using `DefaultNetCoreTargetFramework`.

‎eng/Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
<!-- Build the targeting pack installers -->
8989
<ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\TargetingPack\TargetingPack.wixproj" AdditionalProperties="Platform=x64" />
9090
<ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\TargetingPack\TargetingPack.wixproj" AdditionalProperties="Platform=x86" />
91-
<!-- This really shouldn't be here, but instead of harvesting from the intermediate/output directories, the targetting pack installer logic
91+
<!-- This really shouldn't be here, but instead of harvesting from the intermediate/output directories, the targeting pack installer logic
9292
harvests from a zip of the reference assemblies. Producing it in each leg ends up with multiple targeting packs
9393
getting produced and the BAR will reject the build. Centralize building the targeting pack in the x86/x64 leg. -->
9494
<ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\TargetingPack\TargetingPack.wixproj" AdditionalProperties="Platform=arm64" />

‎eng/RequiresDelayedBuildProjects.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<RequiresDelayedBuild Include="$(RepoRoot)src\Grpc\JsonTranscoding\test\testassets\IntegrationTestsWebsite\IntegrationTestsWebsite.csproj" />
2222
<RequiresDelayedBuild Include="$(RepoRoot)src\Grpc\JsonTranscoding\test\testassets\Sandbox\Sandbox.csproj" />
2323
<RequiresDelayedBuild Include="$(RepoRoot)src\ProjectTemplates\test\Templates.Blazor.Tests\Templates.Blazor.Tests.csproj" />
24+
<RequiresDelayedBuild Include="$(RepoRoot)src\SignalR\server\SignalR\test\Microsoft.AspNetCore.SignalR.TrimmingTests\Microsoft.AspNetCore.SignalR.TrimmingTests.proj" />
2425
<RequiresDelayedBuild Include="$(RepoRoot)eng\Npm.Workspace.FunctionalTests.nodeproj" />
2526
</ItemGroup>
2627
</Project>

‎eng/Signing.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
<ItemGroup Label="Code sign exclusions">
101101
<!-- We don't need to code sign .js files because they are not used in Windows Script Host. -->
102102
<FileExtensionSignInfo Include=".js" CertificateName="None" />
103-
<!-- We don't produce font files. We rebundle some for using the web brower, so they do not need to be signed. -->
103+
<!-- We don't produce font files. We rebundle some for using the web browser, so they do not need to be signed. -->
104104
<FileExtensionSignInfo Include=".otf" CertificateName="None" />
105105
<FileExtensionSignInfo Include=".ttf" CertificateName="None" />
106106
<!-- This is a text file which doesn't need to be code signed, even though some .mof files can be signed. -->

‎eng/TrimmableProjects.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@
9292
<TrimmableProject Include="Microsoft.AspNetCore.Http.Connections" />
9393
<TrimmableProject Include="Microsoft.AspNetCore.SignalR.Protocols.Json" />
9494
<TrimmableProject Include="Microsoft.AspNetCore.SignalR.Common" />
95+
<TrimmableProject Include="Microsoft.AspNetCore.SignalR.Core" />
96+
<TrimmableProject Include="Microsoft.AspNetCore.SignalR" />
9597
<TrimmableProject Include="Microsoft.AspNetCore.StaticAssets" />
9698
<TrimmableProject Include="Microsoft.AspNetCore.Components.Authorization" />
9799
<TrimmableProject Include="Microsoft.AspNetCore.Components" />

0 commit comments

Comments
 (0)