Skip to content

Commit 9d04725

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/10.0] Source code updates from dotnet/dotnet (#64127)
[release/10.0] Source code updates from dotnet/dotnet - Quarantine EmbeddingServerAppInsideIframe_WithCompressionEnabled_Fails (#64306) - Upgrade to MacOS 15 for CI (#64308)
1 parent e97b754 commit 9d04725

File tree

13 files changed

+621
-306
lines changed

13 files changed

+621
-306
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
# See https://github.com/dotnet/arcade/blob/master/Documentation/ChoosingAMachinePool.md
104104
pool:
105105
${{ if eq(parameters.agentOs, 'macOS') }}:
106-
vmImage: macOS-13
106+
vmImage: macOS-15
107107
${{ if eq(parameters.agentOs, 'Linux') }}:
108108
${{ if eq(parameters.useHostedUbuntu, true) }}:
109109
vmImage: ubuntu-22.04
@@ -163,8 +163,8 @@ jobs:
163163
- script: df -h
164164
displayName: Disk size
165165
- ${{ if eq(parameters.agentOs, 'macOS') }}:
166-
- script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer
167-
displayName: Use XCode 15.2.0
166+
- script: sudo xcode-select -s /Applications/Xcode_16.4.0.app/Contents/Developer
167+
displayName: Use XCode 16.4.0
168168
- ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}:
169169
- powershell: ./eng/scripts/InstallProcDump.ps1
170170
displayName: Install ProcDump
@@ -319,7 +319,7 @@ jobs:
319319
pool:
320320
${{ if eq(parameters.agentOs, 'macOS') }}:
321321
name: Azure Pipelines
322-
image: macOS-13
322+
image: macOS-15
323323
os: macOS
324324
${{ if eq(parameters.agentOs, 'Linux') }}:
325325
name: $(DncEngInternalBuildPool)
@@ -389,8 +389,8 @@ jobs:
389389
- script: df -h
390390
displayName: Disk size
391391
- ${{ if eq(parameters.agentOs, 'macOS') }}:
392-
- script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer
393-
displayName: Use XCode 15.2.0
392+
- script: sudo xcode-select -s /Applications/Xcode_16.4.0.app/Contents/Developer
393+
displayName: Use XCode 16.4.0
394394
- ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}:
395395
- powershell: ./eng/scripts/InstallProcDump.ps1
396396
displayName: Install ProcDump

‎NuGet.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-dotnet -->
7-
<add key="darc-pub-dotnet-dotnet-c737522" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-c737522b/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-dotnet-e17b0d0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-e17b0d08/nuget/v3/index.json" />
88
<!-- End: Package sources from dotnet-dotnet -->
99
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1010
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />

‎eng/PackageOverrides.txt‎

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
Microsoft.Extensions.Caching.Abstractions|10.0.0
2+
Microsoft.Extensions.Caching.Memory|10.0.0
3+
Microsoft.Extensions.Configuration.Abstractions|10.0.0
4+
Microsoft.Extensions.Configuration.Binder|10.0.0
5+
Microsoft.Extensions.Configuration.CommandLine|10.0.0
6+
Microsoft.Extensions.Configuration|10.0.0
7+
Microsoft.Extensions.Configuration.EnvironmentVariables|10.0.0
8+
Microsoft.Extensions.Configuration.FileExtensions|10.0.0
9+
Microsoft.Extensions.Configuration.Ini|10.0.0
10+
Microsoft.Extensions.Configuration.Json|10.0.0
11+
Microsoft.Extensions.Configuration.UserSecrets|10.0.0
12+
Microsoft.Extensions.Configuration.Xml|10.0.0
13+
Microsoft.Extensions.DependencyInjection.Abstractions|10.0.0
14+
Microsoft.Extensions.DependencyInjection|10.0.0
15+
Microsoft.Extensions.Diagnostics.Abstractions|10.0.0
16+
Microsoft.Extensions.Diagnostics|10.0.0
17+
Microsoft.Extensions.FileProviders.Abstractions|10.0.0
18+
Microsoft.Extensions.FileProviders.Composite|10.0.0
19+
Microsoft.Extensions.FileProviders.Physical|10.0.0
20+
Microsoft.Extensions.FileSystemGlobbing|10.0.0
21+
Microsoft.Extensions.Hosting.Abstractions|10.0.0
22+
Microsoft.Extensions.Hosting|10.0.0
23+
Microsoft.Extensions.Http|10.0.0
24+
Microsoft.Extensions.Logging.Abstractions|10.0.0
25+
Microsoft.Extensions.Logging.Configuration|10.0.0
26+
Microsoft.Extensions.Logging.Console|10.0.0
27+
Microsoft.Extensions.Logging.Debug|10.0.0
28+
Microsoft.Extensions.Logging|10.0.0
29+
Microsoft.Extensions.Logging.EventLog|10.0.0
30+
Microsoft.Extensions.Logging.EventSource|10.0.0
31+
Microsoft.Extensions.Logging.TraceSource|10.0.0
32+
Microsoft.Extensions.Options.ConfigurationExtensions|10.0.0
33+
Microsoft.Extensions.Options.DataAnnotations|10.0.0
34+
Microsoft.Extensions.Options|10.0.0
35+
Microsoft.Extensions.Primitives|10.0.0
36+
System.Diagnostics.EventLog|10.0.0
37+
System.Formats.Cbor|10.0.0
38+
System.Security.Cryptography.Xml|10.0.0
39+
System.Threading.RateLimiting|10.0.0
40+
Microsoft.AspNetCore.Antiforgery|10.0.0
41+
Microsoft.AspNetCore.Authentication.Abstractions|10.0.0
42+
Microsoft.AspNetCore.Authentication.BearerToken|10.0.0
43+
Microsoft.AspNetCore.Authentication.Cookies|10.0.0
44+
Microsoft.AspNetCore.Authentication.Core|10.0.0
45+
Microsoft.AspNetCore.Authentication|10.0.0
46+
Microsoft.AspNetCore.Authentication.OAuth|10.0.0
47+
Microsoft.AspNetCore.Authorization|10.0.0
48+
Microsoft.AspNetCore.Authorization.Policy|10.0.0
49+
Microsoft.AspNetCore.Components.Authorization|10.0.0
50+
Microsoft.AspNetCore.Components|10.0.0
51+
Microsoft.AspNetCore.Components.Endpoints|10.0.0
52+
Microsoft.AspNetCore.Components.Forms|10.0.0
53+
Microsoft.AspNetCore.Components.Server|10.0.0
54+
Microsoft.AspNetCore.Components.Web|10.0.0
55+
Microsoft.AspNetCore.Connections.Abstractions|10.0.0
56+
Microsoft.AspNetCore.CookiePolicy|10.0.0
57+
Microsoft.AspNetCore.Cors|10.0.0
58+
Microsoft.AspNetCore.Cryptography.Internal|10.0.0
59+
Microsoft.AspNetCore.Cryptography.KeyDerivation|10.0.0
60+
Microsoft.AspNetCore.DataProtection.Abstractions|10.0.0
61+
Microsoft.AspNetCore.DataProtection|10.0.0
62+
Microsoft.AspNetCore.DataProtection.Extensions|10.0.0
63+
Microsoft.AspNetCore.Diagnostics.Abstractions|10.0.0
64+
Microsoft.AspNetCore.Diagnostics|10.0.0
65+
Microsoft.AspNetCore.Diagnostics.HealthChecks|10.0.0
66+
Microsoft.AspNetCore|10.0.0
67+
Microsoft.AspNetCore.HostFiltering|10.0.0
68+
Microsoft.AspNetCore.Hosting.Abstractions|10.0.0
69+
Microsoft.AspNetCore.Hosting|10.0.0
70+
Microsoft.AspNetCore.Hosting.Server.Abstractions|10.0.0
71+
Microsoft.AspNetCore.Html.Abstractions|10.0.0
72+
Microsoft.AspNetCore.Http.Abstractions|10.0.0
73+
Microsoft.AspNetCore.Http.Connections.Common|10.0.0
74+
Microsoft.AspNetCore.Http.Connections|10.0.0
75+
Microsoft.AspNetCore.Http|10.0.0
76+
Microsoft.AspNetCore.Http.Extensions|10.0.0
77+
Microsoft.AspNetCore.Http.Features|10.0.0
78+
Microsoft.AspNetCore.Http.Results|10.0.0
79+
Microsoft.AspNetCore.HttpLogging|10.0.0
80+
Microsoft.AspNetCore.HttpOverrides|10.0.0
81+
Microsoft.AspNetCore.HttpsPolicy|10.0.0
82+
Microsoft.AspNetCore.Identity|10.0.0
83+
Microsoft.AspNetCore.Localization|10.0.0
84+
Microsoft.AspNetCore.Localization.Routing|10.0.0
85+
Microsoft.AspNetCore.Metadata|10.0.0
86+
Microsoft.AspNetCore.Mvc.Abstractions|10.0.0
87+
Microsoft.AspNetCore.Mvc.ApiExplorer|10.0.0
88+
Microsoft.AspNetCore.Mvc.Core|10.0.0
89+
Microsoft.AspNetCore.Mvc.Cors|10.0.0
90+
Microsoft.AspNetCore.Mvc.DataAnnotations|10.0.0
91+
Microsoft.AspNetCore.Mvc|10.0.0
92+
Microsoft.AspNetCore.Mvc.Formatters.Json|10.0.0
93+
Microsoft.AspNetCore.Mvc.Formatters.Xml|10.0.0
94+
Microsoft.AspNetCore.Mvc.Localization|10.0.0
95+
Microsoft.AspNetCore.Mvc.Razor|10.0.0
96+
Microsoft.AspNetCore.Mvc.RazorPages|10.0.0
97+
Microsoft.AspNetCore.Mvc.TagHelpers|10.0.0
98+
Microsoft.AspNetCore.Mvc.ViewFeatures|10.0.0
99+
Microsoft.AspNetCore.OutputCaching|10.0.0
100+
Microsoft.AspNetCore.RateLimiting|10.0.0
101+
Microsoft.AspNetCore.Razor|10.0.0
102+
Microsoft.AspNetCore.Razor.Runtime|10.0.0
103+
Microsoft.AspNetCore.RequestDecompression|10.0.0
104+
Microsoft.AspNetCore.ResponseCaching.Abstractions|10.0.0
105+
Microsoft.AspNetCore.ResponseCaching|10.0.0
106+
Microsoft.AspNetCore.ResponseCompression|10.0.0
107+
Microsoft.AspNetCore.Rewrite|10.0.0
108+
Microsoft.AspNetCore.Routing.Abstractions|10.0.0
109+
Microsoft.AspNetCore.Routing|10.0.0
110+
Microsoft.AspNetCore.Server.HttpSys|10.0.0
111+
Microsoft.AspNetCore.Server.IIS|10.0.0
112+
Microsoft.AspNetCore.Server.IISIntegration|10.0.0
113+
Microsoft.AspNetCore.Server.Kestrel.Core|10.0.0
114+
Microsoft.AspNetCore.Server.Kestrel|10.0.0
115+
Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes|10.0.0
116+
Microsoft.AspNetCore.Server.Kestrel.Transport.Quic|10.0.0
117+
Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets|10.0.0
118+
Microsoft.AspNetCore.Session|10.0.0
119+
Microsoft.AspNetCore.SignalR.Common|10.0.0
120+
Microsoft.AspNetCore.SignalR.Core|10.0.0
121+
Microsoft.AspNetCore.SignalR|10.0.0
122+
Microsoft.AspNetCore.SignalR.Protocols.Json|10.0.0
123+
Microsoft.AspNetCore.StaticAssets|10.0.0
124+
Microsoft.AspNetCore.StaticFiles|10.0.0
125+
Microsoft.AspNetCore.WebSockets|10.0.0
126+
Microsoft.AspNetCore.WebUtilities|10.0.0
127+
Microsoft.Extensions.Configuration.KeyPerFile|10.0.0
128+
Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions|10.0.0
129+
Microsoft.Extensions.Diagnostics.HealthChecks|10.0.0
130+
Microsoft.Extensions.Features|10.0.0
131+
Microsoft.Extensions.Identity.Core|10.0.0
132+
Microsoft.Extensions.Identity.Stores|10.0.0
133+
Microsoft.Extensions.Localization.Abstractions|10.0.0
134+
Microsoft.Extensions.Localization|10.0.0
135+
Microsoft.Extensions.ObjectPool|10.0.0
136+
Microsoft.Extensions.Validation|10.0.0
137+
Microsoft.Extensions.WebEncoders|10.0.0
138+
Microsoft.JSInterop|10.0.0
139+
Microsoft.Net.Http.Headers|10.0.0
140+
Microsoft.AspNetCore.App|10.0.0

0 commit comments

Comments
 (0)