Skip to content

Commit d60a855

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20200401.2 (#696)
- Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20201.2 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20201.2 - Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20201.2 - Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20201.2 - Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20201.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 523e13f commit d60a855

File tree

8 files changed

+49
-18
lines changed

8 files changed

+49
-18
lines changed

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -173,25 +173,25 @@
173173
</Dependency>
174174
</ProductDependencies>
175175
<ToolsetDependencies>
176-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20180.5">
176+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20201.2">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>09bb9d929120b402348c9a0e9c8c951e824059aa</Sha>
178+
<Sha>bce0a98620c1c5a110b2bba9912f3d5929069c6b</Sha>
179179
</Dependency>
180-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20180.5">
180+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20201.2">
181181
<Uri>https://github.com/dotnet/arcade</Uri>
182-
<Sha>09bb9d929120b402348c9a0e9c8c951e824059aa</Sha>
182+
<Sha>bce0a98620c1c5a110b2bba9912f3d5929069c6b</Sha>
183183
</Dependency>
184-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.20180.5">
184+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.20201.2">
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186-
<Sha>09bb9d929120b402348c9a0e9c8c951e824059aa</Sha>
186+
<Sha>bce0a98620c1c5a110b2bba9912f3d5929069c6b</Sha>
187187
</Dependency>
188-
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20180.5">
188+
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20201.2">
189189
<Uri>https://github.com/dotnet/arcade</Uri>
190-
<Sha>09bb9d929120b402348c9a0e9c8c951e824059aa</Sha>
190+
<Sha>bce0a98620c1c5a110b2bba9912f3d5929069c6b</Sha>
191191
</Dependency>
192-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.20180.5">
192+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.20201.2">
193193
<Uri>https://github.com/dotnet/arcade</Uri>
194-
<Sha>09bb9d929120b402348c9a0e9c8c951e824059aa</Sha>
194+
<Sha>bce0a98620c1c5a110b2bba9912f3d5929069c6b</Sha>
195195
</Dependency>
196196
</ToolsetDependencies>
197197
</Dependencies>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
<!--Package versions-->
4343
<PropertyGroup>
4444
<!-- arcade -->
45-
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20180.5</MicrosoftDotNetBuildTasksFeedVersion>
46-
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.20180.5</MicrosoftDotNetBuildTasksPackagingVersion>
47-
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20180.5</MicrosoftDotNetVersionToolsTasksVersion>
45+
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20201.2</MicrosoftDotNetBuildTasksFeedVersion>
46+
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.20201.2</MicrosoftDotNetBuildTasksPackagingVersion>
47+
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20201.2</MicrosoftDotNetVersionToolsTasksVersion>
4848
<!-- core-setup -->
4949
<MicrosoftNETCoreAppRefVersion>5.0.0-preview.2.20154.3</MicrosoftNETCoreAppRefVersion>
5050
<MicrosoftNETCoreAppRuntimewinx64Version>5.0.0-preview.2.20154.3</MicrosoftNETCoreAppRuntimewinx64Version>

‎eng/common/cross/toolchain.cmake‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
set(CROSS_ROOTFS $ENV{ROOTFS_DIR})
22

33
set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH})
4-
set(CMAKE_SYSTEM_NAME Linux)
4+
if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version)
5+
set(CMAKE_SYSTEM_NAME FreeBSD)
6+
else()
7+
set(CMAKE_SYSTEM_NAME Linux)
8+
endif()
59
set(CMAKE_SYSTEM_VERSION 1)
610

711
if(TARGET_ARCH_NAME STREQUAL "armel")
@@ -27,6 +31,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
2731
elseif(TARGET_ARCH_NAME STREQUAL "x86")
2832
set(CMAKE_SYSTEM_PROCESSOR i686)
2933
set(TOOLCHAIN "i686-linux-gnu")
34+
elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
35+
set(CMAKE_SYSTEM_PROCESSOR "x86_64")
36+
set(triple "x86_64-unknown-freebsd11")
3037
else()
3138
message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, arm64 and x86 are supported!")
3239
endif()
@@ -60,6 +67,12 @@ if("$ENV{__DistroRid}" MATCHES "android.*")
6067

6168
# include official NDK toolchain script
6269
include(${CROSS_ROOTFS}/../build/cmake/android.toolchain.cmake)
70+
elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
71+
# we cross-compile by instructing clang
72+
set(CMAKE_C_COMPILER_TARGET ${triple})
73+
set(CMAKE_CXX_COMPILER_TARGET ${triple})
74+
set(CMAKE_ASM_COMPILER_TARGET ${triple})
75+
set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
6376
else()
6477
set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
6578

‎eng/common/performance/performance-setup.ps1‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,13 @@ if ($Internal) {
5353
$CommonSetupArguments="--channel master --queue $Queue --build-number $BuildNumber --build-configs $Configurations --architecture $Architecture"
5454
$SetupArguments = "--repository https://github.com/$Repository --branch $Branch --get-perf-hash --commit-sha $CommitSha $CommonSetupArguments"
5555

56+
57+
#This grabs the LKG version number of dotnet and passes it to our scripts
58+
$VersionJSON = Get-Content global.json | ConvertFrom-Json
59+
$DotNetVersion = $VersionJSON.tools.dotnet
60+
$SetupArguments = "--dotnet-versions $DotNetVersion $SetupArguments"
61+
62+
5663
if ($RunFromPerformanceRepo) {
5764
$SetupArguments = "--perf-hash $CommitSha $CommonSetupArguments"
5865

‎eng/common/performance/performance-setup.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,13 @@ fi
167167
common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs $configurations --architecture $architecture"
168168
setup_arguments="--repository https://github.com/$repository --branch $branch --get-perf-hash --commit-sha $commit_sha $common_setup_arguments"
169169

170+
171+
# Get the tools section from the global.json.
172+
# This grabs the LKG version number of dotnet and passes it to our scripts
173+
dotnet_version=`cat global.json | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["tools"]["dotnet"])'`
174+
setup_arguments="--dotnet-versions $dotnet_version $setup_arguments"
175+
176+
170177
if [[ "$run_from_perf_repo" = true ]]; then
171178
payload_directory=
172179
workitem_directory=$source_directory

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ parameters:
2424
enablePublishBuildAssets: false
2525
enablePublishTestResults: false
2626
enablePublishUsingPipelines: false
27+
mergeTestResults: false
28+
testRunTitle: $(AgentOsName)-$(BuildConfiguration)-xunit
2729
name: ''
2830
preSteps: []
2931
runAsPublic: false
@@ -194,6 +196,8 @@ jobs:
194196
testResultsFormat: 'xUnit'
195197
testResultsFiles: '*.xml'
196198
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
199+
testRunTitle: ${{ parameters.testRunTitle }}
200+
mergeTestResults: ${{ parameters.mergeTestResults }}
197201
continueOnError: true
198202
condition: always()
199203

‎eng/common/tools.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ function ResolvePath {
7777
function ReadGlobalVersion {
7878
local key=$1
7979

80-
local line=`grep -m 1 "$key" "$global_json_file"`
80+
local line=$(awk "/$key/ {print; exit}" "$global_json_file")
8181
local pattern="\"$key\" *: *\"(.*)\""
8282

8383
if [[ ! $line =~ $pattern ]]; then
@@ -438,7 +438,7 @@ temp_dir="$artifacts_dir/tmp/$configuration"
438438
global_json_file="$repo_root/global.json"
439439
# determine if global.json contains a "runtimes" entry
440440
global_json_has_runtimes=false
441-
dotnetlocal_key=`grep -m 1 "runtimes" "$global_json_file"` || true
441+
dotnetlocal_key=$(awk "/runtimes/ {print; exit}" "$global_json_file") || true
442442
if [[ -n "$dotnetlocal_key" ]]; then
443443
global_json_has_runtimes=true
444444
fi

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dotnet": "3.1.101"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20180.5",
7-
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20180.5"
6+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20201.2",
7+
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20201.2"
88
}
99
}

0 commit comments

Comments
 (0)