Skip to content

Commit 0fe6f36

Browse files
dotnet-maestro[bot]CopilotwtgodbeWill GodbeCopilot
authored
[release/11.0-preview7] Source code updates from dotnet/dotnet (#38703)
* Backflow from https://github.com/dotnet/dotnet / 7bcb900 build 324583 Diff: https://github.com/dotnet/dotnet/compare/dadfb24164945e42d8fda33324ddf87b99b7686d..7bcb9009c40399c9073e7db938250486229cc85d From: dotnet/dotnet@dadfb24 To: dotnet/dotnet@7bcb900 [[ commit created by automation ]] * Update dependencies from build 324583 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.26365.101 -> 11.0.0-beta.26376.106) Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Logging, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Formats.Asn1, System.Runtime.Caching, System.Text.Encodings.Web, System.Text.Json (Version 11.0.0-preview.7.26365.101 -> 11.0.0-preview.7.26376.106) [[ commit created by automation ]] * Fix union model validator tests for new union shape Co-authored-by: wtgodbe <14283640+wtgodbe@users.noreply.github.com> * Update union model validator tests for .NET 11 preview behavior Co-authored-by: wtgodbe <14283640+wtgodbe@users.noreply.github.com> * Update dependencies from build 324662 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.26376.106 -> 11.0.0-beta.26377.110) Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Logging, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Formats.Asn1, System.Runtime.Caching, System.Text.Encodings.Web, System.Text.Json (Version 11.0.0-preview.7.26376.106 -> 11.0.0-preview.7.26377.110) [[ commit created by automation ]] * Update dependencies from build 324774 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.26377.110 -> 11.0.0-beta.26378.106) Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Logging, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Formats.Asn1, System.Runtime.Caching, System.Text.Encodings.Web, System.Text.Json (Version 11.0.0-preview.7.26377.110 -> 11.0.0-preview.7.26378.106) [[ commit created by automation ]] * Revert "Update union model validator tests for .NET 11 preview behavior" This reverts commit 22b6fc6. * Revert "Fix union model validator tests for new union shape" This reverts commit 26b6058. * Fix union type detection after C# union types became value types The C# preview "union" language feature now compiles union declarations (e.g. union UnionEntity(int);) as value types (structs implementing System.Runtime.CompilerServices.IUnion), rather than reference types. This broke the existing detection of union types mapped as entity or complex types added in #38398: - SharedTypeExtensions.IsValidEntityType required IsClass: true, so EntityType's constructor now threw a generic ArgumentException ("must be a non-interface reference type") as soon as a union type was added to the model, before ModelValidator ever got a chance to detect it and produce the specific UnionTypeNotSupported message. - ConstructorBindingConvention (an IModelFinalizingConvention that runs during FinalizeModel, before ModelValidator.Validate) attempted to bind a constructor for union types used as complex properties, throwing "No suitable constructor was found" before the model validator's union check was reached. Fix: - IsValidEntityType now also accepts union types (mirroring IsValidComplexType, which already allowed them), so union entity types can still be added to the model and are rejected later, with the intended friendly error message, by ModelValidator. - ConstructorBindingConvention now skips constructor binding for union entity/complex types, since they can never have a meaningful constructor binding, allowing model finalization to proceed to ModelValidator.Validate where the specific union error is thrown. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: wtgodbe <14283640+wtgodbe@users.noreply.github.com> Co-authored-by: Will Godbe <willgodbe@Wills-MacBook-Pro.local> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 1969ac3 commit 0fe6f36

17 files changed

Lines changed: 250 additions & 91 deletions

File tree

‎eng/Version.Details.props‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet-dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26365.101</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26365.101</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11-
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26365.101</MicrosoftDotNetHelixSdkPackageVersion>
12-
<MicrosoftExtensionsCachingMemoryPackageVersion>11.0.0-preview.7.26365.101</MicrosoftExtensionsCachingMemoryPackageVersion>
13-
<MicrosoftExtensionsConfigurationPackageVersion>11.0.0-preview.7.26365.101</MicrosoftExtensionsConfigurationPackageVersion>
14-
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>11.0.0-preview.7.26365.101</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
15-
<MicrosoftExtensionsConfigurationJsonPackageVersion>11.0.0-preview.7.26365.101</MicrosoftExtensionsConfigurationJsonPackageVersion>
16-
<MicrosoftExtensionsDependencyInjectionPackageVersion>11.0.0-preview.7.26365.101</MicrosoftExtensionsDependencyInjectionPackageVersion>
17-
<MicrosoftExtensionsDependencyModelPackageVersion>11.0.0-preview.7.26365.101</MicrosoftExtensionsDependencyModelPackageVersion>
18-
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>11.0.0-preview.7.26365.101</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
19-
<MicrosoftExtensionsLoggingPackageVersion>11.0.0-preview.7.26365.101</MicrosoftExtensionsLoggingPackageVersion>
20-
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.7.26365.101</MicrosoftNETCoreAppRefPackageVersion>
21-
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-preview.7.26365.101</MicrosoftNETCorePlatformsPackageVersion>
22-
<SystemFormatsAsn1PackageVersion>11.0.0-preview.7.26365.101</SystemFormatsAsn1PackageVersion>
23-
<SystemRuntimeCachingPackageVersion>11.0.0-preview.7.26365.101</SystemRuntimeCachingPackageVersion>
24-
<SystemTextEncodingsWebPackageVersion>11.0.0-preview.7.26365.101</SystemTextEncodingsWebPackageVersion>
25-
<SystemTextJsonPackageVersion>11.0.0-preview.7.26365.101</SystemTextJsonPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26378.106</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26378.106</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
11+
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26378.106</MicrosoftDotNetHelixSdkPackageVersion>
12+
<MicrosoftExtensionsCachingMemoryPackageVersion>11.0.0-preview.7.26378.106</MicrosoftExtensionsCachingMemoryPackageVersion>
13+
<MicrosoftExtensionsConfigurationPackageVersion>11.0.0-preview.7.26378.106</MicrosoftExtensionsConfigurationPackageVersion>
14+
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>11.0.0-preview.7.26378.106</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
15+
<MicrosoftExtensionsConfigurationJsonPackageVersion>11.0.0-preview.7.26378.106</MicrosoftExtensionsConfigurationJsonPackageVersion>
16+
<MicrosoftExtensionsDependencyInjectionPackageVersion>11.0.0-preview.7.26378.106</MicrosoftExtensionsDependencyInjectionPackageVersion>
17+
<MicrosoftExtensionsDependencyModelPackageVersion>11.0.0-preview.7.26378.106</MicrosoftExtensionsDependencyModelPackageVersion>
18+
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>11.0.0-preview.7.26378.106</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
19+
<MicrosoftExtensionsLoggingPackageVersion>11.0.0-preview.7.26378.106</MicrosoftExtensionsLoggingPackageVersion>
20+
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.7.26378.106</MicrosoftNETCoreAppRefPackageVersion>
21+
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-preview.7.26378.106</MicrosoftNETCorePlatformsPackageVersion>
22+
<SystemFormatsAsn1PackageVersion>11.0.0-preview.7.26378.106</SystemFormatsAsn1PackageVersion>
23+
<SystemRuntimeCachingPackageVersion>11.0.0-preview.7.26378.106</SystemRuntimeCachingPackageVersion>
24+
<SystemTextEncodingsWebPackageVersion>11.0.0-preview.7.26378.106</SystemTextEncodingsWebPackageVersion>
25+
<SystemTextJsonPackageVersion>11.0.0-preview.7.26378.106</SystemTextJsonPackageVersion>
2626
</PropertyGroup>
2727
<!--Property group for alternate package version names-->
2828
<PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,76 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="cb8306a63c5cf24e9381108a3a9eb58907fd0f60" BarId="323048" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="ab4a9a5f25db0b29e980a7acfab46bc4eca924c3" BarId="324774" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="11.0.0-preview.7.26365.101">
5+
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="11.0.0-preview.7.26378.106">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>cb8306a63c5cf24e9381108a3a9eb58907fd0f60</Sha>
7+
<Sha>ab4a9a5f25db0b29e980a7acfab46bc4eca924c3</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="11.0.0-preview.7.26365.101">
9+
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="11.0.0-preview.7.26378.106">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>cb8306a63c5cf24e9381108a3a9eb58907fd0f60</Sha>
11+
<Sha>ab4a9a5f25db0b29e980a7acfab46bc4eca924c3</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="11.0.0-preview.7.26365.101">
13+
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="11.0.0-preview.7.26378.106">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>cb8306a63c5cf24e9381108a3a9eb58907fd0f60</Sha>
15+
<Sha>ab4a9a5f25db0b29e980a7acfab46bc4eca924c3</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.Extensions.Configuration" Version="11.0.0-preview.7.26365.101">
17+
<Dependency Name="Microsoft.Extensions.Configuration" Version="11.0.0-preview.7.26378.106">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>cb8306a63c5cf24e9381108a3a9eb58907fd0f60</Sha>
19+
<Sha>ab4a9a5f25db0b29e980a7acfab46bc4eca924c3</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="11.0.0-preview.7.26365.101">
21+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="11.0.0-preview.7.26378.106">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>cb8306a63c5cf24e9381108a3a9eb58907fd0f60</Sha>
23+
<Sha>ab4a9a5f25db0b29e980a7acfab46bc4eca924c3</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="11.0.0-preview.7.26365.101">
25+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="11.0.0-preview.7.26378.106">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>cb8306a63c5cf24e9381108a3a9eb58907fd0f60</Sha>
27+
<Sha>ab4a9a5f25db0b29e980a7acfab46bc4eca924c3</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="11.0.0-preview.7.26365.101">
29+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="11.0.0-preview.7.26378.106">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>cb8306a63c5cf24e9381108a3a9eb58907fd0f60</Sha>
31+
<Sha>ab4a9a5f25db0b29e980a7acfab46bc4eca924c3</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.Extensions.Logging" Version="11.0.0-preview.7.26365.101">
33+
<Dependency Name="Microsoft.Extensions.Logging" Version="11.0.0-preview.7.26378.106">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>cb8306a63c5cf24e9381108a3a9eb58907fd0f60</Sha>
35+
<Sha>ab4a9a5f25db0b29e980a7acfab46bc4eca924c3</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.7.26365.101">
37+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.7.26378.106">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>cb8306a63c5cf24e9381108a3a9eb58907fd0f60</Sha>
39+
<Sha>ab4a9a5f25db0b29e980a7acfab46bc4eca924c3</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-preview.7.26365.101">
41+
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-preview.7.26378.106">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>cb8306a63c5cf24e9381108a3a9eb58907fd0f60</Sha>
43+
<Sha>ab4a9a5f25db0b29e980a7acfab46bc4eca924c3</Sha>
4444
</Dependency>
45-
<Dependency Name="System.Text.Json" Version="11.0.0-preview.7.26365.101">
45+
<Dependency Name="System.Text.Json" Version="11.0.0-preview.7.26378.106">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>cb8306a63c5cf24e9381108a3a9eb58907fd0f60</Sha>
47+
<Sha>ab4a9a5f25db0b29e980a7acfab46bc4eca924c3</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Text.Encodings.Web" Version="11.0.0-preview.7.26365.101">
49+
<Dependency Name="System.Text.Encodings.Web" Version="11.0.0-preview.7.26378.106">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>cb8306a63c5cf24e9381108a3a9eb58907fd0f60</Sha>
51+
<Sha>ab4a9a5f25db0b29e980a7acfab46bc4eca924c3</Sha>
5252
</Dependency>
53-
<Dependency Name="System.Formats.Asn1" Version="11.0.0-preview.7.26365.101">
53+
<Dependency Name="System.Formats.Asn1" Version="11.0.0-preview.7.26378.106">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>cb8306a63c5cf24e9381108a3a9eb58907fd0f60</Sha>
55+
<Sha>ab4a9a5f25db0b29e980a7acfab46bc4eca924c3</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Runtime.Caching" Version="11.0.0-preview.7.26365.101">
57+
<Dependency Name="System.Runtime.Caching" Version="11.0.0-preview.7.26378.106">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>cb8306a63c5cf24e9381108a3a9eb58907fd0f60</Sha>
59+
<Sha>ab4a9a5f25db0b29e980a7acfab46bc4eca924c3</Sha>
6060
</Dependency>
6161
</ProductDependencies>
6262
<ToolsetDependencies>
63-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26365.101">
63+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26378.106">
6464
<Uri>https://github.com/dotnet/dotnet</Uri>
65-
<Sha>cb8306a63c5cf24e9381108a3a9eb58907fd0f60</Sha>
65+
<Sha>ab4a9a5f25db0b29e980a7acfab46bc4eca924c3</Sha>
6666
</Dependency>
67-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26365.101">
67+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26378.106">
6868
<Uri>https://github.com/dotnet/dotnet</Uri>
69-
<Sha>cb8306a63c5cf24e9381108a3a9eb58907fd0f60</Sha>
69+
<Sha>ab4a9a5f25db0b29e980a7acfab46bc4eca924c3</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26365.101">
71+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26378.106">
7272
<Uri>https://github.com/dotnet/dotnet</Uri>
73-
<Sha>cb8306a63c5cf24e9381108a3a9eb58907fd0f60</Sha>
73+
<Sha>ab4a9a5f25db0b29e980a7acfab46bc4eca924c3</Sha>
7474
</Dependency>
7575
</ToolsetDependencies>
7676
</Dependencies>

‎eng/common/build.ps1‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Param(
2323
[switch] $clean,
2424
[switch][Alias('pb')]$productBuild,
2525
[switch]$fromVMR,
26+
[switch]$disablePipelineSetResult,
2627
[switch][Alias('bl')]$binaryLog,
2728
[string][Alias('bln')]$binaryLogName = '',
2829
[switch][Alias('nobl')]$excludeCIBinarylog,
@@ -80,6 +81,7 @@ function Print-Usage() {
8081
Write-Host " -nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
8182
Write-Host " -buildCheck Sets /check msbuild parameter"
8283
Write-Host " -fromVMR Set when building from within the VMR"
84+
Write-Host " -disablePipelineSetResult Set to disable masking the actual exit code in the pipeline when the build fails"
8385
Write-Host ""
8486

8587
Write-Host "Command line arguments not listed above are passed thru to msbuild."

‎eng/common/build.sh‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,14 @@ usage()
4040
echo " --projects <value> Project or solution file(s) to build"
4141
echo " --ci Set when running on CI server"
4242
echo " --excludeCIBinarylog Don't output binary log (short: -nobl)"
43+
echo " --pipelinesLog Promote msbuild errors/warnings to Azure Pipelines timeline issues; defaults to on in CI (short: -pl)"
4344
echo " --prepareMachine Prepare machine for CI run, clean up processes after build"
4445
echo " --nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
4546
echo " --warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
4647
echo " --warnNotAsError <value> Sets a semi-colon delimited list of warning codes that should not be treated as errors"
4748
echo " --buildCheck <value> Sets /check msbuild parameter"
4849
echo " --fromVMR Set when building from within the VMR"
50+
echo " --disablePipelineSetResult Set to disable masking the actual exit code in the pipeline when the build fails"
4951
echo ""
5052
echo "Command line arguments not listed above are passed thru to msbuild."
5153
echo "Arguments can also be passed in with a single hyphen."
@@ -68,6 +70,7 @@ build=false
6870
source_build=false
6971
product_build=false
7072
from_vmr=false
73+
disable_pipeline_set_result=false
7174
rebuild=false
7275
test=false
7376
integration_test=false
@@ -86,6 +89,7 @@ build_check=false
8689
binary_log=false
8790
binary_log_name=''
8891
exclude_ci_binary_log=false
92+
pipelines_log=false
8993

9094
projects=''
9195
configuration=''
@@ -124,6 +128,9 @@ while [[ $# -gt 0 ]]; do
124128
-excludecibinarylog|-nobl)
125129
exclude_ci_binary_log=true
126130
;;
131+
-pipelineslog|-pl)
132+
pipelines_log=true
133+
;;
127134
-restore|-r)
128135
restore=true
129136
;;
@@ -152,6 +159,9 @@ while [[ $# -gt 0 ]]; do
152159
-fromvmr|-from-vmr)
153160
from_vmr=true
154161
;;
162+
-disablepipelinesetresult|-disable-pipeline-set-result)
163+
disable_pipeline_set_result=true
164+
;;
155165
-test|-t)
156166
test=true
157167
;;
@@ -213,6 +223,7 @@ if [[ -z "$configuration" ]]; then
213223
fi
214224

215225
if [[ "$ci" == true ]]; then
226+
pipelines_log=true
216227
# Disable node reuse on CI unless explicitly opted in via MSBUILD_NODEREUSE_ENABLED.
217228
# Internal testing only; this env var will be replaced with a switch (https://github.com/dotnet/arcade/issues/17013) and must not be depended on.
218229
if [[ "${MSBUILD_NODEREUSE_ENABLED:-}" != "1" ]]; then

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

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,14 @@ parameters:
6565
type: boolean
6666
default: true
6767

68+
# When true, test results are reported to Azure DevOps using the fully qualified test name
69+
# (Namespace.Type.Method) as the stable automatedTestName and the visible title is qualified as
70+
# well (--use-fully-qualified-test-name). Opt-in because it changes AzDO test identity and display;
71+
# primarily useful for frameworks like MSTest whose display name is only the method name.
72+
- name: useFullyQualifiedTestName
73+
type: boolean
74+
default: false
75+
6876
# Advanced: optional pipeline artifact (produced earlier in this run) that contains the tool
6977
# nupkg. When set, the artifact is downloaded and the tool is installed from the nupkg into
7078
# a local tool-path; this bypasses the repo's .config/dotnet-tools.json manifest and is
@@ -176,11 +184,12 @@ jobs:
176184
set -euo pipefail
177185
178186
toolArgs=(
179-
--helix-base-uri '${{ parameters.helixBaseUri }}'
180-
--polling-interval-seconds '${{ parameters.pollingIntervalSeconds }}'
181-
--fail-on-failed-tests '${{ parameters.failWorkItemsWithFailedTests }}'
182-
--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.
183-
--stage-name '$(System.StageName)'
187+
--helix-base-uri '${{ parameters.helixBaseUri }}'
188+
--polling-interval-seconds '${{ parameters.pollingIntervalSeconds }}'
189+
--fail-on-failed-tests '${{ parameters.failWorkItemsWithFailedTests }}'
190+
--use-fully-qualified-test-name '${{ parameters.useFullyQualifiedTestName }}'
191+
--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.
192+
--stage-name '$(System.StageName)'
184193
)
185194
186195
organization='${{ parameters.organization }}'

‎eng/common/core-templates/job/onelocbuild.yml‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ parameters:
88
CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
99
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
1010

11+
# Service connection for WIF-based Entra authentication to ceapex feeds (replaces CeapexPat).
12+
# When set, dnceng/internal builds acquire a federated Entra token instead of using a PAT.
13+
# All other projects (e.g. DevDiv, public), where this dnceng-scoped service connection does not
14+
# exist, and any pipeline that sets this to '' fall back to PAT-based auth via the CeapexPat parameter.
15+
CeapexServiceConnection: 'dnceng-onelocbuild-ceapex'
16+
1117
SourcesDirectory: $(System.DefaultWorkingDirectory)
1218
CreatePr: true
1319
AutoCompletePr: false
@@ -74,6 +80,15 @@ jobs:
7480
displayName: Generate LocProject.json
7581
condition: ${{ parameters.condition }}
7682

83+
# Acquire an Entra token for ceapex feed access via WIF (dnceng/internal only).
84+
# All other projects use PAT-based auth, since the ceapex service connection is scoped to dnceng/internal.
85+
- ${{ if and(ne(parameters.CeapexServiceConnection, ''), eq(variables['System.TeamProject'], 'internal')) }}:
86+
- template: /eng/common/templates/steps/get-federated-access-token.yml
87+
parameters:
88+
federatedServiceConnection: ${{ parameters.CeapexServiceConnection }}
89+
outputVariableName: 'CeapexEntraToken'
90+
condition: ${{ parameters.condition }}
91+
7792
- task: OneLocBuild@2
7893
displayName: OneLocBuild
7994
env:
@@ -89,7 +104,10 @@ jobs:
89104
isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }}
90105
isShouldReusePrSelected: ${{ parameters.ReusePr }}
91106
packageSourceAuth: patAuth
92-
patVariable: ${{ parameters.CeapexPat }}
107+
${{ if and(ne(parameters.CeapexServiceConnection, ''), eq(variables['System.TeamProject'], 'internal')) }}:
108+
patVariable: $(CeapexEntraToken)
109+
${{ if or(eq(parameters.CeapexServiceConnection, ''), ne(variables['System.TeamProject'], 'internal')) }}:
110+
patVariable: ${{ parameters.CeapexPat }}
93111
${{ if eq(parameters.RepoType, 'gitHub') }}:
94112
repoType: ${{ parameters.RepoType }}
95113
gitHubPatVariable: "${{ parameters.GithubPat }}"

‎eng/common/cross/build-rootfs.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,9 +453,12 @@ case "$__AlpineVersion" in
453453
elif [[ "$__AlpineArch" == "x86" ]]; then
454454
__AlpineVersion=3.17 # minimum version that supports lldb-dev
455455
__AlpinePackages+=" llvm15-libs"
456-
elif [[ "$__AlpineArch" == "riscv64" || "$__AlpineArch" == "loongarch64" ]]; then
456+
elif [[ "$__AlpineArch" == "loongarch64" ]]; then
457457
__AlpineVersion=3.21 # minimum version that supports lldb-dev
458458
__AlpinePackages+=" llvm19-libs"
459+
elif [[ "$__AlpineArch" == "riscv64" ]]; then
460+
__AlpineVersion=3.22 # lldb-dev requires 3.21+, but 3.22+ provides the newer linux-headers needed for RISC-V extension probes
461+
__AlpinePackages+=" llvm20-libs"
459462
elif [[ -n "$__AlpineMajorVersion" ]]; then
460463
# use whichever alpine version is provided and select the latest toolchain libs
461464
__AlpineLlvmLibsLookup=1

‎eng/common/cross/toolchain.cmake‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ elseif(TARGET_ARCH_NAME STREQUAL "ppc64le")
8787
set(CMAKE_SYSTEM_PROCESSOR ppc64le)
8888
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/powerpc64le-alpine-linux-musl)
8989
set(TOOLCHAIN "powerpc64le-alpine-linux-musl")
90+
elseif(FREEBSD)
91+
set(TOOLCHAIN "powerpc64le-unknown-freebsd14")
9092
else()
9193
set(TOOLCHAIN "powerpc64le-linux-gnu")
9294
endif()

0 commit comments

Comments
 (0)