8000 [main] Source code updates from dotnet/aspnetcore (#627) · dotnet/dotnet@d60c3fe · GitHub
[go: up one dir, main page]
Skip to content

Commit d60c3fe

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/aspnetcore (#627)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 376c875 commit d60c3fe

File tree

19 files changed

+370
-338
lines changed

19 files changed

+370
-338
lines changed

‎prereqs/git-info/aspnetcore.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
33
<PropertyGroup>
4-
<GitCommitHash>76e4d1838d5cf777429c9ed1dd5c9ccd937e20e4</GitCommitHash>
5-
<OfficialBuildId>20250519.2</OfficialBuildId>
6-
<OutputPackageVersion>10.0.0-preview.5.25269.2</OutputPackageVersion>
4+
<GitCommitHash>e26a16c185cf95e3c52b028920aeba6bcea814ce</GitCommitHash>
5+
<OfficialBuildId>20250519.5</OfficialBuildId>
6+
<OutputPackageVersion>10.0.0-preview.5.25269.5</OutputPackageVersion>
77
</PropertyGroup>
88
</Project>

‎src/aspnetcore/eng/Version.Details.xml

Lines changed: 185 additions & 185 deletions
Large diffs are not rendered by default.

‎src/aspnetcore/eng/Versions.props

Lines changed: 89 additions & 89 deletions
Large diffs are not rendered by default.

‎src/aspnetcore/eng/common/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ while [[ $# > 0 ]]; do
136136
restore=true
137137
pack=true
138138
;;
139-
-productBuild|-pb)
139+
-productbuild|-pb)
140140
build=true
141141
product_build=true
142142
restore=true

‎src/aspnetcore/eng/common/core-templates/steps/source-build.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,12 @@ steps:
5151
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
5252
--configuration $buildConfig \
5353
--restore --build --pack -bl \
54+
--source-build \
5455
${{ parameters.platform.buildArguments }} \
5556
$internalRuntimeDownloadArgs \
5657
$targetRidArgs \
5758
$baseRidArgs \
5859
$portableBuildArgs \
59-
/p:DotNetBuildSourceOnly=true \
60-
/p:DotNetBuildRepo=true \
6160
displayName: Build
6261

6362
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml

‎src/aspnetcore/eng/common/darc-init.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ function InstallDarcCli {
6868
fi
6969
fi
7070

71-
local arcadeServicesSource="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json"
71+
local arcadeServicesSource="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"
7272

7373
echo "Installing Darc CLI version $darcVersion..."
7474
echo "You may need to restart your command shell if this is the first dotnet tool you have installed."

‎src/aspnetcore/eng/common/tools.ps1

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ $ErrorActionPreference = 'Stop'
6868
# True if the build is a product build
6969
[bool]$productBuild = if (Test-Path variable:productBuild) { $productBuild } else { $false }
7070

71-
[String[]]$properties = if (Test-Path variable:properties) { $properties } else { @() }
72-
7371
function Create-Directory ([string[]] $path) {
7472
New-Item -Path $path -Force -ItemType 'Directory' | Out-Null
7573
}
@@ -853,7 +851,7 @@ function MSBuild-Core() {
853851

854852
# When running on Azure Pipelines, override the returned exit code to avoid double logging.
855853
# Skip this when the build is a child of the VMR orchestrator build.
856-
if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild -and -not($properties -like "*DotNetBuildRepo=true*")) {
854+
if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild) {
857855
Write-PipelineSetResult -Result "Failed" -Message "msbuild execution failed."
858856
# Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
859857
# The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error

‎src/aspnetcore/eng/common/tools.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ function MSBuild-Core {
507507

508508
# When running on Azure Pipelines, override the returned exit code to avoid double logging.
509509
# Skip this when the build is a child of the VMR orchestrator build.
510-
if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true && "$properties" != *"DotNetBuildRepo=true"* ]]; then
510+
if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true ]]; then
511511
Write-PipelineSetResult -result "Failed" -message "msbuild execution failed."
512512
# Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
513513
# The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error

‎src/aspnetcore/global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"jdk": "latest"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25260.104",
31-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25260.104",
32-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25260.104",
30+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25265.101",
31+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25265.101",
32+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25265.101",
3333
"Microsoft.Build.NoTargets": "3.7.0",
3434
"Microsoft.Build.Traversal": "3.4.0"
3535
}

‎src/aspnetcore/src/Components/WebAssembly/WebAssembly/src/targets/Microsoft.AspNetCore.Components.WebAssembly.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<PropertyGroup>
33
<BlazorWebAssemblyJSPath>$(MSBuildThisFileDirectory)blazor.webassembly.js</BlazorWebAssemblyJSPath>
44
<BlazorRoutingEnableRegexConstraint Condition="'$(BlazorRoutingEnableRegexConstraint)' == ''">false</BlazorRoutingEnableRegexConstraint>
5+
<WebAssemblyHotReloadCapabilities>Baseline;AddMethodToExistingType;AddStaticFieldToExistingType;NewTypeDefinition;ChangeCustomAttributes;AddInstanceFieldToExistingType;GenericAddMethodToExistingType;GenericUpdateMethod;UpdateParameters;GenericAddFieldToExistingType</WebAssemblyHotReloadCapabilities>
56
</PropertyGroup>
67

78
<ItemGroup>

0 commit comments

Comments
 (0)
0