Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 84a14d8

Browse files
lewinglewing
authored
Merge branch 'release/8.0' into darc-release/8.0-91c23e34-7f35-458e-8242-f6849394d6dc
2 parents a6ce990 + 0fdf85d commit 84a14d8

39 files changed

+4570
-2547
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "8.0.0-prerelease.24510.2",
18+
"version": "8.0.0-prerelease.25064.4",
1919
"commands": [
2020
"xharness"
2121
]

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,3 +101,4 @@
101101
/docs/area-owners.* @jeffhandley
102102
/docs/issue*.md @jeffhandley
103103
/.github/fabricbot.json @jeffhandley
104+
/.github/workflows/ @jeffhandley @dotnet/runtime-infrastructure

‎.github/workflows/README.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Workflows
2+
3+
General guidance:
4+
5+
Please make sure to include the @dotnet/runtime-infrastructure group as a reviewer of your PRs.
6+
7+
For workflows that are triggered by pull requests, refer to GitHub's documentation for the `pull_request` and `pull_request_target` events. The `pull_request_target` event is the more common use case in this repository as it runs the workflow in the context of the target branch instead of in the context of the pull request's fork or branch. However, workflows that need to consume the contents of the pull request need to use the `pull_request` event. There are security considerations with each of the events though.
8+
9+
Most workflows are intended to run only in the `dotnet/runtime` repository and not in forks. To force workflow jobs to be skipped in forks, each job should apply an `if` statement that checks the repository name or owner. Either approach works, but checking only the repository owner allows the workflow to run in copies or forks withing the dotnet org.
10+
11+
```yaml
12+
jobs:
13+
job-1:
14+
# Do not run this job in forks
15+
if: github.repository == 'dotnet/runtime'
16+
17+
job-2:
18+
# Do not run this job in forks outside the dotnet org
19+
if: github.repository_owner == 'dotnet'
20+
```
21+
22+
Refer to GitHub's [Workflows in forked repositories](https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#workflows-in-forked-repositories) and [pull_request_target](https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#pull_request_target) documentation for more information.

‎.github/workflows/check-no-merge-label.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: check-no-merge-label
2+
3+
permissions:
4+
pull-requests: read
5+
6+
on:
7+
pull_request_target:
8+
types: [opened, reopened, labeled, unlabeled]
9+
branches:
10+
- 'main'
11+
- 'release/**'
12+
13+
jobs:
14+
check-labels:
15+
if: github.repository == 'dotnet/runtime'
16+
runs-on: ubuntu-latest
17+
steps:
18+
- name: Check 'NO-MERGE' label
19+
run: |
20+
echo "Merging permission is disabled when the 'NO-MERGE' label is applied."
21+
if [ "${{ contains(github.event.pull_request.labels.*.name, 'NO-MERGE') }}" = "false" ]; then
22+
exit 0
23+
else
24+
echo "::error:: The 'NO-MERGE' label was applied to the PR. Merging is disabled."
25+
exit 1
26+
fi

‎.github/workflows/check-service-labels.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,19 @@ permissions:
44
pull-requests: read
55

66
on:
7-
pull_request:
8-
types: [opened, edited, reopened, labeled, unlabeled, synchronize]
7+
pull_request_target:
8+
types: [opened, reopened, labeled, unlabeled]
99
branches:
1010
- 'release/**'
1111

1212
jobs:
1313
check-labels:
14+
if: github.repository == 'dotnet/runtime'
1415
runs-on: ubuntu-latest
1516
steps:
1617
- name: Check 'Servicing-approved' label
1718
run: |
18-
echo "Merging permission is enabled for servicing PRs when the `Servicing-approved` label is applied."
19+
echo "Merging permission is enabled for servicing PRs when the 'Servicing-approved' label is applied."
1920
if [ "${{ contains(github.event.pull_request.labels.*.name, 'Servicing-approved') }}" = "true" ]; then
2021
exit 0
2122
else

‎eng/Version.Details.xml‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,14 @@
9999
<Sha>ec84e775d21d3b7a6698ec30f7b2a5a9e3acd314</Sha>
100100
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
101101
</Dependency>
102-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25060.2">
102+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25081.5">
103103
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
104-
<Sha>f9542c50beaefc38dd9d7ec9ea38d54fd154f21a</Sha>
104+
<Sha>d73fc552386797322e84fa9b2ef5eaa5369de83c</Sha>
105105
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
106106
</Dependency>
107-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.25060.2">
107+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.25104.1">
108108
<Uri>https://github.com/dotnet/source-build-externals</Uri>
109-
<Sha>c7cb4da26e74ef645e3e98fcb4534a7d66247a82</Sha>
109+
<Sha>dc30cd1ec22f198d658e011c14525d4d65873991</Sha>
110110
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
111111
</Dependency>
112112
</ProductDependencies>
@@ -185,57 +185,57 @@
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186186
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
187187
</Dependency>
188-
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.24517.1">
188+
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.25071.1">
189189
<Uri>https://github.com/dotnet/runtime-assets</Uri>
190-
<Sha>e57d39e720c9dba0d4efe7ab260c45678bebf621</Sha>
190+
<Sha>6db56a1a9a15801f7095ed88bb0c44def23c8ccd</Sha>
191191
</Dependency>
192-
<Dependency Name="System.Data.Common.TestData" Version="8.0.0-beta.24517.1">
192+
<Dependency Name="System.Data.Common.TestData" Version="8.0.0-beta.25071.1">
193193
<Uri>https://github.com/dotnet/runtime-assets</Uri>
194-
<Sha>e57d39e720c9dba0d4efe7ab260c45678bebf621</Sha>
194+
<Sha>6db56a1a9a15801f7095ed88bb0c44def23c8ccd</Sha>
195195
</Dependency>
196-
<Dependency Name="System.Drawing.Common.TestData" Version="8.0.0-beta.24517.1">
196+
<Dependency Name="System.Drawing.Common.TestData" Version="8.0.0-beta.25071.1">
197197
<Uri>https://github.com/dotnet/runtime-assets</Uri>
198-
<Sha>e57d39e720c9dba0d4efe7ab260c45678bebf621</Sha>
198+
<Sha>6db56a1a9a15801f7095ed88bb0c44def23c8ccd</Sha>
199199
</Dependency>
200-
<Dependency Name="System.Formats.Tar.TestData" Version="8.0.0-beta.24517.1">
200+
<Dependency Name="System.Formats.Tar.TestData" Version="8.0.0-beta.25071.1">
201201
<Uri>https://github.com/dotnet/runtime-assets</Uri>
202-
<Sha>e57d39e720c9dba0d4efe7ab260c45678bebf621</Sha>
202+
<Sha>6db56a1a9a15801f7095ed88bb0c44def23c8ccd</Sha>
203203
</Dependency>
204-
<Dependency Name="System.IO.Compression.TestData" Version="8.0.0-beta.24517.1">
204+
<Dependency Name="System.IO.Compression.TestData" Version="8.0.0-beta.25071.1">
205205
<Uri>https://github.com/dotnet/runtime-assets</Uri>
206-
<Sha>e57d39e720c9dba0d4efe7ab260c45678bebf621</Sha>
206+
<Sha>6db56a1a9a15801f7095ed88bb0c44def23c8ccd</Sha>
207207
</Dependency>
208-
<Dependency Name="System.IO.Packaging.TestData" Version="8.0.0-beta.24517.1">
208+
<Dependency Name="System.IO.Packaging.TestData" Version="8.0.0-beta.25071.1">
209209
<Uri>https://github.com/dotnet/runtime-assets</Uri>
210-
<Sha>e57d39e720c9dba0d4efe7ab260c45678bebf621</Sha>
210+
<Sha>6db56a1a9a15801f7095ed88bb0c44def23c8ccd</Sha>
211211
</Dependency>
212-
<Dependency Name="System.Net.TestData" Version="8.0.0-beta.24517.1">
212+
<Dependency Name="System.Net.TestData" Version="8.0.0-beta.25071.1">
213213
<Uri>https://github.com/dotnet/runtime-assets</Uri>
214-
<Sha>e57d39e720c9dba0d4efe7ab260c45678bebf621</Sha>
214+
<Sha>6db56a1a9a15801f7095ed88bb0c44def23c8ccd</Sha>
215215
</Dependency>
216-
<Dependency Name="System.Private.Runtime.UnicodeData" Version="8.0.0-beta.24517.1">
216+
<Dependency Name="System.Private.Runtime.UnicodeData" Version="8.0.0-beta.25071.1">
217217
<Uri>https://github.com/dotnet/runtime-assets</Uri>
218-
<Sha>e57d39e720c9dba0d4efe7ab260c45678bebf621</Sha>
218+
<Sha>6db56a1a9a15801f7095ed88bb0c44def23c8ccd</Sha>
219219
</Dependency>
220-
<Dependency Name="System.Runtime.TimeZoneData" Version="8.0.0-beta.24517.1">
220+
<Dependency Name="System.Runtime.TimeZoneData" Version="8.0.0-beta.25071.1">
221221
<Uri>https://github.com/dotnet/runtime-assets</Uri>
222-
<Sha>e57d39e720c9dba0d4efe7ab260c45678bebf621</Sha>
222+
<Sha>6db56a1a9a15801f7095ed88bb0c44def23c8ccd</Sha>
223223
</Dependency>
224-
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="8.0.0-beta.24517.1">
224+
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="8.0.0-beta.25071.1">
225225
<Uri>https://github.com/dotnet/runtime-assets</Uri>
226-
<Sha>e57d39e720c9dba0d4efe7ab260c45678bebf621</Sha>
226+
<Sha>6db56a1a9a15801f7095ed88bb0c44def23c8ccd</Sha>
227227
</Dependency>
228-
<Dependency Name="System.Text.RegularExpressions.TestData" Version="8.0.0-beta.24517.1">
228+
<Dependency Name="System.Text.RegularExpressions.TestData" Version="8.0.0-beta.25071.1">
229229
<Uri>https://github.com/dotnet/runtime-assets</Uri>
230-
<Sha>e57d39e720c9dba0d4efe7ab260c45678bebf621</Sha>
230+
<Sha>6db56a1a9a15801f7095ed88bb0c44def23c8ccd</Sha>
231231
</Dependency>
232-
<Dependency Name="System.Windows.Extensions.TestData" Version="8.0.0-beta.24517.1">
232+
<Dependency Name="System.Windows.Extensions.TestData" Version="8.0.0-beta.25071.1">
233233
<Uri>https://github.com/dotnet/runtime-assets</Uri>
234-
<Sha>e57d39e720c9dba0d4efe7ab260c45678bebf621</Sha>
234+
<Sha>6db56a1a9a15801f7095ed88bb0c44def23c8ccd</Sha>
235235
</Dependency>
236-
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="8.0.0-beta.24517.1">
236+
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="8.0.0-beta.25071.1">
237237
<Uri>https://github.com/dotnet/runtime-assets</Uri>
238-
<Sha>e57d39e720c9dba0d4efe7ab260c45678bebf621</Sha>
238+
<Sha>6db56a1a9a15801f7095ed88bb0c44def23c8ccd</Sha>
239239
</Dependency>
240240
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="16.0.5-alpha.1.24362.2" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100">
241241
<Uri>https://github.com/dotnet/llvm-project</Uri>
@@ -322,17 +322,17 @@
322322
<Uri>https://github.com/dotnet/runtime</Uri>
323323
<Sha>edbd5c769a19798b6955050baccf99e6797d3208</Sha>
324324
</Dependency>
325-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.24510.2">
325+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.25064.4">
326326
<Uri>https://github.com/dotnet/xharness</Uri>
327-
<Sha>8c90d68ba97c7ee54d09fccb854f77ed0f9419ef</Sha>
327+
<Sha>3ba447103e5b0a23bbe544d6c3701f0fc64d2cfe</Sha>
328328
</Dependency>
329-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.24510.2">
329+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.25064.4">
330330
<Uri>https://github.com/dotnet/xharness</Uri>
331-
<Sha>8c90d68ba97c7ee54d09fccb854f77ed0f9419ef</Sha>
331+
<Sha>3ba447103e5b0a23bbe544d6c3701f0fc64d2cfe</Sha>
332332
</Dependency>
333-
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.24510.2">
333+
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.25064.4">
334334
<Uri>https://github.com/dotnet/xharness</Uri>
335-
<Sha>8c90d68ba97c7ee54d09fccb854f77ed0f9419ef</Sha>
335+
<Sha>3ba447103e5b0a23bbe544d6c3701f0fc64d2cfe</Sha>
336336
</Dependency>
337337
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.25060.1">
338338
<Uri>https://github.com/dotnet/arcade</Uri>
@@ -354,13 +354,13 @@
354354
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
355355
<Sha>67613417f5e1af250e6ddfba79f8f2885d8e90fb</Sha>
356356
</Dependency>
357-
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="8.0.0-alpha.0.25063.2">
357+
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="8.0.0-alpha.0.25077.2">
358358
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
359-
<Sha>a07c4f8a8393191ab5b65f4a3b4546ed1cbd8cdf</Sha>
359+
<Sha>feeef0335323285595eff5fdb6fcb9f3f724a37d</Sha>
360360
</Dependency>
361-
<Dependency Name="System.Runtime.Numerics.TestData" Version="8.0.0-beta.24517.1">
361+
<Dependency Name="System.Runtime.Numerics.TestData" Version="8.0.0-beta.25071.1">
362362
<Uri>https://github.com/dotnet/runtime-assets</Uri>
363-
<Sha>e57d39e720c9dba0d4efe7ab260c45678bebf621</Sha>
363+
<Sha>6db56a1a9a15801f7095ed88bb0c44def23c8ccd</Sha>
364364
</Dependency>
365365
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-7.23566.2">
366366
<Uri>https://github.com/dotnet/roslyn</Uri>

‎eng/Versions.props‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -145,20 +145,20 @@
145145
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
146146
<runtimenativeSystemIOPortsVersion>8.0.0-rc.1.23406.6</runtimenativeSystemIOPortsVersion>
147147
<!-- Runtime-Assets dependencies -->
148-
<SystemRuntimeNumericsTestDataVersion>8.0.0-beta.24517.1</SystemRuntimeNumericsTestDataVersion>
149-
<SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.24517.1</SystemComponentModelTypeConverterTestDataVersion>
150-
<SystemDataCommonTestDataVersion>8.0.0-beta.24517.1</SystemDataCommonTestDataVersion>
151-
<SystemDrawingCommonTestDataVersion>8.0.0-beta.24517.1</SystemDrawingCommonTestDataVersion>
152-
<SystemFormatsTarTestDataVersion>8.0.0-beta.24517.1</SystemFormatsTarTestDataVersion>
153-
<SystemIOCompressionTestDataVersion>8.0.0-beta.24517.1</SystemIOCompressionTestDataVersion>
154-
<SystemIOPackagingTestDataVersion>8.0.0-beta.24517.1</SystemIOPackagingTestDataVersion>
155-
<SystemNetTestDataVersion>8.0.0-beta.24517.1</SystemNetTestDataVersion>
156-
<SystemPrivateRuntimeUnicodeDataVersion>8.0.0-beta.24517.1</SystemPrivateRuntimeUnicodeDataVersion>
157-
<SystemRuntimeTimeZoneDataVersion>8.0.0-beta.24517.1</SystemRuntimeTimeZoneDataVersion>
158-
<SystemSecurityCryptographyX509CertificatesTestDataVersion>8.0.0-beta.24517.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
159-
<SystemTextRegularExpressionsTestDataVersion>8.0.0-beta.24517.1</SystemTextRegularExpressionsTestDataVersion>
160-
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.24517.1</SystemWindowsExtensionsTestDataVersion>
161-
<MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.24517.1</MicrosoftDotNetCilStripSourcesVersion>
148+
<SystemRuntimeNumericsTestDataVersion>8.0.0-beta.25071.1</SystemRuntimeNumericsTestDataVersion>
149+
<SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.25071.1</SystemComponentModelTypeConverterTestDataVersion>
150+
<SystemDataCommonTestDataVersion>8.0.0-beta.25071.1</SystemDataCommonTestDataVersion>
151+
<SystemDrawingCommonTestDataVersion>8.0.0-beta.25071.1</SystemDrawingCommonTestDataVersion>
152+
<SystemFormatsTarTestDataVersion>8.0.0-beta.25071.1</SystemFormatsTarTestDataVersion>
153+
<SystemIOCompressionTestDataVersion>8.0.0-beta.25071.1</SystemIOCompressionTestDataVersion>
154+
<SystemIOPackagingTestDataVersion>8.0.0-beta.25071.1</SystemIOPackagingTestDataVersion>
155+
<SystemNetTestDataVersion>8.0.0-beta.25071.1</SystemNetTestDataVersion>
156+
<SystemPrivateRuntimeUnicodeDataVersion>8.0.0-beta.25071.1</SystemPrivateRuntimeUnicodeDataVersion>
157+
<SystemRuntimeTimeZoneDataVersion>8.0.0-beta.25071.1</SystemRuntimeTimeZoneDataVersion>
158+
<SystemSecurityCryptographyX509CertificatesTestDataVersion>8.0.0-beta.25071.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
159+
<SystemTextRegularExpressionsTestDataVersion>8.0.0-beta.25071.1</SystemTextRegularExpressionsTestDataVersion>
160+
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.25071.1</SystemWindowsExtensionsTestDataVersion>
161+
<MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.25071.1</MicrosoftDotNetCilStripSourcesVersion>
162162
<!-- dotnet-optimization dependencies -->
163163
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationwindows_ntx64MIBCRuntimeVersion>
164164
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationwindows_ntx86MIBCRuntimeVersion>
@@ -185,10 +185,10 @@
185185
<!-- Testing -->
186186
<MicrosoftNETCoreCoreDisToolsVersion>1.1.0</MicrosoftNETCoreCoreDisToolsVersion>
187187
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
188-
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.24510.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
189-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.24510.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
190-
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.24510.2</MicrosoftDotNetXHarnessCLIVersion>
191-
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.25063.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
188+
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.25064.4</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
189+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.25064.4</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
190+
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.25064.4</MicrosoftDotNetXHarnessCLIVersion>
191+
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.25077.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
192192
<XUnitVersion>2.4.2</XUnitVersion>
193193
<XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>
194194
<XUnitRunnerVisualStudioVersion>2.4.5</XUnitRunnerVisualStudioVersion>

‎eng/pipelines/common/platform-matrix.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ jobs:
573573
targetRid: android-x64
574574
platform: android_x64
575575
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
576-
container: linux_bionic
576+
container: android
577577
jobParameters:
578578
runtimeFlavor: mono
579579
buildConfig: ${{ parameters.buildConfig }}
@@ -613,7 +613,7 @@ jobs:
613613
targetRid: android-x86
614614
platform: android_x86
615615
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
616-
container: linux_bionic
616+
container: android
617617
jobParameters:
618618
runtimeFlavor: mono
619619
buildConfig: ${{ parameters.buildConfig }}
@@ -633,7 +633,7 @@ jobs:
633633
targetRid: android-arm
634634
platform: android_arm
635635
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
636-
container: linux_bionic
636+
container: android
637637
jobParameters:
638638
runtimeFlavor: mono
639639
buildConfig: ${{ parameters.buildConfig }}
@@ -653,7 +653,7 @@ jobs:
653653
targetRid: android-arm64
654654
platform: android_arm64
655655
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
656-
container: linux_bionic
656+
container: android
657657
jobParameters:
658658
runtimeFlavor: mono
659659
buildConfig: ${{ parameters.buildConfig }}

0 commit comments

Comments
 (0)