Skip to content

[main] Source code updates from dotnet/dotnet #1189

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

Merged
akoeplinger merged 3 commits into from
Apr 24, 2025
Merged

[main] Source code updates from dotnet/dotnet #1189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62b6585
Merging main into darc-main-7e59c0ce-b781-4d98-bbbe-3e0e106f96ec
dotnet-maestro[bot] Apr 24, 2025
868beb2
Update dependencies from https://github.com/dotnet/dotnet
dotnet-maestro[bot] Apr 24, 2025
3e88f6b
Use consistent suffix
akoeplinger Apr 24, 2025
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
43 changes: 22 additions & 21 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="emsdk" Sha="721dc7a2a59416b21fc49447d264009d708d6000" BarId="265489" />
<ProductDependencies>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Wasm.Binaryen.Transport" Version="10.0.0-alpha.1.25220.1">
<Uri>https://github.com/dotnet/binaryen</Uri>
Expand Down Expand Up @@ -235,33 +236,33 @@
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>d38f1dd01fff4127bb86afa86c1e5ac44154a1d7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25217.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25223.119">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>721dc7a2a59416b21fc49447d264009d708d6000</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25217.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25223.119">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>721dc7a2a59416b21fc49447d264009d708d6000</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25217.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25223.119">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>721dc7a2a59416b21fc49447d264009d708d6000</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25217.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25223.119">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>721dc7a2a59416b21fc49447d264009d708d6000</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25217.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25223.119">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>721dc7a2a59416b21fc49447d264009d708d6000</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25217.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25223.119">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>721dc7a2a59416b21fc49447d264009d708d6000</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25217.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25223.119">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>721dc7a2a59416b21fc49447d264009d708d6000</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
9 changes: 5 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,11 @@
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
</PropertyGroup>
<PropertyGroup>
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25217.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25217.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25217.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25217.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25223.119</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25223.119</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25223.119</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksWorkloadsVersion>10.0.0-beta.25223.119</MicrosoftDotNetBuildTasksWorkloadsVersion>
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25223.119</MicrosoftDotNetXliffTasksVersion>
</PropertyGroup>
<PropertyGroup>
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
Expand Down
4 changes: 3 additions & 1 deletion eng/common/core-templates/steps/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,9 @@ steps:
$portableBuildArgs \
/p:DotNetBuildSourceOnly=true \
/p:DotNetBuildRepo=true \
/p:AssetManifestFileName=$assetManifestFileName
/p:AssetManifestFileName=$assetManifestFileName \
/p:SetUpSourceBuildIntermediateNupkgCache=false \
/p:ReportPrebuiltUsage=false
displayName: Build

# Upload build logs for diagnosis.
Expand Down
2 changes: 1 addition & 1 deletion eng/common/cross/arm64/tizen/tizen.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
Use the shared library, but some functions are only in
the static library, so try that secondarily. */
OUTPUT_FORMAT(elf64-littleaarch64)
-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib/ld-linux-aarch64.so.1 ) )
-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-aarch64.so.1 ) )
+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-aarch64.so.1 ) )
Empty file modified eng/common/cross/install-debs.py
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified eng/common/cross/tizen-build-rootfs.sh
100644 → 100755
View file
Open in desktop
Empty file.
9 changes: 2 additions & 7 deletions eng/common/cross/tizen-fetch.sh
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,8 @@ fetch_tizen_pkgs()
done
}

if [ "$TIZEN_ARCH" == "riscv64" ]; then
BASE="Tizen-Base-RISCV"
UNIFIED="Tizen-Unified-RISCV"
else
BASE="Tizen-Base"
UNIFIED="Tizen-Unified"
fi
BASE="Tizen-Base"
UNIFIED="Tizen-Unified"

Inform "Initialize ${TIZEN_ARCH} base"
fetch_tizen_pkgs_init standard $BASE
Expand Down
Empty file modified eng/common/generate-sbom-prep.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified eng/common/native/install-dependencies.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified eng/common/sdk-task.sh
100644 → 100755
View file
Open in desktop
Empty file.
4 changes: 2 additions & 2 deletions eng/workloads/workloads.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Workloads" Version="$(MicrosoftDotNetBuildTasksWorkloadsPackageVersion)" />
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Workloads" Version="$(MicrosoftDotNetBuildTasksWorkloadsVersion)" />
<PackageReference Include="Microsoft.Signed.Wix" Version="$(MicrosoftSignedWixVersion)" GeneratePathProperty="true" />
<PackageReference Include="MicroBuild.Plugins.SwixBuild.Dotnet" Version="$(SwixPackageVersion)" GeneratePathProperty="true" />
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersPackageVersion)" />
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersVersion)" />
</ItemGroup>

<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"dotnet": "10.0.100-preview.3.25201.16"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25217.1",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25217.1",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25223.119",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25223.119",
"Microsoft.Build.Traversal": "3.4.0"
}
}