Skip to content

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

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

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
+284 −286
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
21c1ef6
[VMR] Codeflow 754e56e-754e56e
dotnet-maestro[bot] May 9, 2025
a7b4ba8
Merging main into darc-main-420b4eff-f16f-4797-8ab3-d6db19bf7727
dotnet-maestro[bot] May 9, 2025
339d355
Update dependencies from https://github.com/dotnet/dotnet build 267468
dotnet-maestro[bot] May 9, 2025
7d172d4
[VMR] Codeflow 1a7ca4a-1a7ca4a
dotnet-maestro[bot] May 10, 2025
46be024
Merging main into darc-main-420b4eff-f16f-4797-8ab3-d6db19bf7727
dotnet-maestro[bot] May 10, 2025
c2e7495
Update dependencies from https://github.com/dotnet/dotnet build 267725
dotnet-maestro[bot] May 10, 2025
d799b4d
Update dependencies from https://github.com/dotnet/dotnet build 267776
dotnet-maestro[bot] May 11, 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
362 changes: 181 additions & 181 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

174 changes: 87 additions & 87 deletions eng/Versions.props
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 4 additions & 10 deletions 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 @@ -38,14 +38,9 @@ steps:
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
fi

runtimeOsArgs=
if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then
runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}'
fi

baseOsArgs=
if [ '${{ parameters.platform.baseOS }}' != '' ]; then
baseOsArgs='/p:BaseOS=${{ parameters.platform.baseOS }}'
baseRidArgs=
if [ '${{ parameters.platform.baseRID }}' != '' ]; then
baseRidArgs='/p:BaseRid=${{ parameters.platform.baseRID }}'
fi

portableBuildArgs=
Expand All @@ -59,8 +54,7 @@ steps:
${{ parameters.platform.buildArguments }} \
$internalRuntimeDownloadArgs \
$targetRidArgs \
$runtimeOsArgs \
$baseOsArgs \
$baseRidArgs \
$portableBuildArgs \
/p:DotNetBuildSourceOnly=true \
/p:DotNetBuildRepo=true \
Expand Down
6 changes: 5 additions & 1 deletion eng/common/tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
# CI mode - set to true on CI server for PR validation build or official build.
ci=${ci:-false}

# Build mode
source_build=${source_build:-false}

# Set to true to use the pipelines logger which will enable Azure logging output.
# https://github.com/Microsoft/azure-pipelines-tasks/blob/master/docs/authoring/commands.md
# This flag is meant as a temporary opt-opt for the feature while validate it across
Expand Down Expand Up @@ -58,7 +61,8 @@ use_installed_dotnet_cli=${use_installed_dotnet_cli:-true}
dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'}

# True to use global NuGet cache instead of restoring packages to repository-local directory.
if [[ "$ci" == true ]]; then
# Keep in sync with NuGetPackageroot in Arcade SDK's RepositoryLayout.props.
if [[ "$ci" == true || "$source_build" == true ]]; then
use_global_nuget_cache=${use_global_nuget_cache:-false}
else
use_global_nuget_cache=${use_global_nuget_cache:-true}
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
"jdk": "latest"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25257.101",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25257.101",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25257.101",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25260.104",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25260.104",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25260.104",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0"
}
Expand Down
8 changes: 4 additions & 4 deletions ...AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,15 @@
Targets="_VmrBuild" />
<MSBuild Projects="..\..\..\Runtime\Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj"
BuildInParallel="false"
Properties="Platform=x86;TargetRid=win-x86;BaseOS=win-x86;TargetRuntimeIdentifier=win-x86;TargetArchitecture=x86"
Properties="Platform=x86;TargetRid=win-x86;BaseRid=win-x86;TargetRuntimeIdentifier=win-x86;TargetArchitecture=x86"
Targets="_VmrBuild" />
<MSBuild Projects="..\..\..\LoggingBranch\LB.csproj"
BuildInParallel="false"
Properties="Platform=x64;DisableTransitiveFrameworkReferences=true"
Targets="_VmrBuild" />
<MSBuild Projects="..\..\..\LoggingBranch\LB.csproj"
BuildInParallel="false"
Properties="Platform=x86;TargetRid=win-x86;BaseOS=win-x86;TargetRuntimeIdentifier=win-x86;TargetArchitecture=x86;DisableTransitiveFrameworkReferences=true"
Properties="Platform=x86;TargetRid=win-x86;BaseRid=win-x86;TargetRuntimeIdentifier=win-x86;TargetArchitecture=x86;DisableTransitiveFrameworkReferences=true"
Targets="_VmrBuild" />
</Target>

Expand Down Expand Up @@ -112,7 +112,7 @@
</ItemGroup>

<ItemGroup Condition="'$(DotNetBuild)' == 'true'">
<_SiteExtensionsReference Include="$(ArtifactsNonShippingPackagesDir)Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x64.%(_ResolvedPackageVersionInfo.PackageVersion).nupkg"
<_SiteExtensionsReference Include="$(ArtifactsNonShippingPackagesDir)Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x64.%(_ResolvedPackageVersionInfo.PackageVersion).nupkg"
Name="Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x64" />
<_SiteExtensionsReference Include="$(ArtifactsNonShippingPackagesDir)Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x86.%(_ResolvedPackageVersionInfo.PackageVersion).nupkg"
Name="Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x86" />
Expand Down Expand Up @@ -148,4 +148,4 @@
<Content Include="$(MicrosoftWebXdtExtensionsPath)" PackagePath="content" />
</ItemGroup>
</Target>
</Project>
</Project>
Loading