diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 239b0c3cbd..4002b790c5 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,11 +6,13 @@ This file should be imported by eng/Versions.props - 12.0.0-beta.26516.101 + 12.0.0-beta.26555.106 + 12.0.0-beta.26555.106 $(MicrosoftDotNetArcadeSdkPackageVersion) + $(MicrosoftDotNetHelixSdkPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a45032a33a..07cbd3056d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,12 +1,16 @@ - + - + https://github.com/dotnet/dotnet - be06e8febe57db1ea30be9f0863133a892c01645 + 7cc16ae385c54fe87ffc1b3d1ae040b899e8c9c9 + + + https://github.com/dotnet/dotnet + 7cc16ae385c54fe87ffc1b3d1ae040b899e8c9c9 diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index b772dc5788..bd11c2e08c 100644 --- a/eng/common/core-templates/job/onelocbuild.yml +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -106,7 +106,7 @@ jobs: outputVariableName: 'GitHubAppInstallationToken' condition: ${{ parameters.condition }} - - task: OneLocBuild@2 + - task: OneLocBuild@3 displayName: OneLocBuild env: SYSTEM_ACCESSTOKEN: $(System.AccessToken) diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 330225ae09..5b2a930256 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -187,10 +187,10 @@ jobs: PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} is1ESPipeline: ${{ parameters.is1ESPipeline }} - # Darc is targeting 8.0, so make sure it's installed + # Darc is targeting 10.0, so make sure it's installed - task: UseDotNet@2 inputs: - version: 8.0.x + version: 10.0.x - task: AzureCLI@2 displayName: Publish Using Darc diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 6dcee6664d..6b0875baf6 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -301,7 +301,7 @@ stages: - task: UseDotNet@2 inputs: - version: 8.0.x + version: 10.0.x - task: AzureCLI@2 displayName: Publish Using Darc diff --git a/eng/common/native/NativeAotSupported.props b/eng/common/native/NativeAotSupported.props index cdff9ef036..002aa9c248 100644 --- a/eng/common/native/NativeAotSupported.props +++ b/eng/common/native/NativeAotSupported.props @@ -3,16 +3,15 @@ <_NativeAotSupportedOS Condition=" - '$(TargetOS)' != 'browser' and '$(TargetOS)' != 'haiku' and '$(TargetOS)' != 'illumos' and '$(TargetOS)' != 'netbsd' and - '$(TargetOS)' != 'solaris' + '$(TargetOS)' != 'solaris' and + '$(TargetOS)' != 'openharmony' ">true <_NativeAotSupportedArch Condition=" - '$(TargetArchitecture)' != 'wasm' and '$(TargetArchitecture)' != 's390x' and '$(TargetArchitecture)' != 'ppc64le' and ('$(TargetArchitecture)' != 'x86' or '$(TargetOS)' == 'windows') diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh index aff839fa09..be405fd62e 100755 --- a/eng/common/native/install-dependencies.sh +++ b/eng/common/native/install-dependencies.sh @@ -26,7 +26,7 @@ case "$os" in apt install -y build-essential gettext locales cmake llvm clang lld lldb liblldb-dev libunwind8-dev libicu-dev liblttng-ust-dev \ libssl-dev libkrb5-dev pigz cpio ninja-build file - localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 + localedef -i en_US -c -f UTF-8 en_US.UTF-8 elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos" ]; then pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)" $pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio ninja-build file diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 8d72d803dd..ad35ccb0dd 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -49,15 +49,16 @@ function Print-Usage() { Write-Host "Command line arguments not listed above are passed thru to msbuild." } -function Build([string]$target) { - $logSuffix = if ($target -eq 'Execute') { '' } else { ".$target" } - $log = Join-Path $LogDir "$task$logSuffix.binlog" +# Restore is driven by MSBuild's /restore switch, which the shared MSBuild helper adds +# whenever restore is enabled. No separate restore invocation is necessary. +function Build() { + $log = Join-Path $LogDir "$task.binlog" $binaryLogArg = if ($binaryLog) { "/bl:$log" } else { "" } $outputPath = Join-Path $ToolsetDir "$task\" MSBuild $taskProject ` $binaryLogArg ` - /t:$target ` + /t:Execute ` /p:Configuration=$configuration ` /p:RepoRoot=$RepoRoot ` /p:BaseIntermediateOutputPath=$outputPath ` @@ -88,11 +89,7 @@ try { ExitWithExitCode 1 } - if ($restore) { - Build 'Restore' - } - - Build 'Execute' + Build } catch { Write-Host $_.ScriptStackTrace diff --git a/eng/common/sdk-task.sh b/eng/common/sdk-task.sh index a7f1ba060d..0c14d45a9c 100755 --- a/eng/common/sdk-task.sh +++ b/eng/common/sdk-task.sh @@ -28,18 +28,17 @@ while [[ -h "$source" ]]; do done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" +# Restore is driven by MSBuild's /restore switch, which the shared MSBuild helper adds +# whenever restore is enabled. No separate restore invocation is necessary. Build() { - local target=$1 - local log_suffix="" - [[ "$target" != "Execute" ]] && log_suffix=".$target" - local log="$log_dir/$task$log_suffix.binlog" + local log="$log_dir/$task.binlog" local binaryLogArg="" [[ $binary_log == true ]] && binaryLogArg="/bl:$log" local output_path="$toolset_dir/$task/" MSBuild "$taskProject" \ $binaryLogArg \ - /t:"$target" \ + /t:Execute \ /p:Configuration="$configuration" \ /p:RepoRoot="$repo_root" \ /p:BaseIntermediateOutputPath="$output_path" \ @@ -121,11 +120,7 @@ if [[ ! -e "$taskProject" ]]; then ExitWithExitCode 1 fi -if $restore; then - Build "Restore" -fi - -Build "Execute" +Build ExitWithExitCode 0 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 9cb84a8a94..04c8bb4830 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -811,7 +811,9 @@ function MSBuild() { } } - $cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci" + $restoreSwitch = if ($restore) { ' /restore' } else { '' } + + $cmdArgs = "$($buildTool.Command)$restoreSwitch /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci" # Build with MSBuild's multi-threaded mode, but not with msbuild.exe (VS MSBuild) for now. # TODO: Enable for VS MSBuild as well: https://github.com/dotnet/dotnet/issues/9989 diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 3b4a5ac514..0e28c1117b 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -615,7 +615,12 @@ function MSBuild { warnnotaserror_switch="/warnnotaserror:$warn_not_as_error /p:AdditionalWarningsNotAsErrors=${warn_not_as_error//;/%3B}" fi - RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch $mt_switch $warnnotaserror_switch ${logger_switch[@]+"${logger_switch[@]}"} /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@" + local restore_switch="" + if [[ "$restore" == true ]]; then + restore_switch="/restore" + fi + + RunBuildTool "$_InitializeBuildToolCommand" $restore_switch /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch $mt_switch $warnnotaserror_switch ${logger_switch[@]+"${logger_switch[@]}"} /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@" } function GetDarc { diff --git a/global.json b/global.json index 423d8328ed..d9e872e542 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "12.0.100-alpha.1.26480.102", + "version": "12.0.100-alpha.1.26531.102", "allowPrerelease": true, "rollForward": "latestFeature", "paths": [ @@ -10,10 +10,10 @@ "errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it." }, "tools": { - "dotnet": "12.0.100-alpha.1.26480.102" + "dotnet": "12.0.100-alpha.1.26531.102" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "12.0.0-beta.26516.101", - "Microsoft.DotNet.Helix.Sdk": "12.0.0-beta.26516.101" + "Microsoft.DotNet.Arcade.Sdk": "12.0.0-beta.26555.106", + "Microsoft.DotNet.Helix.Sdk": "12.0.0-beta.26555.106" } }