Skip to content

Commit d340a6d

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20201020.8 (dotnet#3683)
[master] Update dependencies from dotnet/arcade
1 parent 2265a40 commit d340a6d

File tree

5 files changed

+21
-18
lines changed

5 files changed

+21
-18
lines changed

eng/Version.Details.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -103,25 +103,25 @@
103103
</Dependency>
104104
</ProductDependencies>
105105
<ToolsetDependencies>
106-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20516.5">
106+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20520.8">
107107
<Uri>https://github.com/dotnet/arcade</Uri>
108-
<Sha>e7a79ce64f0703c231e6da88b5279dd0bf681b3d</Sha>
108+
<Sha>7fbf2a7703498067569d07a21776b91e599028e2</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.20516.5">
110+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.20520.8">
111111
<Uri>https://github.com/dotnet/arcade</Uri>
112-
<Sha>e7a79ce64f0703c231e6da88b5279dd0bf681b3d</Sha>
112+
<Sha>7fbf2a7703498067569d07a21776b91e599028e2</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20516.5">
114+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20520.8">
115115
<Uri>https://github.com/dotnet/arcade</Uri>
116-
<Sha>e7a79ce64f0703c231e6da88b5279dd0bf681b3d</Sha>
116+
<Sha>7fbf2a7703498067569d07a21776b91e599028e2</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.20516.5">
118+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.20520.8">
119119
<Uri>https://github.com/dotnet/arcade</Uri>
120-
<Sha>e7a79ce64f0703c231e6da88b5279dd0bf681b3d</Sha>
120+
<Sha>7fbf2a7703498067569d07a21776b91e599028e2</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.20516.5">
122+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.20520.8">
123123
<Uri>https://github.com/dotnet/arcade</Uri>
124-
<Sha>e7a79ce64f0703c231e6da88b5279dd0bf681b3d</Sha>
124+
<Sha>7fbf2a7703498067569d07a21776b91e599028e2</Sha>
125125
</Dependency>
126126
</ToolsetDependencies>
127127
</Dependencies>

eng/Versions.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
</PropertyGroup>
4444
<!-- Packages that come from https://github.com/dotnet/arcade -->
4545
<PropertyGroup>
46-
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.20516.5</MicrosoftDotNetApiCompatVersion>
47-
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.20516.5</MicrosoftDotNetCodeAnalysisPackageVersion>
48-
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.20516.5</MicrosoftDotNetGenAPIVersion>
46+
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.20520.8</MicrosoftDotNetApiCompatVersion>
47+
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.20520.8</MicrosoftDotNetCodeAnalysisPackageVersion>
48+
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.20520.8</MicrosoftDotNetGenAPIVersion>
4949
</PropertyGroup>
5050
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
5151
<PropertyGroup>

eng/common/cross/build-rootfs.sh

+1
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,7 @@ elif [[ -n $__CodeName ]]; then
329329
chroot $__RootfsDir apt-get -f -y install
330330
chroot $__RootfsDir apt-get -y install $__UbuntuPackages
331331
chroot $__RootfsDir symlinks -cr /usr
332+
chroot $__RootfsDir apt clean
332333

333334
if [ $__SkipUnmount == 0 ]; then
334335
umount $__RootfsDir/* || true

eng/common/templates/job/job.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ parameters:
2727
useBuildManifest: false
2828
mergeTestResults: false
2929
testRunTitle: ''
30+
testResultsFormat: ''
3031
name: ''
3132
preSteps: []
3233
runAsPublic: false
@@ -131,8 +132,8 @@ jobs:
131132
- task: RichCodeNavIndexer@0
132133
displayName: RichCodeNav Upload
133134
inputs:
134-
languages: 'csharp'
135-
environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'prod') }}
135+
languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
136+
environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'production') }}
136137
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
137138
continueOnError: true
138139

@@ -202,7 +203,7 @@ jobs:
202203
continueOnError: true
203204
condition: always()
204205

205-
- ${{ if eq(parameters.enablePublishTestResults, 'true') }}:
206+
- ${{ if or(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, 'xunit')) }}:
206207
- task: PublishTestResults@2
207208
displayName: Publish XUnit Test Results
208209
inputs:
@@ -213,6 +214,7 @@ jobs:
213214
mergeTestResults: ${{ parameters.mergeTestResults }}
214215
continueOnError: true
215216
condition: always()
217+
- ${{ if or(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, 'vstest')) }}:
216218
- task: PublishTestResults@2
217219
displayName: Publish TRX Test Results
218220
inputs:

global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20516.5",
16-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20516.5"
15+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20520.8",
16+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20520.8"
1717
},
1818
"sdk": {
1919
"version": "5.0.100-rc.2.20479.15"

0 commit comments

Comments
 (0)