Skip to content

Commit c312fa8

Browse files
rolfbjarnerolfbjarne
committed
Merge remote-tracking branch 'origin/main' into dev/rolf/mergeable-libraries
2 parents d2bb947 + 791332b commit c312fa8

64 files changed

Lines changed: 2567 additions & 1678 deletions

File tree

Some content is hidden

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

‎NuGet.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<!-- Begin: Package sources from dotnet-dotnet -->
1313
<!-- End: Package sources from dotnet-dotnet -->
1414
<!-- Begin: Package sources from dotnet-macios -->
15+
<add key="darc-pub-dotnet-macios-bfdc82e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-bfdc82e5/nuget/v3/index.json" />
1516
<!-- End: Package sources from dotnet-macios -->
1617
<!-- Begin: Package sources from dotnet-emsdk -->
1718
<!-- End: Package sources from dotnet-emsdk -->

‎docs/building-apps/build-properties.md‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -544,13 +544,24 @@ build warns) when those conditions aren't met.
544544

545545
## EmbedOnDemandResources
546546

547-
Controls where on-demand resource asset packs are placed when packaging an app
548-
for distribution. This property does **not** enable on-demand resources (use
549-
[EnableOnDemandResources](#enableondemandresources) for that) — it only affects
550-
how already-tagged asset packs are packaged.
547+
Controls where on-demand resource asset packs are placed, so that the on-demand
548+
resources APIs can find them at runtime. This property does **not** enable
549+
on-demand resources (use [EnableOnDemandResources](#enableondemandresources) for
550+
that) — it only affects how already-tagged asset packs are packaged.
551551

552552
This is the property set by the "Embed on-demand resources in the app bundle"
553-
option in the IDE. It only takes effect for `AdHoc` distribution:
553+
option in the IDE.
554+
555+
When building for the **simulator**, the asset packs can't be hosted anywhere
556+
(there's no App Store nor a local hosting server), so they must be embedded in
557+
the app bundle for on-demand resources to work at all:
558+
559+
* `true`: the asset packs are embedded in the `.app` bundle and served locally
560+
by the app.
561+
* `false`: the asset packs are not embedded, so the on-demand resources APIs
562+
won't find them on the simulator.
563+
564+
When packaging an **IPA** for `AdHoc` distribution:
554565

555566
* `true`: the asset packs are embedded in the `.app` bundle inside the IPA and
556567
served locally by the app.
@@ -560,9 +571,7 @@ option in the IDE. It only takes effect for `AdHoc` distribution:
560571
For `AppStore` distribution the asset packs are always placed outside the `.app`
561572
bundle (to be hosted by the App Store), regardless of this property.
562573

563-
This property is only consulted when packaging an IPA for distribution (when
564-
`BuildIpa` is `true` and the distribution type is `AppStore` or `AdHoc`); it has
565-
no effect on a simulator or device debug build.
574+
This property has no effect on a device debug build.
566575

567576
Default: true
568577

‎dotnet/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,7 @@ $(DOTNET_PACKS_PATH)/$($(1)_NUGET_REF_NAME)/$2: | $(DOTNET_PACKS_PATH)/$($(1)_NU
328328
$$(Q_LN) ln -Fs $$(abspath $(DOTNET_DESTDIR)/$($(1)_NUGET_REF_NAME)) $$(abspath $$@)
329329

330330
$(DOTNET_TEMPLATE_PACKS_PATH)/Microsoft.$1.Templates.$(2).nupkg: $(TEMPLATE_PACKS_$(call uppercase,$(1))) | $(DOTNET_TEMPLATE_PACKS_PATH)
331+
$$(Q) rm -f $(DOTNET_TEMPLATE_PACKS_PATH)/Microsoft.$1.Templates.*.nupkg
331332
$$(Q) $$(CP) $$< $$@
332333

333334
WORKLOAD_TARGETS += \

‎dotnet/Workloads/SignList.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,8 @@
140140
<!-- Xamarin.Messaging -->
141141
<FirstParty Include="Merq.dll" />
142142
<FirstParty Include="Merq.Core.dll" />
143+
<FirstParty Include="Microsoft.Extensions.DependencyInjection.Abstractions.dll" />
144+
<FirstParty Include="Microsoft.Extensions.Logging.Abstractions.dll" />
143145
<!-- Broker.zip -->
144146
<FirstParty Include="Broker.exe" />
145147
<FirstParty Include="Broker.resources.dll" />

‎dotnet/targets/Xamarin.Shared.Sdk.targets‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@
328328
/>
329329
</Target>
330330

331-
<Target Name="_CreateAssetPackManifestMobile" Condition="'$(_PlatformName)' != 'macOS'" DependsOnTargets="_CreateAssetPackManifest" />
331+
<Target Name="_CreateAssetPackManifestMobile" Condition="'$(_PlatformName)' != 'macOS'" DependsOnTargets="_CreateAssetPackManifest;_EmbedOnDemandResources" />
332332

333333
<!-- PublishTrimmed must be calculated as part of a target because IsMacEnabled on Windows will be set after connecting to the Mac -->
334334
<Target Name="_ComputePublishTrimmed">
@@ -1086,18 +1086,7 @@
10861086
<WriteLinesToFile
10871087
SessionId="$(BuildSessionId)"
10881088
Condition="'$(IsMacEnabled)' == 'true'"
1089-
File="$(_CustomLinkerOptionsFile)"
1090-
Lines="$(_CustomLinkerOptions)"
1091-
Overwrite="true" />
1092-
1093-
<!--
1094-
When building remotely from Windows, the task above writes the file on the Mac (because it's passed
1095-
a SessionId), but the PrepareAssemblies task isn't remoted, so it needs the file on the local machine
1096-
as well. Write it locally too in that case (the contents are identical, since all the properties are
1097-
evaluated locally in either case).
1098-
-->
1099-
<WriteLinesToFile
1100-
Condition="'$(IsMacEnabled)' == 'true' And '$(BuildSessionId)' != '' And '$(PrepareAssemblies)' == 'true'"
1089+
CopyToWindows="true"
11011090
File="$(_CustomLinkerOptionsFile)"
11021091
Lines="$(_CustomLinkerOptions)"
11031092
Overwrite="true" />

‎eng/Version.Details.props‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,29 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet-dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26426.102</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26426.102</MicrosoftDotNetBuildTasksFeedPackageVersion>
11-
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26426.102</MicrosoftDotNetCecilPackageVersion>
12-
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.26426.102</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
13-
<MicrosoftNETILLinkPackageVersion>11.0.0-rc.2.26426.102</MicrosoftNETILLinkPackageVersion>
14-
<MicrosoftNETILLinkTasksPackageVersion>11.0.0-rc.2.26426.102</MicrosoftNETILLinkTasksPackageVersion>
15-
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>11.0.0-rc.2.26426.102</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
16-
<MicrosoftNETSdkPackageVersion>11.0.100-rc.2.26426.102</MicrosoftNETSdkPackageVersion>
17-
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-rc.2.26426.102</MicrosoftNETCoreAppRefPackageVersion>
18-
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-rc.2.26426.102</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26452.102</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26452.102</MicrosoftDotNetBuildTasksFeedPackageVersion>
11+
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26452.102</MicrosoftDotNetCecilPackageVersion>
12+
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.26452.102</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
13+
<MicrosoftNETILLinkPackageVersion>11.0.0-rc.2.26452.102</MicrosoftNETILLinkPackageVersion>
14+
<MicrosoftNETILLinkTasksPackageVersion>11.0.0-rc.2.26452.102</MicrosoftNETILLinkTasksPackageVersion>
15+
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>11.0.0-rc.2.26452.102</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
16+
<MicrosoftNETSdkPackageVersion>11.0.100-rc.2.26452.102</MicrosoftNETSdkPackageVersion>
17+
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-rc.2.26452.102</MicrosoftNETCoreAppRefPackageVersion>
18+
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-rc.2.26452.102</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
1919
<!-- dotnet-macios dependencies -->
2020
<MicrosoftiOSSdknet100_260PackageVersion>26.0.11017</MicrosoftiOSSdknet100_260PackageVersion>
21-
<MicrosoftiOSSdknet100_265PackageVersion>26.5.10315</MicrosoftiOSSdknet100_265PackageVersion>
22-
<MicrosoftiOSSdknet100_270PackageVersion>27.0.10241-xcode27.0</MicrosoftiOSSdknet100_270PackageVersion>
21+
<MicrosoftiOSSdknet100_265PackageVersion>26.5.10320</MicrosoftiOSSdknet100_265PackageVersion>
22+
<MicrosoftiOSSdknet100_270PackageVersion>27.0.10543-xcode27.0</MicrosoftiOSSdknet100_270PackageVersion>
2323
<MicrosoftMacCatalystSdknet100_260PackageVersion>26.0.11017</MicrosoftMacCatalystSdknet100_260PackageVersion>
24-
<MicrosoftMacCatalystSdknet100_265PackageVersion>26.5.10315</MicrosoftMacCatalystSdknet100_265PackageVersion>
25-
<MicrosoftMacCatalystSdknet100_270PackageVersion>27.0.10241-xcode27.0</MicrosoftMacCatalystSdknet100_270PackageVersion>
24+
<MicrosoftMacCatalystSdknet100_265PackageVersion>26.5.10320</MicrosoftMacCatalystSdknet100_265PackageVersion>
25+
<MicrosoftMacCatalystSdknet100_270PackageVersion>27.0.10543-xcode27.0</MicrosoftMacCatalystSdknet100_270PackageVersion>
2626
<MicrosoftmacOSSdknet100_260PackageVersion>26.0.11017</MicrosoftmacOSSdknet100_260PackageVersion>
27-
<MicrosoftmacOSSdknet100_265PackageVersion>26.5.10315</MicrosoftmacOSSdknet100_265PackageVersion>
28-
<MicrosoftmacOSSdknet100_270PackageVersion>27.0.10241-xcode27.0</MicrosoftmacOSSdknet100_270PackageVersion>
27+
<MicrosoftmacOSSdknet100_265PackageVersion>26.5.10320</MicrosoftmacOSSdknet100_265PackageVersion>
28+
<MicrosoftmacOSSdknet100_270PackageVersion>27.0.10543-xcode27.0</MicrosoftmacOSSdknet100_270PackageVersion>
2929
<MicrosofttvOSSdknet100_260PackageVersion>26.0.11017</MicrosofttvOSSdknet100_260PackageVersion>
30-
<MicrosofttvOSSdknet100_265PackageVersion>26.5.10315</MicrosofttvOSSdknet100_265PackageVersion>
31-
<MicrosofttvOSSdknet100_270PackageVersion>27.0.10241-xcode27.0</MicrosofttvOSSdknet100_270PackageVersion>
30+
<MicrosofttvOSSdknet100_265PackageVersion>26.5.10320</MicrosofttvOSSdknet100_265PackageVersion>
31+
<MicrosofttvOSSdknet100_270PackageVersion>27.0.10543-xcode27.0</MicrosofttvOSSdknet100_270PackageVersion>
3232
<!-- dotnet-xharness dependencies -->
3333
<MicrosoftDotNetXHarnessiOSSharedPackageVersion>11.0.0-prerelease.26451.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
3434
</PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-rc.2.26426.102">
3+
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-rc.2.26452.102">
44
<Uri>https://github.com/dotnet/dotnet</Uri>
5-
<Sha>da377e2093fdde18a0d36429a2644638d07685f6</Sha>
5+
<Sha>ba5fefc87000195d9618a554794c7b0f283290c7</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-rc.2.26426.102">
7+
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-rc.2.26452.102">
88
<Uri>https://github.com/dotnet/dotnet</Uri>
9-
<Sha>da377e2093fdde18a0d36429a2644638d07685f6</Sha>
9+
<Sha>ba5fefc87000195d9618a554794c7b0f283290c7</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="11.0.0-rc.2.26426.102">
11+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="11.0.0-rc.2.26452.102">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>da377e2093fdde18a0d36429a2644638d07685f6</Sha>
13+
<Sha>ba5fefc87000195d9618a554794c7b0f283290c7</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="11.0.0-rc.2.26426.102">
15+
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="11.0.0-rc.2.26452.102">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>da377e2093fdde18a0d36429a2644638d07685f6</Sha>
17+
<Sha>ba5fefc87000195d9618a554794c7b0f283290c7</Sha>
1818
</Dependency>
1919
<!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if changing the version outside of dependency flow -->
20-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-rc.2.26426.102">
20+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-rc.2.26452.102">
2121
<Uri>https://github.com/dotnet/dotnet</Uri>
22-
<Sha>da377e2093fdde18a0d36429a2644638d07685f6</Sha>
22+
<Sha>ba5fefc87000195d9618a554794c7b0f283290c7</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26426.102">
24+
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26452.102">
2525
<Uri>https://github.com/dotnet/dotnet</Uri>
26-
<Sha>da377e2093fdde18a0d36429a2644638d07685f6</Sha>
26+
<Sha>ba5fefc87000195d9618a554794c7b0f283290c7</Sha>
2727
</Dependency>
2828
<!-- This is a subscription of the .NET 10/Xcode 26.0 versions of our packages -->
2929
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_26.0" Version="26.0.11017">
@@ -43,60 +43,60 @@
4343
<Sha>23eb1c2c9465fe76c810c8a69982c1254161f4b0</Sha>
4444
</Dependency>
4545
<!-- This is a subscription of the .NET 10/Xcode 26.5 versions of our packages -->
46-
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_26.5" Version="26.5.10315">
46+
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_26.5" Version="26.5.10320">
4747
<Uri>https://github.com/dotnet/macios</Uri>
48-
<Sha>ac895e19154cd3305df029b18849b2e5ed98e036</Sha>
48+
<Sha>bfdc82e54e6110c626149b1486dd8b9eedf2b1fd</Sha>
4949
</Dependency>
50-
<Dependency Name="Microsoft.macOS.Sdk.net10.0_26.5" Version="26.5.10315">
50+
<Dependency Name="Microsoft.macOS.Sdk.net10.0_26.5" Version="26.5.10320">
5151
<Uri>https://github.com/dotnet/macios</Uri>
52-
<Sha>ac895e19154cd3305df029b18849b2e5ed98e036</Sha>
52+
<Sha>bfdc82e54e6110c626149b1486dd8b9eedf2b1fd</Sha>
5353
</Dependency>
54-
<Dependency Name="Microsoft.iOS.Sdk.net10.0_26.5" Version="26.5.10315">
54+
<Dependency Name="Microsoft.iOS.Sdk.net10.0_26.5" Version="26.5.10320">
5555
<Uri>https://github.com/dotnet/macios</Uri>
56-
<Sha>ac895e19154cd3305df029b18849b2e5ed98e036</Sha>
56+
<Sha>bfdc82e54e6110c626149b1486dd8b9eedf2b1fd</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.tvOS.Sdk.net10.0_26.5" Version="26.5.10315">
58+
<Dependency Name="Microsoft.tvOS.Sdk.net10.0_26.5" Version="26.5.10320">
5959
<Uri>https://github.com/dotnet/macios</Uri>
60-
<Sha>ac895e19154cd3305df029b18849b2e5ed98e036</Sha>
60+
<Sha>bfdc82e54e6110c626149b1486dd8b9eedf2b1fd</Sha>
6161
</Dependency>
6262
<!-- This is a subscription of the .NET 10/Xcode 27.0 versions of our packages -->
63-
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_27.0" Version="27.0.10241-xcode27.0">
63+
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_27.0" Version="27.0.10543-xcode27.0">
6464
<Uri>https://github.com/dotnet/macios</Uri>
65-
<Sha>6807aae9f1f542afdcca3552940930793cb9ae7f</Sha>
65+
<Sha>2177667f5e6133d7f30079e43cbc7cdfd9027d7a</Sha>
6666
</Dependency>
67-
<Dependency Name="Microsoft.macOS.Sdk.net10.0_27.0" Version="27.0.10241-xcode27.0">
67+
<Dependency Name="Microsoft.macOS.Sdk.net10.0_27.0" Version="27.0.10543-xcode27.0">
6868
<Uri>https://github.com/dotnet/macios</Uri>
69-
<Sha>6807aae9f1f542afdcca3552940930793cb9ae7f</Sha>
69+
<Sha>2177667f5e6133d7f30079e43cbc7cdfd9027d7a</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.iOS.Sdk.net10.0_27.0" Version="27.0.10241-xcode27.0">
71+
<Dependency Name="Microsoft.iOS.Sdk.net10.0_27.0" Version="27.0.10543-xcode27.0">
7272
<Uri>https://github.com/dotnet/macios</Uri>
73-
<Sha>6807aae9f1f542afdcca3552940930793cb9ae7f</Sha>
73+
<Sha>2177667f5e6133d7f30079e43cbc7cdfd9027d7a</Sha>
7474
</Dependency>
75-
<Dependency Name="Microsoft.tvOS.Sdk.net10.0_27.0" Version="27.0.10241-xcode27.0">
75+
<Dependency Name="Microsoft.tvOS.Sdk.net10.0_27.0" Version="27.0.10543-xcode27.0">
7676
<Uri>https://github.com/dotnet/macios</Uri>
77-
<Sha>6807aae9f1f542afdcca3552940930793cb9ae7f</Sha>
77+
<Sha>2177667f5e6133d7f30079e43cbc7cdfd9027d7a</Sha>
7878
</Dependency>
7979
</ProductDependencies>
8080
<ToolsetDependencies>
81-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26426.102">
81+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26452.102">
8282
<Uri>https://github.com/dotnet/dotnet</Uri>
83-
<Sha>da377e2093fdde18a0d36429a2644638d07685f6</Sha>
83+
<Sha>ba5fefc87000195d9618a554794c7b0f283290c7</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.26426.102">
85+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.26452.102">
8686
<Uri>https://github.com/dotnet/dotnet</Uri>
87-
<Sha>da377e2093fdde18a0d36429a2644638d07685f6</Sha>
87+
<Sha>ba5fefc87000195d9618a554794c7b0f283290c7</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-rc.2.26426.102">
89+
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-rc.2.26452.102">
9090
<Uri>https://github.com/dotnet/dotnet</Uri>
91-
<Sha>da377e2093fdde18a0d36429a2644638d07685f6</Sha>
91+
<Sha>ba5fefc87000195d9618a554794c7b0f283290c7</Sha>
9292
</Dependency>
9393
<Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="11.0.0-prerelease.26451.1">
9494
<Uri>https://github.com/dotnet/xharness</Uri>
9595
<Sha>1fc9369e393e63fa8760afb30d2fcc596bb799bf</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26426.102">
97+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26452.102">
9898
<Uri>https://github.com/dotnet/dotnet</Uri>
99-
<Sha>da377e2093fdde18a0d36429a2644638d07685f6</Sha>
99+
<Sha>ba5fefc87000195d9618a554794c7b0f283290c7</Sha>
100100
<SourceBuild RepoName="arcade" ManagedOnly="true" />
101101
</Dependency>
102102
</ToolsetDependencies>

‎eng/common/Get-GitHubAppToken.ps1‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,19 +110,20 @@ $headers = @{
110110

111111
Write-Host "Looking up installation for '$InstallationOwner'..."
112112
try {
113-
$installations = @()
113+
$installations = [System.Collections.Generic.List[object]]::new()
114114
$page = 1
115115
do {
116-
# Assign the response before wrapping it in @(). PowerShell otherwise
117-
# preserves a top-level JSON array as one nested pipeline object.
118116
$pageResponse = Invoke-RestMethod `
119117
-Uri "https://api.github.com/app/installations?per_page=100&page=$page" `
120118
-Headers $headers `
121119
-Method Get
122-
$pageInstallations = @($pageResponse)
123-
$installations += $pageInstallations
120+
$pageInstallationCount = 0
121+
foreach ($installation in $pageResponse) {
122+
$installations.Add($installation)
123+
$pageInstallationCount++
124+
}
124125
$page++
125-
} while ($pageInstallations.Count -eq 100)
126+
} while ($pageInstallationCount -eq 100)
126127
}
127128
catch {
128129
Write-PipelineTelemetryError -Category 'Build' -Message "Failed to list GitHub App installations: $_. The signed JWT may be invalid or the App's Client ID ('$AppClientId') may be incorrect."

‎eng/common/core-templates/job/helix-job-monitor.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,12 @@ parameters:
6262
type: number
6363
default: 30
6464

65+
# Maximum number of work items whose results may be downloaded, parsed, and
66+
# uploaded concurrently.
67+
- name: testResultUploadParallelism
68+
type: number
69+
default: 48
70+
6571
# When 'true' (the default), Helix work items that exit 0 but have failed AzDO test results
6672
# are treated as failed: they count toward the monitor's exit code and are resubmitted by a
6773
# later invocation's retry pass. Set to 'false' to fall back to exit-code-only outcomes.
@@ -215,6 +221,8 @@ jobs:
215221
--max-wait-minutes "$((${{ parameters.timeoutInMinutes }} - 5))" # Set the tool's timeout slightly lower than the Azure DevOps job timeout to allow it to exit gracefully.
216222
--stage-name '$(System.StageName)'
217223
--stage-attempt '$(System.StageAttempt)'
224+
--job-attempt '$(System.JobAttempt)'
225+
--test-result-upload-parallelism '${{ parameters.testResultUploadParallelism }}'
218226
)
219227
220228
organization='${{ parameters.organization }}'

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"sdk": {
3-
"version": "11.0.100-rc.2.26426.102",
3+
"version": "11.0.100-rc.2.26452.102",
44
"paths": [
55
"builds/downloads/dotnet",
66
"$host$"
77
],
88
"errorMessage": "The .NET SDK could not be found, please run 'make dotnet -C builds'."
99
},
1010
"tools": {
11-
"dotnet": "11.0.100-rc.2.26426.102"
11+
"dotnet": "11.0.100-rc.2.26452.102"
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26426.102"
14+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26452.102"
1515
}
1616
}

0 commit comments

Comments
 (0)