Skip to content

Commit c125386

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/sdk (#15151)
[main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-alpha.1.22614.1 to 8.0.0-alpha.1.23053.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-alpha.1.22614.1 to 8.0.0-alpha.1.23053.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-alpha.1.22614.1 to 8.0.0-alpha.1.23053.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-alpha.1.22614.1 to 8.0.0-alpha.1.23053.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-alpha.1.22602.3 to 8.0.0-alpha.1.22628.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-alpha.1.22614.1 to 8.0.0-alpha.1.23053.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-alpha.1.22603.1 to 8.0.0-alpha.1.22631.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.FSharp.Compiler: from 12.5.0-beta.22612.4 to 12.5.0-beta.23053.5 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.1-beta.22612.4 to 7.0.1-beta.23053.5 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.5.0-preview-20221214-01 to 17.6.0-preview-20230103-01 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 8.0.100-1.22612.2 to 8.0.100-1.23053.1 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.5.0-2.22613.14 to 4.5.0-3.23053.22 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.5.0-preview-22615-01 to 17.5.0-preview-23054-02 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.5.0-preview.3.130 to 6.5.0-preview.3.136 (parent: Microsoft.NET.Sdk) - Update ProjectBuildTests.cs - Don't crossgen ILLink which is no longer bundled - Merge branch 'main' of https://github.com/dotnet/installer into darc-main-66d586e3-f52b-4957-867f-75cf448ba8b8 - Merge remote-tracking branch 'upstream/darc-main-e0248016-a57a-4ad2-aa0c-03ad8d093d6b' into darc-main-66d586e3-f52b-4957-867f-75cf448ba8b8 - Add SuppressTfmSupportBuildWarnings=true in source-build - Merge branch 'darc-main-66d586e3-f52b-4957-867f-75cf448ba8b8' of https://github.com/dotnet/installer into darc-main-66d586e3-f52b-4957-867f-75cf448ba8b8 - Update GenerateLayout logic to use DotNetBuildFromSourceFlavor vs DotNetBuildOffline - Add CA nowarn workaround - --amend
1 parent b992eff commit c125386

File tree

14 files changed

+173
-176
lines changed

14 files changed

+173
-176
lines changed

‎eng/Version.Details.xml‎

Lines changed: 70 additions & 70 deletions
Large diffs are not rendered by default.

‎eng/Versions.props‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@
2626
</PropertyGroup>
2727
<PropertyGroup>
2828
<!-- Dependency from https://github.com/dotnet/arcade -->
29-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.22612.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
29+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23052.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
3030
</PropertyGroup>
3131
<PropertyGroup>
3232
<!-- Dependency from https://github.com/dotnet/arcade-services -->
3333
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.23053.1</MicrosoftDotNetDarcLibVersion>
3434
</PropertyGroup>
3535
<PropertyGroup>
3636
<!-- Dependency from https://github.com/dotnet/winforms -->
37-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>8.0.0-alpha.1.22602.3</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
37+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>8.0.0-alpha.1.22628.4</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
3838
</PropertyGroup>
3939
<PropertyGroup>
4040
<!-- Dependency from https://github.com/dotnet/wpf -->
41-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>8.0.0-alpha.1.22603.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
41+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>8.0.0-alpha.1.22631.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
4242
</PropertyGroup>
4343
<PropertyGroup>
4444
<!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -58,46 +58,46 @@
5858
</PropertyGroup>
5959
<PropertyGroup>
6060
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
61-
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>8.0.0-alpha.1.22615.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
62-
<MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-alpha.1.22615.1</MicrosoftAspNetCoreAppRefPackageVersion>
63-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.0-alpha.1.22615.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
64-
<VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.0-alpha.1.22615.1</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>
65-
<dotnetdevcertsPackageVersion>8.0.0-alpha.1.22615.1</dotnetdevcertsPackageVersion>
66-
<dotnetuserjwtsPackageVersion>8.0.0-alpha.1.22615.1</dotnetuserjwtsPackageVersion>
67-
<dotnetusersecretsPackageVersion>8.0.0-alpha.1.22615.1</dotnetusersecretsPackageVersion>
61+
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>8.0.0-alpha.1.23053.19</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
62+
<MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-alpha.1.23053.19</MicrosoftAspNetCoreAppRefPackageVersion>
63+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.0-alpha.1.23053.19</MicrosoftAspNetCoreAppRefInternalPackageVersion>
64+
<VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.0-alpha.1.23053.19</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>
65+
<dotnetdevcertsPackageVersion>8.0.0-alpha.1.23053.19</dotnetdevcertsPackageVersion>
66+
<dotnetuserjwtsPackageVersion>8.0.0-alpha.1.23053.19</dotnetuserjwtsPackageVersion>
67+
<dotnetusersecretsPackageVersion>8.0.0-alpha.1.23053.19</dotnetusersecretsPackageVersion>
6868
</PropertyGroup>
6969
<PropertyGroup>
7070
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
7171
</PropertyGroup>
7272
<PropertyGroup>
7373
<!-- Dependencies from https://github.com/dotnet/sdk -->
74-
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-alpha.1.22615.13</MicrosoftDotNetCommonItemTemplatesPackageVersion>
75-
<MicrosoftNETSdkPackageVersion>8.0.100-alpha.1.22615.13</MicrosoftNETSdkPackageVersion>
76-
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-alpha.1.22615.13</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
74+
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-alpha.1.23054.22</MicrosoftDotNetCommonItemTemplatesPackageVersion>
75+
<MicrosoftNETSdkPackageVersion>8.0.100-alpha.1.23054.22</MicrosoftNETSdkPackageVersion>
76+
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-alpha.1.23054.22</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
7777
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
7878
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
7979
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
8080
</PropertyGroup>
8181
<PropertyGroup>
8282
<!-- Dependencies from https://github.com/dotnet/corefx -->
83-
<MicrosoftNETCorePlatformsPackageVersion>8.0.0-alpha.1.22605.1</MicrosoftNETCorePlatformsPackageVersion>
83+
<MicrosoftNETCorePlatformsPackageVersion>8.0.0-alpha.1.23053.7</MicrosoftNETCorePlatformsPackageVersion>
8484
</PropertyGroup>
8585
<PropertyGroup>
8686
<!-- Dependencies from https://github.com/dotnet/core-setup -->
87-
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-alpha.1.22605.1</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
88-
<VSRedistCommonNetCoreTargetingPackx6480PackageVersion>8.0.0-alpha.1.22605.1</VSRedistCommonNetCoreTargetingPackx6480PackageVersion>
89-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-alpha.1.22605.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
90-
<MicrosoftNETCoreAppHostwinx64PackageVersion>8.0.0-alpha.1.22605.1</MicrosoftNETCoreAppHostwinx64PackageVersion>
91-
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.22605.1</MicrosoftNETCoreAppRefPackageVersion>
92-
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-alpha.1.22605.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
87+
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-alpha.1.23053.7</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
88+
<VSRedistCommonNetCoreTargetingPackx6480PackageVersion>8.0.0-alpha.1.23053.7</VSRedistCommonNetCoreTargetingPackx6480PackageVersion>
89+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-alpha.1.23053.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
90+
<MicrosoftNETCoreAppHostwinx64PackageVersion>8.0.0-alpha.1.23053.7</MicrosoftNETCoreAppHostwinx64PackageVersion>
91+
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.23053.7</MicrosoftNETCoreAppRefPackageVersion>
92+
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-alpha.1.23053.7</MicrosoftNETCoreDotNetHostResolverPackageVersion>
9393
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
9494
</PropertyGroup>
9595
<PropertyGroup>
9696
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
97-
<VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>8.0.0-alpha.1.22614.1</VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>
98-
<VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>8.0.0-alpha.1.22614.1</VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>
99-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>8.0.0-alpha.1.22614.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
100-
<MicrosoftWindowsDesktopAppRefPackageVersion>8.0.0-alpha.1.22614.1</MicrosoftWindowsDesktopAppRefPackageVersion>
97+
<VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>8.0.0-alpha.1.23053.1</VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>
98+
<VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>8.0.0-alpha.1.23053.1</VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>
99+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>8.0.0-alpha.1.23053.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
100+
<MicrosoftWindowsDesktopAppRefPackageVersion>8.0.0-alpha.1.23053.1</MicrosoftWindowsDesktopAppRefPackageVersion>
101101
</PropertyGroup>
102102
<PropertyGroup>
103103
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->
@@ -187,7 +187,7 @@
187187
<PropertyGroup>
188188
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
189189
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
190-
<MicrosoftNETTestSdkVersion>17.5.0-preview-20221214-01</MicrosoftNETTestSdkVersion>
190+
<MicrosoftNETTestSdkVersion>17.6.0-preview-20230103-01</MicrosoftNETTestSdkVersion>
191191
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0-alpha.1.22557.12</MicrosoftExtensionsLoggingConsoleVersion>
192192
</PropertyGroup>
193193
<!-- Workload manifest package versions -->

‎eng/common/BuildConfiguration/build-configuration.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"RetryCountLimit": 1,
3+
"RetryByAnyError": false
4+
}

‎eng/common/native/init-compiler.sh‎

Lines changed: 37 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,25 @@
1-
#!/usr/bin/env bash
1+
#!/bin/sh
22
#
33
# This file detects the C/C++ compiler and exports it to the CC/CXX environment variables
44
#
55
# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here!
66

7-
if [[ "$#" -lt 3 ]]; then
7+
if [ -z "$build_arch" ] || [ -z "$compiler" ]; then
88
echo "Usage..."
9-
echo "init-compiler.sh <script directory> <Architecture> <compiler>"
10-
echo "Specify the script directory."
9+
echo "build_arch=<ARCH> compiler=<NAME> init-compiler.sh"
1110
echo "Specify the target architecture."
1211
echo "Specify the name of compiler (clang or gcc)."
1312
exit 1
1413
fi
1514

16-
nativescriptroot="$1"
17-
build_arch="$2"
18-
compiler="$3"
19-
2015
case "$compiler" in
2116
clang*|-clang*|--clang*)
2217
# clangx.y or clang-x.y
2318
version="$(echo "$compiler" | tr -d '[:alpha:]-=')"
24-
parts=(${version//./ })
25-
majorVersion="${parts[0]}"
26-
minorVersion="${parts[1]}"
27-
if [[ -z "$minorVersion" && "$majorVersion" -le 6 ]]; then
19+
majorVersion="${version%%.*}"
20+
[ -z "${version##*.*}" ] && minorVersion="${version#*.}"
21+
22+
if [ -z "$minorVersion" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -le 6 ]; then
2823
minorVersion=0;
2924
fi
3025
compiler=clang
@@ -33,23 +28,20 @@ case "$compiler" in
3328
gcc*|-gcc*|--gcc*)
3429
# gccx.y or gcc-x.y
3530
version="$(echo "$compiler" | tr -d '[:alpha:]-=')"
36-
parts=(${version//./ })
37-
majorVersion="${parts[0]}"
38-
minorVersion="${parts[1]}"
31+
majorVersion="${version%%.*}"
32+
[ -z "${version##*.*}" ] && minorVersion="${version#*.}"
3933
compiler=gcc
4034
;;
4135
esac
4236

4337
cxxCompiler="$compiler++"
4438

45-
. "$nativescriptroot"/../pipeline-logging-functions.sh
46-
4739
# clear the existing CC and CXX from environment
4840
CC=
4941
CXX=
5042
LDFLAGS=
5143

52-
if [[ "$compiler" == "gcc" ]]; then cxxCompiler="g++"; fi
44+
if [ "$compiler" = "gcc" ]; then cxxCompiler="g++"; fi
5345

5446
check_version_exists() {
5547
desired_version=-1
@@ -66,74 +58,75 @@ check_version_exists() {
6658
echo "$desired_version"
6759
}
6860

69-
if [[ -z "$CLR_CC" ]]; then
61+
if [ -z "$CLR_CC" ]; then
7062

7163
# Set default versions
72-
if [[ -z "$majorVersion" ]]; then
64+
if [ -z "$majorVersion" ]; then
7365
# note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
74-
if [[ "$compiler" == "clang" ]]; then versions=( 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
75-
elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi
76-
77-
for version in "${versions[@]}"; do
78-
parts=(${version//./ })
79-
desired_version="$(check_version_exists "${parts[0]}" "${parts[1]}")"
80-
if [[ "$desired_version" != "-1" ]]; then majorVersion="${parts[0]}"; break; fi
66+
if [ "$compiler" = "clang" ]; then versions="15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5"
67+
elif [ "$compiler" = "gcc" ]; then versions="12 11 10 9 8 7 6 5 4.9"; fi
68+
69+
for version in $versions; do
70+
_major="${version%%.*}"
71+
[ -z "${version##*.*}" ] && _minor="${version#*.}"
72+
desired_version="$(check_version_exists "$_major" "$_minor")"
73+
if [ "$desired_version" != "-1" ]; then majorVersion="$_major"; break; fi
8174
done
8275

83-
if [[ -z "$majorVersion" ]]; then
76+
if [ -z "$majorVersion" ]; then
8477
if command -v "$compiler" > /dev/null; then
85-
if [[ "$(uname)" != "Darwin" ]]; then
86-
Write-PipelineTelemetryError -category "Build" -type "warning" "Specific version of $compiler not found, falling back to use the one in PATH."
78+
if [ "$(uname)" != "Darwin" ]; then
79+
echo "Warning: Specific version of $compiler not found, falling back to use the one in PATH."
8780
fi
8881
CC="$(command -v "$compiler")"
8982
CXX="$(command -v "$cxxCompiler")"
9083
else
91-
Write-PipelineTelemetryError -category "Build" "No usable version of $compiler found."
84+
echo "No usable version of $compiler found."
9285
exit 1
9386
fi
9487
else
95-
if [[ "$compiler" == "clang" && "$majorVersion" -lt 5 ]]; then
96-
if [[ "$build_arch" == "arm" || "$build_arch" == "armel" ]]; then
88+
if [ "$compiler" = "clang" ] && [ "$majorVersion" -lt 5 ]; then
89+
if [ "$build_arch" = "arm" ] || [ "$build_arch" = "armel" ]; then
9790
if command -v "$compiler" > /dev/null; then
98-
Write-PipelineTelemetryError -category "Build" -type "warning" "Found clang version $majorVersion which is not supported on arm/armel architectures, falling back to use clang from PATH."
91+
echo "Warning: Found clang version $majorVersion which is not supported on arm/armel architectures, falling back to use clang from PATH."
9992
CC="$(command -v "$compiler")"
10093
CXX="$(command -v "$cxxCompiler")"
10194
else
102-
Write-PipelineTelemetryError -category "Build" "Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
95+
echo "Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
10396
exit 1
10497
fi
10598
fi
10699
fi
107100
fi
108101
else
109102
desired_version="$(check_version_exists "$majorVersion" "$minorVersion")"
110-
if [[ "$desired_version" == "-1" ]]; then
111-
Write-PipelineTelemetryError -category "Build" "Could not find specific version of $compiler: $majorVersion $minorVersion."
103+
if [ "$desired_version" = "-1" ]; then
104+
echo "Could not find specific version of $compiler: $majorVersion $minorVersion."
112105
exit 1
113106
fi
114107
fi
115108

116-
if [[ -z "$CC" ]]; then
109+
if [ -z "$CC" ]; then
117110
CC="$(command -v "$compiler$desired_version")"
118111
CXX="$(command -v "$cxxCompiler$desired_version")"
119-
if [[ -z "$CXX" ]]; then CXX="$(command -v "$cxxCompiler")"; fi
112+
if [ -z "$CXX" ]; then CXX="$(command -v "$cxxCompiler")"; fi
120113
fi
121114
else
122-
if [[ ! -f "$CLR_CC" ]]; then
123-
Write-PipelineTelemetryError -category "Build" "CLR_CC is set but path '$CLR_CC' does not exist"
115+
if [ ! -f "$CLR_CC" ]; then
116+
echo "CLR_CC is set but path '$CLR_CC' does not exist"
124117
exit 1
125118
fi
126119
CC="$CLR_CC"
127120
CXX="$CLR_CXX"
128121
fi
129122

130-
if [[ -z "$CC" ]]; then
131-
Write-PipelineTelemetryError -category "Build" "Unable to find $compiler."
123+
if [ -z "$CC" ]; then
124+
echo "Unable to find $compiler."
132125
exit 1
133126
fi
134127

135128
# Only lld version >= 9 can be considered stable. lld doesn't support s390x.
136-
if [[ "$compiler" == "clang" && "$majorVersion" -ge 9 && "$build_arch" != "s390x" ]]; then
129+
if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && [ "$build_arch" != "s390x" ]; then
137130
if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
138131
LDFLAGS="-fuse-ld=lld"
139132
fi

‎eng/common/templates/job/job.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ parameters:
2424
enablePublishBuildAssets: false
2525
enablePublishTestResults: false
2626
enablePublishUsingPipelines: false
27+
enableBuildRetry: false
2728
disableComponentGovernance: false
2829
componentGovernanceIgnoreDirectories: ''
2930
mergeTestResults: false
@@ -228,3 +229,8 @@ jobs:
228229
BuildDropPath: ${{ parameters.buildDropPath }}
229230
IgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
230231

232+
- ${{ if eq(parameters.enableBuildRetry, 'true') }}:
233+
- publish: $(Build.SourcesDirectory)\eng\common\BuildConfiguration
234+
artifact: BuildConfiguration
235+
displayName: Publish build retry configuration
236+
continueOnError: true

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ parameters:
1414
ReusePr: true
1515
UseLfLineEndings: true
1616
UseCheckedInLocProjectJson: false
17+
SkipLocProjectJsonGeneration: false
1718
LanguageSet: VS_Main_Languages
1819
LclSource: lclFilesInRepo
1920
LclPackageId: ''
@@ -56,12 +57,13 @@ jobs:
5657
demands: ImageOverride -equals windows.vs2019.amd64
5758

5859
steps:
59-
- task: Powershell@2
60-
inputs:
61-
filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
62-
arguments: $(_GenerateLocProjectArguments)
63-
displayName: Generate LocProject.json
64-
condition: ${{ parameters.condition }}
60+
- ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}:
61+
- task: Powershell@2
62+
inputs:
63+
filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1
64+
arguments: $(_GenerateLocProjectArguments)
65+
displayName: Generate LocProject.json
66+
condition: ${{ parameters.condition }}
6567

6668
- task: OneLocBuild@2
6769
displayName: OneLocBuild

‎eng/common/tools.ps1‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,8 @@ function MSBuild-Core() {
815815
Write-Host "See log: $buildLog" -ForegroundColor DarkGray
816816
}
817817

818-
if ($ci) {
818+
# When running on Azure Pipelines, override the returned exit code to avoid double logging.
819+
if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null) {
819820
Write-PipelineSetResult -Result "Failed" -Message "msbuild execution failed."
820821
# Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
821822
# The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error

‎eng/common/tools.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,9 @@ function MSBuild-Core {
472472
# We should not Write-PipelineTaskError here because that message shows up in the build summary
473473
# The build already logged an error, that's the reason it failed. Producing an error here only adds noise.
474474
echo "Build failed with exit code $exit_code. Check errors above."
475-
if [[ "$ci" == "true" ]]; then
475+
476+
# When running on Azure Pipelines, override the returned exit code to avoid double logging.
477+
if [[ "$ci" == "true" && -n ${SYSTEM_TEAMPROJECT:-} ]]; then
476478
Write-PipelineSetResult -result "Failed" -message "msbuild execution failed."
477479
# Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
478480
# The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"cmake": "3.21.0"
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22612.4",
15-
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22612.4"
14+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23052.2",
15+
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23052.2"
1616
}
1717
}

‎src/SourceBuild/content/repo-projects/Directory.Build.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
<EnvironmentVariables Include="DotNetPackageVersionPropsPath=$(PackageVersionPropsPath)" />
4949
<EnvironmentVariables Include="DotNetRestorePackagesPath=$(PackagesDir)" />
5050
<EnvironmentVariables Include="DotNetBuildOffline=true" />
51+
<EnvironmentVariables Include="SuppressTfmSupportBuildWarnings=true" />
5152

5253
<!-- Ensure the SDK (Core-SDK/Installer) doesn't add an online source. -->
5354
<EnvironmentVariables Include="AddDotnetfeedProjectSource=false" />

0 commit comments

Comments
 (0)