Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[manual] Merge release/8.0-staging into release/8.0 #110335

Merged
merged 24 commits into from
Dec 2, 2024
Merged

[manual] Merge release/8.0-staging into release/8.0 #110335

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
c2c3b54
Fix a set of minor DAC bugs I encountered recently (#104919)
github-actions[bot] Oct 15, 2024
a5c5cc1
Merge pull request #108871 from dotnet/merge/release/8.0-to-release/8…
carlossanlop Oct 16, 2024
b9853dd
[release/8.0] Fix stress-http pipeline (#109140)
rzikm Oct 29, 2024
07cb490
[release/8.0] Delete accidentally checked in file: src/libraries/Syst…
akoeplinger Nov 4, 2024
2c4c6f5
Fix Version.Details.xml SHA typo (#109389)
carlossanlop Nov 4, 2024
934df87
[release/8.0-staging] Upgrade our macOS build machines to the latest …
github-actions[bot] Nov 4, 2024
77fba2f
[release/8.0-staging] handle case of Proc Index > MAX_SUPPORTED_CPUS …
github-actions[bot] Nov 6, 2024
c489a8c
[release/8.0-staging] [android] Fix crash in method_to_ir (#109511)
github-actions[bot] Nov 8, 2024
295b503
fix redundant CRLF response during SMTP negotiate (#109112)
github-actions[bot] Nov 12, 2024
84ab9ed
Disable user mapper for SslStream on Windows (TLS 1.3) (#100833) (#10…
rzikm Nov 14, 2024
315a900
Use Fedora 38 helix queue instead of 39, like in main (#109964)
akoeplinger Nov 19, 2024
36320b3
Suppress IL3000 in MsQuicApi constructor (#109965)
rzikm Nov 25, 2024
f569844
[release/8.0-staging] Ensure proper cleanup of key files when not per…
github-actions[bot] Nov 25, 2024
3989aac
Fix an issue with sysconf returning the wrong last level cache values…
mrsharm Nov 26, 2024
12b8d83
[release/8.0-staging] Transfer ThreadPool local queue to high-pri que…
github-actions[bot] Nov 26, 2024
905ce13
[release/8.0-staging] Fix stubs for `HybridGlobalization` to fix publ…
ilonatommy Nov 28, 2024
8196679
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Dec 2, 2024
a6d99af
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Dec 2, 2024
2c19a80
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] Dec 2, 2024
84e7308
[release/8.0-staging] Update dependencies from dotnet/hotreload-utils…
dotnet-maestro[bot] Dec 2, 2024
a89b04c
Update dependencies from https://github.com/dotnet/source-build-exter…
dotnet-maestro[bot] Dec 2, 2024
0a843bb
Pin the 6.0.x downlevel versions to 6.0.36 (#110329)
lewing Dec 2, 2024
18ee482
Merge branch 'release/8.0-staging' into merge/release/8.0-to-release/…
carlossanlop Dec 2, 2024
c844b49
Merge pull request #109566 from dotnet/merge/release/8.0-to-release/8…
carlossanlop Dec 2, 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
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "8.0.0-prerelease.24480.1",
"version": "8.0.0-prerelease.24510.2",
"commands": [
"xharness"
]
Expand Down
5 changes: 5 additions & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
<!--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-c458a76" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-f623714" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-f6237140/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-f623714-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-f6237140-4/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-f623714-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-f6237140-3/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-f623714-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-f6237140-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-f623714-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-f6237140-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-sdk -->
<!-- End: Package sources from dotnet-sdk -->
Expand Down
78 changes: 39 additions & 39 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.command-line-api" Version="0.1.430701">
<Uri>https://github.com/dotnet/command-line-api</Uri>
<Sha>02fe27cd6a9b001c8feb7938e6ef4b3799745759b</Sha>
<Sha>02fe27cd6a9b001c8feb7938e6ef4b3799745759</Sha>
<SourceBuild RepoName="command-line-api" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23509.2">
Expand All @@ -104,9 +104,9 @@
<Sha>fe3794a68bd668d36d4d5014a9e6c9d22c0e6d86</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.24510.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.24516.2">
<Uri>https://github.com/dotnet/source-build-externals</Uri>
<Sha>d4feb7e49067fc9bbf7dfb9fa76a326c33fa0595</Sha>
<Sha>3b85d089311e89b47758ba6a84eeb79374476dc8</Sha>
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
</Dependency>
</ProductDependencies>
Expand Down Expand Up @@ -185,57 +185,57 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.24510.3">
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.24517.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
<Sha>e57d39e720c9dba0d4efe7ab260c45678bebf621</Sha>
</Dependency>
<Dependency Name="System.Data.Common.TestData" Version="8.0.0-beta.24510.3">
<Dependency Name="System.Data.Common.TestData" Version="8.0.0-beta.24517.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
<Sha>e57d39e720c9dba0d4efe7ab260c45678bebf621</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common.TestData" Version="8.0.0-beta.24510.3">
<Dependency Name="System.Drawing.Common.TestData" Version="8.0.0-beta.24517.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
<Sha>e57d39e720c9dba0d4efe7ab260c45678bebf621</Sha>
</Dependency>
<Dependency Name="System.Formats.Tar.TestData" Version="8.0.0-beta.24510.3">
<Dependency Name="System.Formats.Tar.TestData" Version="8.0.0-beta.24517.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
<Sha>e57d39e720c9dba0d4efe7ab260c45678bebf621</Sha>
</Dependency>
<Dependency Name="System.IO.Compression.TestData" Version="8.0.0-beta.24510.3">
<Dependency Name="System.IO.Compression.TestData" Version="8.0.0-beta.24517.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
<Sha>e57d39e720c9dba0d4efe7ab260c45678bebf621</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging.TestData" Version="8.0.0-beta.24510.3">
<Dependency Name="System.IO.Packaging.TestData" Version="8.0.0-beta.24517.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
<Sha>e57d39e720c9dba0d4efe7ab260c45678bebf621</Sha>
</Dependency>
<Dependency Name="System.Net.TestData" Version="8.0.0-beta.24510.3">
<Dependency Name="System.Net.TestData" Version="8.0.0-beta.24517.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
<Sha>e57d39e720c9dba0d4efe7ab260c45678bebf621</Sha>
</Dependency>
<Dependency Name="System.Private.Runtime.UnicodeData" Version="8.0.0-beta.24510.3">
<Dependency Name="System.Private.Runtime.UnicodeData" Version="8.0.0-beta.24517.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
<Sha>e57d39e720c9dba0d4efe7ab260c45678bebf621</Sha>
</Dependency>
<Dependency Name="System.Runtime.TimeZoneData" Version="8.0.0-beta.24510.3">
<Dependency Name="System.Runtime.TimeZoneData" Version="8.0.0-beta.24517.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
<Sha>e57d39e720c9dba0d4efe7ab260c45678bebf621</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="8.0.0-beta.24510.3">
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="8.0.0-beta.24517.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
<Sha>e57d39e720c9dba0d4efe7ab260c45678bebf621</Sha>
</Dependency>
<Dependency Name="System.Text.RegularExpressions.TestData" Version="8.0.0-beta.24510.3">
<Dependency Name="System.Text.RegularExpressions.TestData" Version="8.0.0-beta.24517.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
<Sha>e57d39e720c9dba0d4efe7ab260c45678bebf621</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions.TestData" Version="8.0.0-beta.24510.3">
<Dependency Name="System.Windows.Extensions.TestData" Version="8.0.0-beta.24517.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
<Sha>e57d39e720c9dba0d4efe7ab260c45678bebf621</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="8.0.0-beta.24510.3">
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="8.0.0-beta.24517.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
<Sha>e57d39e720c9dba0d4efe7ab260c45678bebf621</Sha>
</Dependency>
<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">
<Uri>https://github.com/dotnet/llvm-project</Uri>
Expand Down Expand Up @@ -322,17 +322,17 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>edbd5c769a19798b6955050baccf99e6797d3208</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.24480.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.24510.2">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>2195e37696de37d2c2b0f83d73f49c96d9b584de</Sha>
<Sha>8c90d68ba97c7ee54d09fccb854f77ed0f9419ef</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.24480.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.24510.2">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>2195e37696de37d2c2b0f83d73f49c96d9b584de</Sha>
<Sha>8c90d68ba97c7ee54d09fccb854f77ed0f9419ef</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.24480.1">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.24510.2">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>2195e37696de37d2c2b0f83d73f49c96d9b584de</Sha>
<Sha>8c90d68ba97c7ee54d09fccb854f77ed0f9419ef</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.24516.1">
<Uri>https://github.com/dotnet/arcade</Uri>
Expand All @@ -354,13 +354,13 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>67613417f5e1af250e6ddfba79f8f2885d8e90fb</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="8.0.0-alpha.0.24514.2">
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="8.0.0-alpha.0.24530.1">
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
<Sha>ef1f3313ca21d4eb766aefc48ea243421be2643f</Sha>
<Sha>b1aa9c34c5eaaf5a71b9b54db6978230fae4eb36</Sha>
</Dependency>
<Dependency Name="System.Runtime.Numerics.TestData" Version="8.0.0-beta.24510.3">
<Dependency Name="System.Runtime.Numerics.TestData" Version="8.0.0-beta.24517.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
<Sha>e57d39e720c9dba0d4efe7ab260c45678bebf621</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-7.23566.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
Expand Down
38 changes: 19 additions & 19 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<PatchVersion>12</PatchVersion>
<SdkBandVersion>8.0.100</SdkBandVersion>
<PackageVersionNet7>7.0.20</PackageVersionNet7>
<PackageVersionNet6>6.0.$([MSBuild]::Add($(PatchVersion),25))</PackageVersionNet6>
<PackageVersionNet6>6.0.36</PackageVersionNet6>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<PreReleaseVersionIteration>
</PreReleaseVersionIteration>
Expand Down Expand Up @@ -145,20 +145,20 @@
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
<runtimenativeSystemIOPortsVersion>8.0.0-rc.1.23406.6</runtimenativeSystemIOPortsVersion>
<!-- Runtime-Assets dependencies -->
<SystemRuntimeNumericsTestDataVersion>8.0.0-beta.24510.3</SystemRuntimeNumericsTestDataVersion>
<SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.24510.3</SystemComponentModelTypeConverterTestDataVersion>
<SystemDataCommonTestDataVersion>8.0.0-beta.24510.3</SystemDataCommonTestDataVersion>
<SystemDrawingCommonTestDataVersion>8.0.0-beta.24510.3</SystemDrawingCommonTestDataVersion>
<SystemFormatsTarTestDataVersion>8.0.0-beta.24510.3</SystemFormatsTarTestDataVersion>
<SystemIOCompressionTestDataVersion>8.0.0-beta.24510.3</SystemIOCompressionTestDataVersion>
<SystemIOPackagingTestDataVersion>8.0.0-beta.24510.3</SystemIOPackagingTestDataVersion>
<SystemNetTestDataVersion>8.0.0-beta.24510.3</SystemNetTestDataVersion>
<SystemPrivateRuntimeUnicodeDataVersion>8.0.0-beta.24510.3</SystemPrivateRuntimeUnicodeDataVersion>
<SystemRuntimeTimeZoneDataVersion>8.0.0-beta.24510.3</SystemRuntimeTimeZoneDataVersion>
<SystemSecurityCryptographyX509CertificatesTestDataVersion>8.0.0-beta.24510.3</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemTextRegularExpressionsTestDataVersion>8.0.0-beta.24510.3</SystemTextRegularExpressionsTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.24510.3</SystemWindowsExtensionsTestDataVersion>
<MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.24510.3</MicrosoftDotNetCilStripSourcesVersion>
<SystemRuntimeNumericsTestDataVersion>8.0.0-beta.24517.1</SystemRuntimeNumericsTestDataVersion>
<SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.24517.1</SystemComponentModelTypeConverterTestDataVersion>
<SystemDataCommonTestDataVersion>8.0.0-beta.24517.1</SystemDataCommonTestDataVersion>
<SystemDrawingCommonTestDataVersion>8.0.0-beta.24517.1</SystemDrawingCommonTestDataVersion>
<SystemFormatsTarTestDataVersion>8.0.0-beta.24517.1</SystemFormatsTarTestDataVersion>
<SystemIOCompressionTestDataVersion>8.0.0-beta.24517.1</SystemIOCompressionTestDataVersion>
<SystemIOPackagingTestDataVersion>8.0.0-beta.24517.1</SystemIOPackagingTestDataVersion>
<SystemNetTestDataVersion>8.0.0-beta.24517.1</SystemNetTestDataVersion>
<SystemPrivateRuntimeUnicodeDataVersion>8.0.0-beta.24517.1</SystemPrivateRuntimeUnicodeDataVersion>
<SystemRuntimeTimeZoneDataVersion>8.0.0-beta.24517.1</SystemRuntimeTimeZoneDataVersion>
<SystemSecurityCryptographyX509CertificatesTestDataVersion>8.0.0-beta.24517.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemTextRegularExpressionsTestDataVersion>8.0.0-beta.24517.1</SystemTextRegularExpressionsTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.24517.1</SystemWindowsExtensionsTestDataVersion>
<MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.24517.1</MicrosoftDotNetCilStripSourcesVersion>
<!-- dotnet-optimization dependencies -->
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationwindows_ntx64MIBCRuntimeVersion>
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationwindows_ntx86MIBCRuntimeVersion>
Expand All @@ -185,10 +185,10 @@
<!-- Testing -->
<MicrosoftNETCoreCoreDisToolsVersion>1.1.0</MicrosoftNETCoreCoreDisToolsVersion>
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.24480.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.24480.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.24480.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.24514.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.24510.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.24510.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.24510.2</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.24530.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<XUnitVersion>2.4.2</XUnitVersion>
<XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>
<XUnitRunnerVisualStudioVersion>2.4.5</XUnitRunnerVisualStudioVersion>
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/common/xplat-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,12 +173,12 @@ jobs:

# OSX Public Build Pool (we don't have on-prem OSX BuildPool).
${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), eq(variables['System.TeamProject'], 'public')) }}:
vmImage: 'macos-12'
vmImage: 'macos-13'

# OSX Internal Pool
${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), ne(variables['System.TeamProject'], 'public')) }}:
name: "Azure Pipelines"
vmImage: 'macOS-12'
vmImage: 'macOS-13'
os: macOS

# Official Build Windows Pool
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/coreclr/perf-non-wasm-jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ jobs:
nameSuffix: PerfBDNApp
isOfficialBuild: false
pool:
vmImage: 'macos-12'
vmImage: 'macos-13'
postBuildSteps:
- template: /eng/pipelines/coreclr/templates/build-perf-bdn-app.yml
parameters:
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/libraries/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@ jobs:
- ${{ if and(eq(parameters.jobParameters.testScope, 'outerloop'), eq(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
- SLES.15.Amd64.Open
- (Centos.9.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:centos-stream9-helix
- (Fedora.39.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-39-helix
- (Fedora.38.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-38-helix
- (Ubuntu.2204.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-22.04-helix-amd64
- (Debian.12.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-12-helix-amd64
- ${{ if or(ne(parameters.jobParameters.testScope, 'outerloop'), ne(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
- ${{ if or(eq(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
- SLES.15.Amd64.Open
- (Fedora.39.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-39-helix
- (Fedora.38.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-38-helix
- Ubuntu.2204.Amd64.Open
- (Debian.12.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-12-helix-amd64
- (Mariner.2.0.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64
Expand Down
6 changes: 5 additions & 1 deletion eng/pipelines/libraries/stress/http.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ extends:
DUMPS_SHARE_MOUNT_ROOT: "/dumps-share"
pool:
name: $(DncEngPublicBuildPool)
demands: ImageOverride -equals 1es-ubuntu-2204-open
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open

steps:
- checkout: self
Expand Down Expand Up @@ -128,6 +128,10 @@ extends:
displayName: Build CLR and Libraries

- powershell: |
$env:CLIENT_DUMPS_SHARE="$(Build.ArtifactStagingDirectory)/dumps/client/"
$env:SERVER_DUMPS_SHARE="$(Build.ArtifactStagingDirectory)/dumps/server/"
New-Item -Force $env:CLIENT_DUMPS_SHARE -ItemType Directory
New-Item -Force $env:SERVER_DUMPS_SHARE -ItemType Directory
$(httpStressProject)/run-docker-compose.ps1 -w -o -c $(BUILD_CONFIGURATION) -t $(sdkBaseImage)
echo "##vso[task.setvariable variable=succeeded;isOutput=true]true"
name: buildStress
Expand Down
Loading
Loading