Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
c43ad87
Merge pull request #95162 from dotnet-maestro-bot/merge/release/7.0-t…
carlossanlop Nov 27, 2023
ff6db23
Remove jit-format job in .NET 7.0 branch (#95422)
BruceForstall Nov 30, 2023
d395d95
Update Perf Android jobs to use the Windows 11 Pixel Queue. (#95656)
github-actions[bot] Dec 5, 2023
9f6b5d6
Bump target SDK version for Android sample (#95770)
fanyang-mono Dec 11, 2023
ec675fb
[release/7.0-staging] [tests] Disables tests on Apple mobile platform…
github-actions[bot] Dec 12, 2023
d776e5e
Add performance android build specific platform-matrix entry with spe…
LoopedBard3 Dec 13, 2023
6c8ab42
Update osx.1015 to osx.13. (#96149)
github-actions[bot] Dec 20, 2023
6d21550
Temporarily disable NoCallback_RevokedCertificate_NoRevocationCheckin…
github-actions[bot] Jan 4, 2024
d1c3b52
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Jan 10, 2024
06e9a55
[release/7.0][android] Bump to win 11 helix queue (#96718)
steveisok Jan 10, 2024
b7b55af
[release/7.0] Fix SslStream.IsMutuallyAuthenticated (#95733)
rzikm Jan 10, 2024
c42b060
Merge pull request #96723 from dotnet-maestro-bot/merge/release/7.0-t…
carlossanlop Jan 10, 2024
723ceef
[release/7.0] Use NuGetAuthenticate@1 instead of @0 (#96651) (#96667)
akoeplinger Jan 10, 2024
ed38f20
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] Jan 10, 2024
7253eaa
Update dependencies from https://github.com/dotnet/hotreload-utils bu…
dotnet-maestro[bot] Jan 10, 2024
5e3302b
Update dependencies from https://github.com/dotnet/icu build 20240110…
dotnet-maestro[bot] Jan 10, 2024
84eb5d0
Fix build of IJW test after VS upgrade (#96788)
github-actions[bot] Jan 11, 2024
62d3b43
[release/7.0-staging] Update dependencies from dotnet/emsdk (#96489)
dotnet-maestro[bot] Jan 12, 2024
80a5e32
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Jan 12, 2024
1a19e1c
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jan 12, 2024
daeac23
Fix memory leak on OCSP_Response (#96578)
github-actions[bot] Jan 16, 2024
a314c5b
Disable implicit rejection for RSA PKCS#1 (#95217)
github-actions[bot] Jan 16, 2024
7a97ad4
[release/7.0] Fix server-side OCSP stapling on Linux (#96808)
rzikm Jan 16, 2024
55d07e1
Merge branch 'release/7.0' into release/7.0-staging
carlossanlop Jan 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-ca51060" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ca510604/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-33b038b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-33b038b5/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-33b038b-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-33b038b5-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-33b038b-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-33b038b5-1/nuget/v3/index.json" />
Expand Down
8 changes: 4 additions & 4 deletions docs/workflow/testing/libraries/testing-android.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ Android SDK and NDK can be automatically installed via the following script:
set -e

NDK_VER=r23c
SDK_VER=6200805_latest
SDK_API_LEVEL=29
SDK_BUILD_TOOLS=29.0.3
SDK_VER=9123335_latest
SDK_API_LEVEL=33
SDK_BUILD_TOOLS=33.0.1

if [[ "$OSTYPE" == "darwin"* ]]; then
HOST_OS=darwin
Expand Down Expand Up @@ -63,7 +63,7 @@ Android Studio offers a convenient UI:
Before running a build you might want to set the Android SDK and NDK environment variables:
```
export ANDROID_SDK_ROOT=<PATH-TO-ANDROID-SDK>
export ANDROID_NDK_ROOT=<PATH-TO-ANDROID-NDK>
export ANDROID_NDK_ROOT=<PATH-TO-ANDROID-NDK>
```

Now we're ready to build everything for Android:
Expand Down
72 changes: 36 additions & 36 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="7.0.0-rtm.23565.2">
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="7.0.0-rtm.24060.3">
<Uri>https://github.com/dotnet/icu</Uri>
<Sha>d89651b995bbb9565a3674ddf77b187cb6f9f26d</Sha>
<Sha>bdaa3a0b2a204574ef4ab63bae2c4b5c6d607849</Sha>
</Dependency>
<Dependency Name="System.Net.MsQuic.Transport" Version="7.0.0-alpha.1.22459.1">
<Uri>https://github.com/dotnet/msquic</Uri>
Expand Down Expand Up @@ -48,13 +48,13 @@
<Uri>https://github.com/dotnet/command-line-api</Uri>
<Sha>5618b2d243ccdeb5c7e50a298b33b13036b4351b</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.15">
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.16">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>33b038b591f6e19c32a390333d41292cbd86d93c</Sha>
<Sha>ca510604d1667f32b4fa4653e3d3b64be8136bdc</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.15">
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.16">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>33b038b591f6e19c32a390333d41292cbd86d93c</Sha>
<Sha>ca510604d1667f32b4fa4653e3d3b64be8136bdc</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down Expand Up @@ -130,57 +130,57 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.23566.2">
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.24060.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
<Sha>8a02fa4c0dca32e1402c1926eec810b8e45948a5</Sha>
</Dependency>
<Dependency Name="System.Data.Common.TestData" Version="7.0.0-beta.23566.2">
<Dependency Name="System.Data.Common.TestData" Version="7.0.0-beta.24060.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
<Sha>8a02fa4c0dca32e1402c1926eec810b8e45948a5</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common.TestData" Version="7.0.0-beta.23566.2">
<Dependency Name="System.Drawing.Common.TestData" Version="7.0.0-beta.24060.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
<Sha>8a02fa4c0dca32e1402c1926eec810b8e45948a5</Sha>
</Dependency>
<Dependency Name="System.Formats.Tar.TestData" Version="7.0.0-beta.23566.2">
<Dependency Name="System.Formats.Tar.TestData" Version="7.0.0-beta.24060.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
<Sha>8a02fa4c0dca32e1402c1926eec810b8e45948a5</Sha>
</Dependency>
<Dependency Name="System.IO.Compression.TestData" Version="7.0.0-beta.23566.2">
<Dependency Name="System.IO.Compression.TestData" Version="7.0.0-beta.24060.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
<Sha>8a02fa4c0dca32e1402c1926eec810b8e45948a5</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging.TestData" Version="7.0.0-beta.23566.2">
<Dependency Name="System.IO.Packaging.TestData" Version="7.0.0-beta.24060.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
<Sha>8a02fa4c0dca32e1402c1926eec810b8e45948a5</Sha>
</Dependency>
<Dependency Name="System.Net.TestData" Version="7.0.0-beta.23566.2">
<Dependency Name="System.Net.TestData" Version="7.0.0-beta.24060.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
<Sha>8a02fa4c0dca32e1402c1926eec810b8e45948a5</Sha>
</Dependency>
<Dependency Name="System.Private.Runtime.UnicodeData" Version="7.0.0-beta.23566.2">
<Dependency Name="System.Private.Runtime.UnicodeData" Version="7.0.0-beta.24060.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
<Sha>8a02fa4c0dca32e1402c1926eec810b8e45948a5</Sha>
</Dependency>
<Dependency Name="System.Runtime.TimeZoneData" Version="7.0.0-beta.23566.2">
<Dependency Name="System.Runtime.TimeZoneData" Version="7.0.0-beta.24060.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
<Sha>8a02fa4c0dca32e1402c1926eec810b8e45948a5</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="7.0.0-beta.23566.2">
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="7.0.0-beta.24060.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
<Sha>8a02fa4c0dca32e1402c1926eec810b8e45948a5</Sha>
</Dependency>
<Dependency Name="System.Text.RegularExpressions.TestData" Version="7.0.0-beta.23566.2">
<Dependency Name="System.Text.RegularExpressions.TestData" Version="7.0.0-beta.24060.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
<Sha>8a02fa4c0dca32e1402c1926eec810b8e45948a5</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions.TestData" Version="7.0.0-beta.23566.2">
<Dependency Name="System.Windows.Extensions.TestData" Version="7.0.0-beta.24060.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
<Sha>8a02fa4c0dca32e1402c1926eec810b8e45948a5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="7.0.0-beta.23566.2">
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="7.0.0-beta.24060.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
<Sha>8a02fa4c0dca32e1402c1926eec810b8e45948a5</Sha>
</Dependency>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.23115.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
Expand Down Expand Up @@ -278,13 +278,13 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>5e0b0da43f660de5798186f4fd3bc900fc90576c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="7.0.0-alpha.0.23566.1">
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="7.0.0-alpha.0.24060.2">
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
<Sha>6d7ba7d63a9c246a6477bda4d19c3315fd91868f</Sha>
<Sha>74472cc407fe757b9479fd78cdb64d7d6e67935f</Sha>
</Dependency>
<Dependency Name="System.Runtime.Numerics.TestData" Version="7.0.0-beta.23566.2">
<Dependency Name="System.Runtime.Numerics.TestData" Version="7.0.0-beta.24060.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>ddb9487d79d1ba17a4fd872ffafe5f1cd7b406d6</Sha>
<Sha>8a02fa4c0dca32e1402c1926eec810b8e45948a5</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22559.1">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
Expand Down
36 changes: 18 additions & 18 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
<UsingToolIbcOptimization>false</UsingToolIbcOptimization>
<UsingToolXliff>false</UsingToolXliff>
<LastReleasedStableAssemblyVersion>$(AssemblyVersion)</LastReleasedStableAssemblyVersion>
<MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.15</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>
<MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.15</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>
<MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.16</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>
<MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.16</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>
</PropertyGroup>
<ItemGroup>
<!-- The bands we want to produce workload manifests for -->
Expand Down Expand Up @@ -118,20 +118,20 @@
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
<runtimenativeSystemIOPortsVersion>7.0.0-rc.1.22414.6</runtimenativeSystemIOPortsVersion>
<!-- Runtime-Assets dependencies -->
<SystemRuntimeNumericsTestDataVersion>7.0.0-beta.23566.2</SystemRuntimeNumericsTestDataVersion>
<SystemComponentModelTypeConverterTestDataVersion>7.0.0-beta.23566.2</SystemComponentModelTypeConverterTestDataVersion>
<SystemDataCommonTestDataVersion>7.0.0-beta.23566.2</SystemDataCommonTestDataVersion>
<SystemDrawingCommonTestDataVersion>7.0.0-beta.23566.2</SystemDrawingCommonTestDataVersion>
<SystemFormatsTarTestDataVersion>7.0.0-beta.23566.2</SystemFormatsTarTestDataVersion>
<SystemIOCompressionTestDataVersion>7.0.0-beta.23566.2</SystemIOCompressionTestDataVersion>
<SystemIOPackagingTestDataVersion>7.0.0-beta.23566.2</SystemIOPackagingTestDataVersion>
<SystemNetTestDataVersion>7.0.0-beta.23566.2</SystemNetTestDataVersion>
<SystemPrivateRuntimeUnicodeDataVersion>7.0.0-beta.23566.2</SystemPrivateRuntimeUnicodeDataVersion>
<SystemRuntimeTimeZoneDataVersion>7.0.0-beta.23566.2</SystemRuntimeTimeZoneDataVersion>
<SystemSecurityCryptographyX509CertificatesTestDataVersion>7.0.0-beta.23566.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemTextRegularExpressionsTestDataVersion>7.0.0-beta.23566.2</SystemTextRegularExpressionsTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>7.0.0-beta.23566.2</SystemWindowsExtensionsTestDataVersion>
<MicrosoftDotNetCilStripSourcesVersion>7.0.0-beta.23566.2</MicrosoftDotNetCilStripSourcesVersion>
<SystemRuntimeNumericsTestDataVersion>7.0.0-beta.24060.3</SystemRuntimeNumericsTestDataVersion>
<SystemComponentModelTypeConverterTestDataVersion>7.0.0-beta.24060.3</SystemComponentModelTypeConverterTestDataVersion>
<SystemDataCommonTestDataVersion>7.0.0-beta.24060.3</SystemDataCommonTestDataVersion>
<SystemDrawingCommonTestDataVersion>7.0.0-beta.24060.3</SystemDrawingCommonTestDataVersion>
<SystemFormatsTarTestDataVersion>7.0.0-beta.24060.3</SystemFormatsTarTestDataVersion>
<SystemIOCompressionTestDataVersion>7.0.0-beta.24060.3</SystemIOCompressionTestDataVersion>
<SystemIOPackagingTestDataVersion>7.0.0-beta.24060.3</SystemIOPackagingTestDataVersion>
<SystemNetTestDataVersion>7.0.0-beta.24060.3</SystemNetTestDataVersion>
<SystemPrivateRuntimeUnicodeDataVersion>7.0.0-beta.24060.3</SystemPrivateRuntimeUnicodeDataVersion>
<SystemRuntimeTimeZoneDataVersion>7.0.0-beta.24060.3</SystemRuntimeTimeZoneDataVersion>
<SystemSecurityCryptographyX509CertificatesTestDataVersion>7.0.0-beta.24060.3</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemTextRegularExpressionsTestDataVersion>7.0.0-beta.24060.3</SystemTextRegularExpressionsTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>7.0.0-beta.24060.3</SystemWindowsExtensionsTestDataVersion>
<MicrosoftDotNetCilStripSourcesVersion>7.0.0-beta.24060.3</MicrosoftDotNetCilStripSourcesVersion>
<!-- dotnet-optimization dependencies -->
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.22415.6</optimizationwindows_ntx64MIBCRuntimeVersion>
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.22415.6</optimizationwindows_ntx86MIBCRuntimeVersion>
Expand All @@ -157,7 +157,7 @@
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>7.0.0-prerelease.24054.3</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>7.0.0-prerelease.24054.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>7.0.0-prerelease.24054.3</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>7.0.0-alpha.0.23566.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>7.0.0-alpha.0.24060.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<XUnitVersion>2.4.2</XUnitVersion>
<XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>
<XUnitRunnerVisualStudioVersion>2.4.5</XUnitRunnerVisualStudioVersion>
Expand All @@ -177,7 +177,7 @@
<MicrosoftNETILLinkTasksVersion>7.0.100-1.23401.1</MicrosoftNETILLinkTasksVersion>
<MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
<!-- ICU -->
<MicrosoftNETCoreRuntimeICUTransportVersion>7.0.0-rtm.23565.2</MicrosoftNETCoreRuntimeICUTransportVersion>
<MicrosoftNETCoreRuntimeICUTransportVersion>7.0.0-rtm.24060.3</MicrosoftNETCoreRuntimeICUTransportVersion>
<!-- MsQuic -->
<MicrosoftNativeQuicMsQuicVersion>2.2.3</MicrosoftNativeQuicMsQuicVersion>
<SystemNetMsQuicTransportVersion>7.0.0-alpha.1.22459.1</SystemNetMsQuicTransportVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/native/ijw/IJW.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ if (CLR_CMAKE_HOST_WIN32)

# 4365 - signed/unsigned mismatch
# 4679 - Could not import member. This is an issue with IJW and static abstract methods in interfaces.
add_compile_options(/wd4365 /wd4679)
add_compile_options(/wd4365 /wd4679 /wd5271)

# IJW
add_compile_options(/clr:netcore)
Expand Down
23 changes: 23 additions & 0 deletions eng/pipelines/common/platform-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,29 @@ jobs:
helixQueueGroup: ${{ parameters.helixQueueGroup }}
${{ insert }}: ${{ parameters.jobParameters }}

- ${{ if containsValue(parameters.platforms, 'Android_arm64_perf_specific') }}:
- template: xplat-setup.yml
parameters:
jobTemplate: ${{ parameters.jobTemplate }}
helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
variables: ${{ parameters.variables }}
osGroup: Android
archType: arm64
targetRid: android-arm64
platform: Android_arm64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container:
image: cbl-mariner-2.0-cross-android-amd64
registry: mcr
jobParameters:
runtimeFlavor: mono
stagedBuild: ${{ parameters.stagedBuild }}
buildConfig: ${{ parameters.buildConfig }}
${{ if eq(parameters.passPlatforms, true) }}:
platforms: ${{ parameters.platforms }}
helixQueueGroup: ${{ parameters.helixQueueGroup }}
${{ insert }}: ${{ parameters.jobParameters }}

# Mac Catalyst x64

- ${{ if containsValue(parameters.platforms, 'MacCatalyst_x64') }}:
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/common/restore-internal-tools.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
steps:
- task: NuGetAuthenticate@0
- task: NuGetAuthenticate@1
inputs:
nuGetServiceConnections: 'devdiv/dotnet-core-internal-tooling'
forceReinstallCredentialProvider: true
Expand Down
10 changes: 0 additions & 10 deletions eng/pipelines/coreclr/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,3 @@ jobs:
crossgen2: true
displayNameArgs: R2R_CG2
liveLibrariesBuildConfig: Release

#
# Formatting
#
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/coreclr/templates/format-job.yml
platforms:
- Linux_x64
- windows_x64
4 changes: 2 additions & 2 deletions eng/pipelines/coreclr/perf-non-wasm-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
buildConfig: release
runtimeFlavor: mono
platforms:
- Android_arm64
- Android_arm64_perf_specific
jobParameters:
buildArgs: -s mono+libs+host+packs -c $(_BuildConfig)
nameSuffix: AndroidMono
Expand Down Expand Up @@ -314,4 +314,4 @@ jobs:
projectFile: crossgen_perf.proj
runKind: crossgen_scenarios
runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml
logicalmachine: 'perftiger_crossgen'
logicalmachine: 'perftiger_crossgen'
2 changes: 1 addition & 1 deletion eng/pipelines/coreclr/templates/helix-queues-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

# Android arm64
- ${{ if in(parameters.platform, 'Android_arm64') }}:
- Windows.10.Amd64.Android.Open
- Windows.11.Amd64.Android.Open

# Android x64
- ${{ if in(parameters.platform, 'Android_x64') }}:
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/installer/jobs/base-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ jobs:
displayName: Clean up old artifacts owned by root

- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- task: NuGetAuthenticate@0
- task: NuGetAuthenticate@1

- ${{ if eq(parameters.osGroup, 'windows') }}:
# NuGet's http cache lasts 30 minutes. If we're on a static machine, this may interfere with
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/libraries/helix-queues-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:
- ${{ if in(parameters.platform, 'Android_x86', 'Android_x64', 'Linux_bionic_x64') }}:
- Ubuntu.1804.Amd64.Android.29.Open
- ${{ if in(parameters.platform, 'Android_arm', 'Android_arm64', 'Linux_bionic_arm64') }}:
- Windows.10.Amd64.Android.Open
- Windows.11.Amd64.Android.Open

# iOS Simulator/Mac Catalyst arm64
- ${{ if in(parameters.platform, 'MacCatalyst_arm64', 'iOSSimulator_arm64') }}:
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/official/jobs/prepare-signed-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
fetchDepth: 20

- ${{ if eq(parameters.isOfficialBuild, true) }}:
- task: NuGetAuthenticate@0
- task: NuGetAuthenticate@1

- task: MicroBuildSigningPlugin@2
displayName: Install MicroBuild plugin for Signing
Expand Down
2 changes: 1 addition & 1 deletion eng/testing/performance/performance-setup.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ if ($Internal) {
"perftiger_crossgen" { $Queue = "Windows.10.Amd64.19H1.Tiger.Perf" }
"perfowl" { $Queue = "Windows.10.Amd64.20H2.Owl.Perf" }
"perfsurf" { $Queue = "Windows.10.Arm64.Perf.Surf" }
"perfpixel4a" { $Queue = "Windows.10.Amd64.Pixel.Perf" }
"perfpixel4a" { $Queue = "Windows.11.Amd64.Pixel.Perf" }
"perfampere" { $Queue = "Windows.Server.Arm64.Perf" }
Default { $Queue = "Windows.10.Amd64.19H1.Tiger.Perf" }
}
Expand Down
2 changes: 1 addition & 1 deletion eng/testing/performance/performance-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ if [[ "$internal" == true ]]; then
extra_benchmark_dotnet_arguments=

if [[ "$logical_machine" == "perfiphone12mini" ]]; then
queue=OSX.1015.Amd64.Iphone.Perf
queue=OSX.13.Amd64.Iphone.Perf
elif [[ "$logical_machine" == "perfampere" ]]; then
queue=Ubuntu.2004.Arm64.Perf
elif [[ "$architecture" == "arm64" ]]; then
Expand Down
Loading