Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/linker.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>2020-10-22 20:22:28 +0300
committerGitHub <noreply@github.com>2020-10-22 20:22:28 +0300
commit4f6f471f99189cb79f13a5b1ccfd3a26f81db601 (patch)
treef4ac86e83c63871ebfce778b2a4ee3db2ce253ce
parent2699ffa72993e0d2c04e4e0d388be714b6f3a594 (diff)
Update dependencies from https://github.com/dotnet/arcade build 20201020.8 (#1581)
[master] Update dependencies from dotnet/arcade
-rw-r--r--eng/Version.Details.xml8
-rw-r--r--eng/Versions.props2
-rwxr-xr-xeng/common/cross/build-rootfs.sh1
-rw-r--r--eng/common/templates/job/job.yml8
-rw-r--r--global.json2
5 files changed, 12 insertions, 9 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7c1eb660b..bd010f4e8 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,13 +3,13 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
- <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20516.5">
+ <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20520.8">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>e7a79ce64f0703c231e6da88b5279dd0bf681b3d</Sha>
+ <Sha>7fbf2a7703498067569d07a21776b91e599028e2</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.20516.5">
+ <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.20520.8">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>e7a79ce64f0703c231e6da88b5279dd0bf681b3d</Sha>
+ <Sha>7fbf2a7703498067569d07a21776b91e599028e2</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="6.0.0-alpha.1.20518.3">
<Uri>https://github.com/dotnet/runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index e7f49332a..0eb5f2001 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -20,7 +20,7 @@
<SystemReflectionMetadataVersion>1.8.0</SystemReflectionMetadataVersion>
<MicrosoftBuildFrameworkVersion>15.4.8</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildUtilitiesCoreVersion>15.4.8</MicrosoftBuildUtilitiesCoreVersion>
- <MicrosoftDotNetApiCompatVersion>6.0.0-beta.20516.5</MicrosoftDotNetApiCompatVersion>
+ <MicrosoftDotNetApiCompatVersion>6.0.0-beta.20520.8</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20471.1</MicrosoftDotNetCodeAnalysisVersion>
<!-- This controls the version of the cecil package, or the version of cecil in the project graph
when we build the cecil submodule. The reference assembly package will depend on this version of cecil.
diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
index ffdff3854..a841c64f3 100755
--- a/eng/common/cross/build-rootfs.sh
+++ b/eng/common/cross/build-rootfs.sh
@@ -329,6 +329,7 @@ elif [[ -n $__CodeName ]]; then
chroot $__RootfsDir apt-get -f -y install
chroot $__RootfsDir apt-get -y install $__UbuntuPackages
chroot $__RootfsDir symlinks -cr /usr
+ chroot $__RootfsDir apt clean
if [ $__SkipUnmount == 0 ]; then
umount $__RootfsDir/* || true
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index 8b81a7e51..8e4ce2c28 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -27,6 +27,7 @@ parameters:
useBuildManifest: false
mergeTestResults: false
testRunTitle: ''
+ testResultsFormat: ''
name: ''
preSteps: []
runAsPublic: false
@@ -131,8 +132,8 @@ jobs:
- task: RichCodeNavIndexer@0
displayName: RichCodeNav Upload
inputs:
- languages: 'csharp'
- environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'prod') }}
+ languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
+ environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'production') }}
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
continueOnError: true
@@ -202,7 +203,7 @@ jobs:
continueOnError: true
condition: always()
- - ${{ if eq(parameters.enablePublishTestResults, 'true') }}:
+ - ${{ if or(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, 'xunit')) }}:
- task: PublishTestResults@2
displayName: Publish XUnit Test Results
inputs:
@@ -213,6 +214,7 @@ jobs:
mergeTestResults: ${{ parameters.mergeTestResults }}
continueOnError: true
condition: always()
+ - ${{ if or(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, 'vstest')) }}:
- task: PublishTestResults@2
displayName: Publish TRX Test Results
inputs:
diff --git a/global.json b/global.json
index 5d69972a8..c2cb8696a 100644
--- a/global.json
+++ b/global.json
@@ -8,7 +8,7 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20516.5",
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20520.8",
"Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "6.0.0-alpha.1.20518.3"
}