Skip to content

Commit a3b0464

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20211008.1 (#755)
[main] Update dependencies from dotnet/arcade
1 parent 8031e52 commit a3b0464

File tree

4 files changed

+15
-16
lines changed

4 files changed

+15
-16
lines changed

eng/Version.Details.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21474.2">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21508.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>3ea0d860c6973f2cbadc9e895c7ec2cbdaec4ad5</Sha>
8+
<Sha>020ac68b5848016459652ebf4ed965b9800fe426</Sha>
99
</Dependency>
1010
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="5.0.0-alpha.1.20473.1">
1111
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

eng/common/native/init-compiler.sh

+12-10
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,25 @@
33
# This file detects the C/C++ compiler and exports it to the CC/CXX environment variables
44
#
55

6-
if [[ "$#" -lt 2 ]]; then
6+
if [[ "$#" -lt 3 ]]; then
77
echo "Usage..."
8-
echo "init-compiler.sh <Architecture> <compiler> <compiler major version> <compiler minor version>"
8+
echo "init-compiler.sh <script directory> <Architecture> <compiler> <compiler major version> <compiler minor version>"
9+
echo "Specify the script directory."
910
echo "Specify the target architecture."
1011
echo "Specify the name of compiler (clang or gcc)."
1112
echo "Specify the major version of compiler."
1213
echo "Specify the minor version of compiler."
1314
exit 1
1415
fi
1516

16-
. "$( cd -P "$( dirname "$0" )" && pwd )"/../pipeline-logging-functions.sh
17-
18-
build_arch="$1"
19-
compiler="$2"
17+
nativescriptroot="$1"
18+
build_arch="$2"
19+
compiler="$3"
2020
cxxCompiler="$compiler++"
21-
majorVersion="$3"
22-
minorVersion="$4"
21+
majorVersion="$4"
22+
minorVersion="$5"
23+
24+
. "$nativescriptroot"/../pipeline-logging-functions.sh
2325

2426
# clear the existing CC and CXX from environment
2527
CC=
@@ -48,8 +50,8 @@ if [[ -z "$CLR_CC" ]]; then
4850
# Set default versions
4951
if [[ -z "$majorVersion" ]]; then
5052
# note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
51-
if [[ "$compiler" == "clang" ]]; then versions=( 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
52-
elif [[ "$compiler" == "gcc" ]]; then versions=( 11 10 9 8 7 6 5 4.9 ); fi
53+
if [[ "$compiler" == "clang" ]]; then versions=( 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
54+
elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi
5355

5456
for version in "${versions[@]}"; do
5557
parts=(${version//./ })

eng/common/templates/steps/send-to-helix.yml

-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ parameters:
2020
IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion
2121
DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json
2222
DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json
23-
EnableXUnitReporter: false # optional -- true enables XUnit result reporting to Mission Control
2423
WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget."
2524
IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set
2625
HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting int)
@@ -54,7 +53,6 @@ steps:
5453
IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }}
5554
DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }}
5655
DotNetCliVersion: ${{ parameters.DotNetCliVersion }}
57-
EnableXUnitReporter: ${{ parameters.EnableXUnitReporter }}
5856
WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }}
5957
HelixBaseUri: ${{ parameters.HelixBaseUri }}
6058
Creator: ${{ parameters.Creator }}
@@ -85,7 +83,6 @@ steps:
8583
IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }}
8684
DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }}
8785
DotNetCliVersion: ${{ parameters.DotNetCliVersion }}
88-
EnableXUnitReporter: ${{ parameters.EnableXUnitReporter }}
8986
WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }}
9087
HelixBaseUri: ${{ parameters.HelixBaseUri }}
9188
Creator: ${{ parameters.Creator }}

global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"dotnet": "6.0.100-rc.1.21430.12"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21474.2"
6+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21508.1"
77
}
88
}

0 commit comments

Comments
 (0)