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/6.0-staging into release/6.0 #108861

Merged
merged 12 commits into from
Oct 15, 2024
Merged

[manual] Merge release/6.0-staging into release/6.0 #108861

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
840f4d3
Merge pull request #107592 from dotnet/merge/release/6.0-to-release/6…
carlossanlop Sep 26, 2024
313497f
[release/6.0-staging] Revert `Linux_arm` images to `ubuntu-16.04` (#1…
amanasifkhalid Sep 30, 2024
8b6500b
Update RedHat 7 -> 8 -- release/6.0-staging (#105063)
richlander Oct 3, 2024
a76ac8e
Merge branch 'release/6.0-staging' into merge/release/6.0-to-release/…
carlossanlop Oct 3, 2024
53cf259
Merge pull request #108496 from dotnet/merge/release/6.0-to-release/6…
carlossanlop Oct 3, 2024
ed9b95f
Merge pull request #108714 from dotnet/merge/release/6.0-to-release/6…
carlossanlop Oct 14, 2024
b6afae1
[release/6.0-staging] Update dependencies from dotnet/xharness (#107756)
dotnet-maestro[bot] Oct 14, 2024
ff95197
[release/6.0-staging] Update dependencies from dotnet/icu (#107764)
dotnet-maestro[bot] Oct 14, 2024
d73158c
[release/6.0-staging] Update dependencies from dotnet/hotreload-utils…
dotnet-maestro[bot] Oct 14, 2024
ba80929
[release/6.0] Reduce net core app current package dependencies, incre…
ericstj Oct 14, 2024
f0ecf8f
[release/6.0-staging] Update dependencies from dotnet/runtime-assets …
dotnet-maestro[bot] Oct 15, 2024
335f13a
[release/6.0-staging] Update dependencies from dotnet/arcade (#108300)
dotnet-maestro[bot] Oct 15, 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": "6.0.0-prerelease.24224.2",
"version": "6.0.0-prerelease.24467.2",
"commands": [
"xharness"
]
Expand Down
9 changes: 3 additions & 6 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,10 @@
<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-ec74ec8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec74ec8f/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-ec74ec8-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec74ec8f-5/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-ec74ec8-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec74ec8f-4/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-ec74ec8-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec74ec8f-3/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-ec74ec8-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec74ec8f-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-ec74ec8-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec74ec8f-1/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-c68eace" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c68eace1/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-c68eace-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c68eace1-3/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-c68eace-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c68eace1-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-c68eace-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c68eace1-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-wcf -->
<!-- End: Package sources from dotnet-wcf -->
Expand Down
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-rtm.24315.1">
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-rtm.24510.4">
<Uri>https://github.com/dotnet/icu</Uri>
<Sha>20d255e341e98186edf70b24aa52fdd81797cc51</Sha>
<Sha>c19fc3e62ccdc92489c82d7aad8d58eca86ce166</Sha>
</Dependency>
<Dependency Name="System.Net.MsQuic.Transport" Version="6.0.0-servicing.22205.1">
<Uri>https://github.com/dotnet/msquic</Uri>
Expand Down Expand Up @@ -214,13 +214,13 @@
<Uri>https://github.com/mono/linker</Uri>
<Sha>c8499798a2a09639174e2f5c694d6652794cc73d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="6.0.0-prerelease.24224.2">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="6.0.0-prerelease.24467.2">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>d1dd9c2ce3fc0b9358d2cda64c52d052d1a612c1</Sha>
<Sha>c77d400d1c31f721ad585970c4ba8586e2f86b51</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="6.0.0-prerelease.24224.2">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="6.0.0-prerelease.24467.2">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>d1dd9c2ce3fc0b9358d2cda64c52d052d1a612c1</Sha>
<Sha>c77d400d1c31f721ad585970c4ba8586e2f86b51</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.24413.1">
<Uri>https://github.com/dotnet/arcade</Uri>
Expand All @@ -242,9 +242,9 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>d50065944d8b41d804448a7056351481d583ad3d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="6.0.0-alpha.0.24402.2">
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="6.0.0-alpha.0.24511.1">
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
<Sha>036e630c228a06e61db385ecbe2b96ad995b0f61</Sha>
<Sha>862404d0de2399be339effabad912c7f6027fc20</Sha>
</Dependency>
<Dependency Name="System.Runtime.Numerics.TestData" Version="6.0.0-beta.24362.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,9 @@
<!-- Testing -->
<MicrosoftNETCoreCoreDisToolsVersion>1.0.1-prerelease-00006</MicrosoftNETCoreCoreDisToolsVersion>
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>6.0.0-prerelease.24224.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>6.0.0-prerelease.24224.2</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>6.0.0-alpha.0.24402.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>6.0.0-prerelease.24467.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>6.0.0-prerelease.24467.2</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>6.0.0-alpha.0.24511.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<XUnitVersion>2.4.2-pre.9</XUnitVersion>
<XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion>
<CoverletCollectorVersion>1.3.0</CoverletCollectorVersion>
Expand All @@ -162,7 +162,7 @@
<MicrosoftNETILLinkTasksVersion>6.0.100-1.21459.1</MicrosoftNETILLinkTasksVersion>
<MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
<!-- ICU -->
<MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-rtm.24315.1</MicrosoftNETCoreRuntimeICUTransportVersion>
<MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-rtm.24510.4</MicrosoftNETCoreRuntimeICUTransportVersion>
<!-- MsQuic -->
<SystemNetMsQuicTransportVersion>6.0.0-servicing.22205.1</SystemNetMsQuicTransportVersion>
<!-- Mono LLVM -->
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/common/templates/pipeline-with-resources.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ extends:

containers:
Linux_arm:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm-20220907130538-70ed2e8
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-20210719121212-8a8d3be
env:
ROOTFS_DIR: /crossrootfs/arm

Expand All @@ -35,7 +35,7 @@ extends:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.13-WithNode-20210910135845-c401c85

Linux_musl_arm:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm-alpine-20220915134743-78f7860
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm-alpine-20210719121212-044d5b9
env:
ROOTFS_DIR: /crossrootfs/arm

Expand Down
6 changes: 3 additions & 3 deletions eng/pipelines/coreclr/templates/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- (Debian.12.Arm32)Ubuntu.2204.Armarch@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-arm32v7
- (Debian.11.Arm32)Ubuntu.2204.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm32v7
- (Ubuntu.2004.Arm32)Ubuntu.1804.Armarch@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7
- (Ubuntu.1804.Arm32)Ubuntu.1804.Armarch@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7

# Linux arm64
- ${{ if eq(parameters.platform, 'Linux_arm64') }}:
Expand Down Expand Up @@ -92,13 +92,13 @@ jobs:
- (Debian.12.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-amd64
- (Debian.11.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64
- Ubuntu.2004.Amd64.Open
- RedHat.7.Amd64.Open
- (Centos.7.Amd64.Open)Ubuntu.2204.Amd64.Open.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- (Debian.12.Amd64)Ubuntu.2204.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-amd64
- (Debian.11.Amd64)Ubuntu.2204.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64
- Ubuntu.2004.Amd64
- (Fedora.39.Amd64)Ubuntu.2204.amd64.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39-helix
- RedHat.7.Amd64
- (Centos.7.Amd64.Open)Ubuntu.2204.Amd64.Open.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix

# OSX arm64
- ${{ if eq(parameters.platform, 'OSX_arm64') }}:
Expand Down
7 changes: 3 additions & 4 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 @@ -54,15 +54,15 @@ jobs:
- ${{ if eq(parameters.platform, 'Linux_x64') }}:
- ${{ if and(eq(parameters.jobParameters.interpreter, ''), ne(parameters.jobParameters.isSingleFile, true)) }}:
- ${{ if and(eq(parameters.jobParameters.testScope, 'outerloop'), eq(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
- RedHat.7.Amd64.Open
- (Centos.7.Amd64.Open)Ubuntu.2204.Amd64.Open.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix
- SLES.15.Amd64.Open
- (Fedora.39.Amd64.Open)ubuntu.2204.amd64.open.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39-helix
- ubuntu.2204.amd64.open.svc
- (Debian.11.Amd64.Open)ubuntu.2204.amd64.open.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64
- ${{ if or(ne(parameters.jobParameters.testScope, 'outerloop'), ne(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
- ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
- (Centos.7.Amd64.Open)Ubuntu.2204.Amd64.Open.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix
- RedHat.7.Amd64.Open
- (Centos.9.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9-helix
- Ubuntu.2004.Amd64.Open
- SLES.12.Amd64.Open
- SLES.15.Amd64.Open
Expand All @@ -71,8 +71,7 @@ jobs:
- (Debian.11.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64
- (Mariner.2.0.Amd64.Open)ubuntu.2204.amd64.open.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix
- ${{ if eq(parameters.jobParameters.isFullMatrix, false) }}:
- (Centos.7.Amd64.Open)Ubuntu.2204.Amd64.Open.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9-helix
- RedHat.7.Amd64.Open
- (Centos.7.Amd64.Open)Ubuntu.2204.Amd64.Open.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix
- (Debian.11.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64
- Ubuntu.2004.Amd64.Open
- ${{ if or(eq(parameters.jobParameters.interpreter, 'true'), eq(parameters.jobParameters.isSingleFile, true)) }}:
Expand Down
Loading