diff options
author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2021-10-11 16:44:00 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-11 16:44:00 +0300 |
commit | e20c0dbcf2fdc8979584b178cafd01db37121d64 (patch) | |
tree | 2965c52084357211999a7111e912c43c90c8fd06 | |
parent | fadaad69ceb75cd54372336dde2193a39348e740 (diff) |
Update dependencies from https://github.com/dotnet/arcade build 20211008.1 (#135)
[release/11.x] Update dependencies from dotnet/arcade
-rw-r--r-- | eng/Version.Details.xml | 12 | ||||
-rw-r--r-- | eng/Versions.props | 2 | ||||
-rw-r--r-- | eng/common/native/init-compiler.sh | 22 | ||||
-rw-r--r-- | eng/common/templates/steps/send-to-helix.yml | 3 | ||||
-rw-r--r-- | global.json | 4 |
5 files changed, 21 insertions, 22 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f25183294491..d1a9982b0d61 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,17 +3,17 @@ <ProductDependencies> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21474.2"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21508.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>3ea0d860c6973f2cbadc9e895c7ec2cbdaec4ad5</Sha> + <Sha>020ac68b5848016459652ebf4ed965b9800fe426</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21474.2"> + <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21508.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>3ea0d860c6973f2cbadc9e895c7ec2cbdaec4ad5</Sha> + <Sha>020ac68b5848016459652ebf4ed965b9800fe426</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.21474.2"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.21508.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>3ea0d860c6973f2cbadc9e895c7ec2cbdaec4ad5</Sha> + <Sha>020ac68b5848016459652ebf4ed965b9800fe426</Sha> </Dependency> </ToolsetDependencies> </Dependencies> diff --git a/eng/Versions.props b/eng/Versions.props index 1546c8009a43..aa56f621a463 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,6 +6,6 @@ <PreReleaseVersionIteration>1</PreReleaseVersionIteration> </PropertyGroup> <PropertyGroup> - <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.21474.2</MicrosoftDotNetBuildTasksPackagingVersion> + <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.21508.1</MicrosoftDotNetBuildTasksPackagingVersion> </PropertyGroup> </Project> diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 1daadf32a524..8c944f30b286 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -3,9 +3,10 @@ # This file detects the C/C++ compiler and exports it to the CC/CXX environment variables # -if [[ "$#" -lt 2 ]]; then +if [[ "$#" -lt 3 ]]; then echo "Usage..." - echo "init-compiler.sh <Architecture> <compiler> <compiler major version> <compiler minor version>" + echo "init-compiler.sh <script directory> <Architecture> <compiler> <compiler major version> <compiler minor version>" + echo "Specify the script directory." echo "Specify the target architecture." echo "Specify the name of compiler (clang or gcc)." echo "Specify the major version of compiler." @@ -13,13 +14,14 @@ if [[ "$#" -lt 2 ]]; then exit 1 fi -. "$( cd -P "$( dirname "$0" )" && pwd )"/../pipeline-logging-functions.sh - -build_arch="$1" -compiler="$2" +nativescriptroot="$1" +build_arch="$2" +compiler="$3" cxxCompiler="$compiler++" -majorVersion="$3" -minorVersion="$4" +majorVersion="$4" +minorVersion="$5" + +. "$nativescriptroot"/../pipeline-logging-functions.sh # clear the existing CC and CXX from environment CC= @@ -48,8 +50,8 @@ if [[ -z "$CLR_CC" ]]; then # Set default versions if [[ -z "$majorVersion" ]]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - 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 ) - elif [[ "$compiler" == "gcc" ]]; then versions=( 11 10 9 8 7 6 5 4.9 ); fi + 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 ) + elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi for version in "${versions[@]}"; do parts=(${version//./ }) diff --git a/eng/common/templates/steps/send-to-helix.yml b/eng/common/templates/steps/send-to-helix.yml index cd02ae1607f3..09a223989f7e 100644 --- a/eng/common/templates/steps/send-to-helix.yml +++ b/eng/common/templates/steps/send-to-helix.yml @@ -20,7 +20,6 @@ parameters: IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion 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 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 - EnableXUnitReporter: false # optional -- true enables XUnit result reporting to Mission Control 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." IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting int) @@ -54,7 +53,6 @@ steps: IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} DotNetCliVersion: ${{ parameters.DotNetCliVersion }} - EnableXUnitReporter: ${{ parameters.EnableXUnitReporter }} WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} HelixBaseUri: ${{ parameters.HelixBaseUri }} Creator: ${{ parameters.Creator }} @@ -85,7 +83,6 @@ steps: IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} DotNetCliVersion: ${{ parameters.DotNetCliVersion }} - EnableXUnitReporter: ${{ parameters.EnableXUnitReporter }} WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} HelixBaseUri: ${{ parameters.HelixBaseUri }} Creator: ${{ parameters.Creator }} diff --git a/global.json b/global.json index 969efaaab5ce..e2feb69f0e50 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "6.0.100-rc.1.21430.12" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21474.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21474.2", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21508.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21508.1", "Microsoft.Build.Traversal": "2.0.2" } } |