Skip to content

[automated] Merge branch 'release/10.0' => 'main' #63548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Sep 8, 2025
+16 −16
Merged

[automated] Merge branch 'release/10.0' => 'main' #63548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
40d84b1
[release/10.0] Fix openapi schema type null for UrlAttribute and Base…
github-actions[bot] Sep 4, 2025
2d3bd05
Extend Unofficial 1ES template in IdentityModel nightly tests job (#6…
github-actions[bot] Sep 4, 2025
c14eaaf
Update dependencies from https://github.com/dotnet/extensions build 2…
dotnet-maestro[bot] Sep 5, 2025
ad184d4
Fix Directory Browser accessibility (#63462)
github-actions[bot] Sep 5, 2025
78b2252
Update dependencies from https://github.com/dotnet/extensions build 2…
dotnet-maestro[bot] Sep 8, 2025
d73e2bb
Fix SuppliesCancellationTokenThatSignalsWhenRevalidationLoopIsBeingDi…
github-actions[bot] Sep 8, 2025
1539232
[release/10.0] Run entire E2E test with consistent enhanced navigatio…
github-actions[bot] Sep 8, 2025
565619f
[release/10.0] Fix race condition in EventTest.PreventDefault_DoNotAp…
github-actions[bot] Sep 8, 2025
97efc09
[release/10.0] Source code updates from dotnet/dotnet (#63553)
dotnet-maestro[bot] Sep 8, 2025
03be9e9
[release/10.0] [Blazor] Skip tests in ThreadingHostedAppTest and Thre…
github-actions[bot] Sep 8, 2025
930cb3a
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-maestro[bot] Sep 8, 2025
936bf23
Merge branch 'main' into merge/release/10.0-to-main
wtgodbe Sep 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,11 @@ This file should be imported by eng/Versions.props
<MicrosoftExtensionsDiagnosticsTestingPackageVersion>9.9.0-preview.1.25427.1</MicrosoftExtensionsDiagnosticsTestingPackageVersion>
<MicrosoftExtensionsTimeProviderTestingPackageVersion>9.9.0-preview.1.25427.1</MicrosoftExtensionsTimeProviderTestingPackageVersion>
<!-- _git/dotnet-optimization dependencies -->
<optimizationlinuxarm64MIBCRuntimePackageVersion>1.0.0-prerelease.25421.1</optimizationlinuxarm64MIBCRuntimePackageVersion>
<optimizationlinuxx64MIBCRuntimePackageVersion>1.0.0-prerelease.25421.1</optimizationlinuxx64MIBCRuntimePackageVersion>
<optimizationwindows_ntarm64MIBCRuntimePackageVersion>1.0.0-prerelease.25421.1</optimizationwindows_ntarm64MIBCRuntimePackageVersion>
<optimizationwindows_ntx64MIBCRuntimePackageVersion>1.0.0-prerelease.25421.1</optimizationwindows_ntx64MIBCRuntimePackageVersion>
<optimizationwindows_ntx86MIBCRuntimePackageVersion>1.0.0-prerelease.25421.1</optimizationwindows_ntx86MIBCRuntimePackageVersion>
<optimizationlinuxarm64MIBCRuntimePackageVersion>1.0.0-prerelease.25453.1</optimizationlinuxarm64MIBCRuntimePackageVersion>
<optimizationlinuxx64MIBCRuntimePackageVersion>1.0.0-prerelease.25453.1</optimizationlinuxx64MIBCRuntimePackageVersion>
<optimizationwindows_ntarm64MIBCRuntimePackageVersion>1.0.0-prerelease.25453.1</optimizationwindows_ntarm64MIBCRuntimePackageVersion>
<optimizationwindows_ntx64MIBCRuntimePackageVersion>1.0.0-prerelease.25453.1</optimizationwindows_ntx64MIBCRuntimePackageVersion>
<optimizationwindows_ntx86MIBCRuntimePackageVersion>1.0.0-prerelease.25453.1</optimizationwindows_ntx86MIBCRuntimePackageVersion>
<!-- dotnet/msbuild dependencies -->
<MicrosoftBuildPackageVersion>17.12.36</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>17.12.36</MicrosoftBuildFrameworkPackageVersion>
Expand Down
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,25 +402,25 @@
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>ec3b31d717a05bfa5ea1ea084ff33d15430a6cdf</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25421.1">
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25453.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>b0395bd1ac86994182f1b1eb73bbdf4ce6338ca9</Sha>
<Sha>d9535fd3e448b454d415702ebd150a8d51711963</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.25421.1">
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.25453.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>b0395bd1ac86994182f1b1eb73bbdf4ce6338ca9</Sha>
<Sha>d9535fd3e448b454d415702ebd150a8d51711963</Sha>
</Dependency>
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.25421.1">
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.25453.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>b0395bd1ac86994182f1b1eb73bbdf4ce6338ca9</Sha>
<Sha>d9535fd3e448b454d415702ebd150a8d51711963</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25421.1">
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25453.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>b0395bd1ac86994182f1b1eb73bbdf4ce6338ca9</Sha>
<Sha>d9535fd3e448b454d415702ebd150a8d51711963</Sha>
</Dependency>
<Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25421.1">
<Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25453.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>b0395bd1ac86994182f1b1eb73bbdf4ce6338ca9</Sha>
<Sha>d9535fd3e448b454d415702ebd150a8d51711963</Sha>
</Dependency>
<!-- Dependencies required for source build to lift to the previously-source-built version. -->
<!-- These versions are manually updated -->
Expand Down
2 changes: 1 addition & 1 deletion eng/common/sdk-task.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ show_usage() {

echo "Advanced settings:"
echo " --excludeCIBinarylog Don't output binary log (short: -nobl)"
echo " --noWarnAsError Do not warn as error
echo " --noWarnAsError Do not warn as error"
echo ""
echo "Command line arguments not listed above are passed thru to msbuild."
}
Expand Down
Loading