mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'release/8.0.3xx' into nagilson-fix-ivo

Browse source
This commit is contained in:
Noah Gilson 2024-04-19 17:02:43 -07:00 • committed by GitHub
commit 8fdc364080
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 69 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.config/dotnet-tools.json
View file

@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"microsoft.dotnet.darc": {
"version": "1.1.0-beta.24217.2",
"version": "1.1.0-beta.24219.1",
"commands": [
"darc"
]

6
.vsts-ci.yml
View file

@ -64,8 +64,8 @@ extends:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39
ubuntu2204:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04
ubuntu2204CrossArmAlpine:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine
mariner20CrossArm:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:mariner-2.0-cross-arm
ubuntu2204DebPkg:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
sdl:
@ -233,7 +233,7 @@ extends:
parameters:
agentOs: Linux
jobName: Build_Linux_musl_Release_arm
container: ubuntu2204CrossArmAlpine
container: mariner20CrossArm
buildConfiguration: Release
buildArchitecture: arm
runtimeIdentifier: 'linux-musl-arm'

2
.vsts-pr.yml
View file

@ -203,7 +203,7 @@ stages:
parameters:
agentOs: Linux
jobName: Build_Linux_musl_Release_arm
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine'
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:mariner-2.0-cross-arm'
buildConfiguration: Release
buildArchitecture: arm
runtimeIdentifier: 'linux-musl-arm'

2
NuGet.config
View file

@ -15,7 +15,7 @@
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-windowsdesktop -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<add key="darc-pub-DotNet-msbuild-Trusted-fc97b2d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-fc97b2d1/nuget/v3/index.json" />
<add key="darc-pub-DotNet-msbuild-Trusted-10fbfbf" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-10fbfbf2/nuget/v3/index.json" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-runtime -->
<!-- End: Package sources from dotnet-runtime -->

28
eng/Version.Details.xml
View file

@ -85,22 +85,22 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.300-preview.24217.11">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.300-preview.24218.5">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>d8c64264eeff1bc6aa543d064ba1bc74cabf06d6</Sha>
<Sha>738bfb1d41ed4dcbdbf59be8f7ae2fe11dbba9e0</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.300-preview.24217.11">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.300-preview.24218.5">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>d8c64264eeff1bc6aa543d064ba1bc74cabf06d6</Sha>
<Sha>738bfb1d41ed4dcbdbf59be8f7ae2fe11dbba9e0</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.300-preview.24217.11">
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.300-preview.24218.5">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>d8c64264eeff1bc6aa543d064ba1bc74cabf06d6</Sha>
<Sha>738bfb1d41ed4dcbdbf59be8f7ae2fe11dbba9e0</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.300-preview.24217.11">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.300-preview.24218.5">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>d8c64264eeff1bc6aa543d064ba1bc74cabf06d6</Sha>
<Sha>738bfb1d41ed4dcbdbf59be8f7ae2fe11dbba9e0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
@ -155,9 +155,9 @@
<Sha>3af0081a6e811b78d37c62e479914f7f4cfb0d1a</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.10.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Build" Version="17.10.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>fc97b2d1f7c2309d0069dfbd4ab73e4779ad6989</Sha>
<Sha>10fbfbf2eeb0597fdc1f600d87d38c7f57317bdc</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.10.0-preview.2.97" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/nuget/nuget.client</Uri>
@ -227,13 +227,13 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>188340e12c0a372b1681ad6a5e72c608021efdba</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24217.2">
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24219.1">
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>14a0472100fa9180aca3d178de0b2893ecb22f14</Sha>
<Sha>611a6bbd68d99a312d688b49733edc894ea0c3c1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.24217.2">
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.24219.1">
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>14a0472100fa9180aca3d178de0b2893ecb22f14</Sha>
<Sha>611a6bbd68d99a312d688b49733edc894ea0c3c1</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-alpha.1.22557.12">
<Uri>https://github.com/dotnet/runtime</Uri>

8
eng/Versions.props
View file

@ -43,7 +43,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services -->
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.24217.2</MicrosoftDotNetDarcLibVersion>
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.24219.1</MicrosoftDotNetDarcLibVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
@ -79,9 +79,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.300-preview.24217.11</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>8.0.300-preview.24217.11</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.300-preview.24217.11</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.300-preview.24218.5</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>8.0.300-preview.24218.5</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.300-preview.24218.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>

6
eng/pipelines/templates/stages/vmr-build.yml
View file

@ -13,7 +13,7 @@ parameters:
# The following parameters aren't expected to be passed in rather they are used for encapsulation
# -----------------------------------------------------------------------------------------------
alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17
alpine319Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19
centOSStream8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8
centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38
@ -112,14 +112,14 @@ stages:
- template: ../jobs/vmr-build.yml
parameters:
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
buildName: Alpine317_Offline_MsftSdk
buildName: Alpine319_Offline_MsftSdk
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
vmrBranch: ${{ variables.VmrBranch }}
architecture: x64
pool:
name: ${{ variables.defaultPoolName }}
demands: ${{ variables.defaultPoolDemands }}
container: ${{ parameters.alpine317Container }}
container: ${{ parameters.alpine319Container }}
buildFromArchive: false # ✅
enablePoison: false # 🚫
excludeOmniSharpTests: true # ✅

8
src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml
View file

@ -1,6 +1,6 @@
schedules:
- cron: "0 11 * * 1-5"
displayName: Run on weekdays at 11am UTC
- cron: "0 11 * * 1-5"
displayName: Run on weekdays at 11am UTC
branches:
include:
- main
@ -47,8 +47,8 @@ jobs:
- template: templates/jobs/sdk-diff-tests.yml
parameters:
buildName: Alpine317_Offline_MsftSdk
targetRid: alpine.3.17-x64
buildName: Alpine319_Offline_MsftSdk
targetRid: alpine.3.19-x64
architecture: x64
dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }}

38
src/SourceBuild/patches/runtime/0001-crashinfo-use-off_t-instead-of-off64_t.patch Normal file
View file

@ -0,0 +1,38 @@
From 05ad51a9be428012328a1ee199a4edaff20b5efe Mon Sep 17 00:00:00 2001
From: Antoine Martin <dev@ayakael.net>
Date: Tue, 12 Sep 2023 18:55:46 -0400
Subject: [PATCH] crashinfo.cpp/crasinfounix.cpp: use off_t instead of off64_t
Backport: https://github.com/dotnet/runtime/pull/101272
---
src/coreclr/debug/createdump/crashinfo.cpp | 2 +-
src/coreclr/debug/createdump/crashinfounix.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/coreclr/debug/createdump/crashinfo.cpp b/src/coreclr/debug/createdump/crashinfo.cpp
index 996f3a81935d..d1d1b0ea0218 100644
--- a/src/coreclr/debug/createdump/crashinfo.cpp
+++ b/src/coreclr/debug/createdump/crashinfo.cpp
@@ -803,7 +803,7 @@ CrashInfo::PageMappedToPhysicalMemory(uint64_t start)
}
uint64_t pagemapOffset = (start / PAGE_SIZE) * sizeof(uint64_t);
- uint64_t seekResult = lseek64(m_fdPagemap, (off64_t) pagemapOffset, SEEK_SET);
+ uint64_t seekResult = lseek(m_fdPagemap, (off_t) pagemapOffset, SEEK_SET);
if (seekResult != pagemapOffset)
{
int seekErrno = errno;
diff --git a/src/coreclr/debug/createdump/crashinfounix.cpp b/src/coreclr/debug/createdump/crashinfounix.cpp
index 24b975e3d655..2f4ea079de3b 100644
--- a/src/coreclr/debug/createdump/crashinfounix.cpp
+++ b/src/coreclr/debug/createdump/crashinfounix.cpp
@@ -516,7 +516,7 @@ CrashInfo::ReadProcessMemory(void* address, void* buffer, size_t size, size_t* r
// performance optimization.
m_canUseProcVmReadSyscall = false;
assert(m_fdMem != -1);
- *read = pread64(m_fdMem, buffer, size, (off64_t)address);
+ *read = pread(m_fdMem, buffer, size, (off_t)address);
}
if (*read == (size_t)-1)