Skip to content

Commit 6ba3c78

Browse files
rolfbjarnerolfbjarne
authored
[xcode16] Merge main into xcode16. (#21158)
2 parents bfbfa70 + a26a7fd commit 6ba3c78

34 files changed

+1023
-442
lines changed

‎Make.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ PACKAGE_HEAD_REV=$(shell git rev-parse HEAD)
5959
ifneq ($(BUILD_SOURCEBRANCH),)
6060
# BUILD_SOURCEBRANCH is set in Azure DevOps, so use that value if it exists
6161
# it seems to always start with refs/heads/, so strip off that first.
62-
CURRENT_BRANCH:=$(subst refs/heads,,${BUILD_SOURCEBRANCH})
62+
CURRENT_BRANCH:=$(subst refs/heads/,,${BUILD_SOURCEBRANCH})
6363
else ifeq ($(BRANCH_NAME),)
6464
# BRANCH_NAME is set in Jenkins, so this is for local builds.
6565
CURRENT_BRANCH:=$(shell git rev-parse --abbrev-ref HEAD)

‎NuGet.config

+16-25
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,23 @@
1010
<clear />
1111
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1212
<!-- Begin: Package sources from dotnet-emsdk -->
13-
<add key="darc-pub-dotnet-emsdk-a64772f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5/nuget/v3/index.json" />
14-
<add key="darc-pub-dotnet-emsdk-a64772f-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5-5/nuget/v3/index.json" />
15-
<add key="darc-pub-dotnet-emsdk-a64772f-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5-3/nuget/v3/index.json" />
16-
<add key="darc-pub-dotnet-emsdk-a64772f-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5-2/nuget/v3/index.json" />
17-
<add key="darc-pub-dotnet-emsdk-a64772f-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5-1/nuget/v3/index.json" />
13+
<add key="darc-pub-dotnet-emsdk-e92f92e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef/nuget/v3/index.json" />
14+
<add key="darc-pub-dotnet-emsdk-e92f92e-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-9/nuget/v3/index.json" />
15+
<add key="darc-pub-dotnet-emsdk-e92f92e-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-8/nuget/v3/index.json" />
16+
<add key="darc-pub-dotnet-emsdk-e92f92e-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-7/nuget/v3/index.json" />
17+
<add key="darc-pub-dotnet-emsdk-e92f92e-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-6/nuget/v3/index.json" />
18+
<add key="darc-pub-dotnet-emsdk-e92f92e-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-5/nuget/v3/index.json" />
19+
<add key="darc-pub-dotnet-emsdk-e92f92e-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-4/nuget/v3/index.json" />
20+
<add key="darc-pub-dotnet-emsdk-e92f92e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-3/nuget/v3/index.json" />
21+
<add key="darc-pub-dotnet-emsdk-e92f92e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-2/nuget/v3/index.json" />
22+
<add key="darc-pub-dotnet-emsdk-e92f92e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-1/nuget/v3/index.json" />
1823
<!-- End: Package sources from dotnet-emsdk -->
1924
<!-- Begin: Package sources from dotnet-aspnetcore -->
20-
<add key="darc-int-dotnet-aspnetcore-2f1db20" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2f1db204/nuget/v3/index.json" />
21-
<add key="darc-int-dotnet-aspnetcore-2f1db20-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2f1db204-5/nuget/v3/index.json" />
22-
<add key="darc-int-dotnet-aspnetcore-2f1db20-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2f1db204-3/nuget/v3/index.json" />
23-
<add key="darc-int-dotnet-aspnetcore-2f1db20-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2f1db204-2/nuget/v3/index.json" />
24-
<add key="darc-int-dotnet-aspnetcore-2f1db20-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2f1db204-1/nuget/v3/index.json" />
25+
<add key="darc-int-dotnet-aspnetcore-954f61d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-954f61dd/nuget/v3/index.json" />
26+
<add key="darc-int-dotnet-aspnetcore-954f61d-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-954f61dd-8/nuget/v3/index.json" />
2527
<!-- End: Package sources from dotnet-aspnetcore -->
2628
<!-- Begin: Package sources from dotnet-runtime -->
27-
<add key="darc-int-dotnet-runtime-2aade6b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be/nuget/v3/index.json" />
28-
<add key="darc-int-dotnet-runtime-2aade6b-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-5/nuget/v3/index.json" />
29-
<add key="darc-int-dotnet-runtime-2aade6b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-3/nuget/v3/index.json" />
30-
<add key="darc-int-dotnet-runtime-2aade6b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-2/nuget/v3/index.json" />
31-
<add key="darc-int-dotnet-runtime-2aade6b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-1/nuget/v3/index.json" />
29+
<add key="darc-int-dotnet-runtime-08338fc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-08338fca/nuget/v3/index.json" />
3230
<!-- End: Package sources from dotnet-runtime -->
3331
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3432
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />
@@ -71,18 +69,11 @@
7169
<clear />
7270
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
7371
<!-- Begin: Package sources from dotnet-runtime -->
74-
<add key="darc-int-dotnet-runtime-2aade6b-1" value="true" />
75-
<add key="darc-int-dotnet-runtime-2aade6b-2" value="true" />
76-
<add key="darc-int-dotnet-runtime-2aade6b-3" value="true" />
77-
<add key="darc-int-dotnet-runtime-2aade6b-5" value="true" />
78-
<add key="darc-int-dotnet-runtime-2aade6b" value="true" />
72+
<add key="darc-int-dotnet-runtime-08338fc" value="true" />
7973
<!-- End: Package sources from dotnet-runtime -->
8074
<!-- Begin: Package sources from dotnet-aspnetcore -->
81-
<add key="darc-int-dotnet-aspnetcore-2f1db20-1" value="true" />
82-
<add key="darc-int-dotnet-aspnetcore-2f1db20-2" value="true" />
83-
<add key="darc-int-dotnet-aspnetcore-2f1db20-3" value="true" />
84-
<add key="darc-int-dotnet-aspnetcore-2f1db20-5" value="true" />
85-
<add key="darc-int-dotnet-aspnetcore-2f1db20" value="true" />
75+
<add key="darc-int-dotnet-aspnetcore-954f61d-8" value="true" />
76+
<add key="darc-int-dotnet-aspnetcore-954f61d" value="true" />
8677
<!-- End: Package sources from dotnet-aspnetcore -->
8778
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
8879
</disabledPackageSources>

‎eng/Version.Details.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.109-servicing.24407.6">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.109-servicing.24419.10">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>dc7a330f651df44966b2630e039ba67ac74f6482</Sha>
5+
<Sha>6e9002c2efcfc09687feca31864ebc987c3c9ec8</Sha>
66
</Dependency>
77
<Dependency Name="Microsoft.NET.ILLink" Version="8.0.0-rtm.23524.7">
88
<Uri>https://github.com/dotnet/runtime</Uri>
99
<Sha>59edaad404d1b8e47080015ae8d0787f94c970df</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.7" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
11+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
1212
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
13-
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
13+
<Sha>08338fcaa5c9b9a8190abb99222fed12aaba956c</Sha>
1414
</Dependency>
1515
<!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if removing the CoherentParentDependency on Microsoft.Dotnet.Sdk.Internal -->
16-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.7" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
16+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
18-
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
18+
<Sha>08338fcaa5c9b9a8190abb99222fed12aaba956c</Sha>
1919
</Dependency>
2020
<!-- This is required for our test apps to build; in some cases Microsoft.AspNetCore.App is pulled in, and when building test apps the build needs to be able to resolve that -->
21-
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.7" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
21+
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
2222
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
23-
<Sha>2f1db20456007c9515068a35a65afdf99af70bc6</Sha>
23+
<Sha>954f61dd38b33caa2b736c73530bd5a294174437</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.7" CoherentParentDependency="Microsoft.NETCore.App.Ref">
25+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.8" CoherentParentDependency="Microsoft.NETCore.App.Ref">
2626
<Uri>https://github.com/dotnet/emsdk</Uri>
27-
<Sha>a64772f521c578bc9925578b1384d3a08a02d31d</Sha>
27+
<Sha>e92f92efe5854b6fe013787830b59166cb9b4ed9</Sha>
2828
</Dependency>
2929
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23509.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
3030
<Uri>https://github.com/dotnet/cecil</Uri>

‎eng/Versions.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<PropertyGroup>
44
<!-- Versions updated by maestro -->
55
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23509.2</MicrosoftDotNetCecilPackageVersion>
6-
<MicrosoftDotnetSdkInternalPackageVersion>8.0.109-servicing.24407.6</MicrosoftDotnetSdkInternalPackageVersion>
7-
<MicrosoftNETILLinkTasksPackageVersion>8.0.7</MicrosoftNETILLinkTasksPackageVersion>
6+
<MicrosoftDotnetSdkInternalPackageVersion>8.0.109-servicing.24419.10</MicrosoftDotnetSdkInternalPackageVersion>
7+
<MicrosoftNETILLinkTasksPackageVersion>8.0.8</MicrosoftNETILLinkTasksPackageVersion>
88
<MicrosoftNETILLinkPackageVersion>8.0.0-rtm.23524.7</MicrosoftNETILLinkPackageVersion>
99
<MicrosoftDotNetBuildTasksFeedPackageVersion>9.0.0-beta.24408.2</MicrosoftDotNetBuildTasksFeedPackageVersion>
1010
<MicrosoftDotNetSharedFrameworkSdkVersion>8.0.0-beta.24413.2</MicrosoftDotNetSharedFrameworkSdkVersion>
11-
<MicrosoftNETCoreAppRefPackageVersion>8.0.7</MicrosoftNETCoreAppRefPackageVersion>
11+
<MicrosoftNETCoreAppRefPackageVersion>8.0.8</MicrosoftNETCoreAppRefPackageVersion>
1212
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rtm.23511.3</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
1313
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>8.0.0</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
1414
<MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>

‎global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "8.0.109-servicing.24407.6"
3+
"version": "8.0.109-servicing.24419.10"
44
}
55
}

‎mk/quiet.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ MMP_VERBOSITY=-vvvv
8484
MTOUCH_VERBOSITY=-vvvv
8585
DOTNET_PACK_VERBOSITY=
8686
DOTNET_BUILD_VERBOSITY=
87-
DOTNET_WORKLOAD_VERBOSITY=
87+
DOTNET_WORKLOAD_VERBOSITY=--verbosity diagnostic
8888
NUGET_VERBOSITY=
8989
INSTALLER_VERBOSITY=
9090
ZIP_VERBOSITY=

0 commit comments

Comments
 (0)