Skip to content

Commit 1591008

Browse files
On relative base path root Microsoft.NET.Runtime.Emscripten.6.0.2.Cache.linux-x64 , Microsoft.NET.Runtime.Emscripten.6.0.2.Node.linux-x64 , Microsoft.NET.Runtime.Emscripten.6.0.2.Sdk.linux-x64 From Version 12.0.0-alpha.1.26513.107 -> To Version 12.0.0-alpha.1.26531.102 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Helix.Sdk From Version 12.0.0-beta.26513.107 -> To Version 12.0.0-beta.26531.102 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent ff66eaf commit 1591008

10 files changed

Lines changed: 44 additions & 46 deletions

File tree

‎eng/Version.Details.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,29 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="12.0.0-beta.26513.107">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="12.0.0-beta.26531.102">
77
<Uri>https://github.com/dotnet/dotnet</Uri>
8-
<Sha>420d9a5819d62536fa39aa0c6204afb044d355ba</Sha>
8+
<Sha>e2a826638ffc3d7c2b3e72ccf827ddfe96269d57</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="12.0.0-beta.26513.107">
10+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="12.0.0-beta.26531.102">
1111
<Uri>https://github.com/dotnet/dotnet</Uri>
12-
<Sha>420d9a5819d62536fa39aa0c6204afb044d355ba</Sha>
12+
<Sha>e2a826638ffc3d7c2b3e72ccf827ddfe96269d57</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="12.0.0-beta.26513.107">
14+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="12.0.0-beta.26531.102">
1515
<Uri>https://github.com/dotnet/dotnet</Uri>
16-
<Sha>420d9a5819d62536fa39aa0c6204afb044d355ba</Sha>
16+
<Sha>e2a826638ffc3d7c2b3e72ccf827ddfe96269d57</Sha>
1717
</Dependency>
18-
<Dependency Name="Microsoft.NET.Runtime.Emscripten.6.0.2.Node.linux-x64" Version="12.0.0-alpha.1.26513.107">
18+
<Dependency Name="Microsoft.NET.Runtime.Emscripten.6.0.2.Node.linux-x64" Version="12.0.0-alpha.1.26531.102">
1919
<Uri>https://github.com/dotnet/dotnet</Uri>
20-
<Sha>420d9a5819d62536fa39aa0c6204afb044d355ba</Sha>
20+
<Sha>e2a826638ffc3d7c2b3e72ccf827ddfe96269d57</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.NET.Runtime.Emscripten.6.0.2.Sdk.linux-x64" Version="12.0.0-alpha.1.26513.107">
22+
<Dependency Name="Microsoft.NET.Runtime.Emscripten.6.0.2.Sdk.linux-x64" Version="12.0.0-alpha.1.26531.102">
2323
<Uri>https://github.com/dotnet/dotnet</Uri>
24-
<Sha>420d9a5819d62536fa39aa0c6204afb044d355ba</Sha>
24+
<Sha>e2a826638ffc3d7c2b3e72ccf827ddfe96269d57</Sha>
2525
</Dependency>
26-
<Dependency Name="Microsoft.NET.Runtime.Emscripten.6.0.2.Cache.linux-x64" Version="12.0.0-alpha.1.26513.107">
26+
<Dependency Name="Microsoft.NET.Runtime.Emscripten.6.0.2.Cache.linux-x64" Version="12.0.0-alpha.1.26531.102">
2727
<Uri>https://github.com/dotnet/dotnet</Uri>
28-
<Sha>420d9a5819d62536fa39aa0c6204afb044d355ba</Sha>
28+
<Sha>e2a826638ffc3d7c2b3e72ccf827ddfe96269d57</Sha>
2929
</Dependency>
3030
</ToolsetDependencies>
3131
</Dependencies>

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
</PropertyGroup>
88
<PropertyGroup>
99
<!-- emsdk -->
10-
<MicrosoftNETRuntimeEmscripten602Nodelinuxx64Version>12.0.0-alpha.1.26513.107</MicrosoftNETRuntimeEmscripten602Nodelinuxx64Version>
11-
<MicrosoftNETRuntimeEmscripten602Sdklinuxx64Version>12.0.0-alpha.1.26513.107</MicrosoftNETRuntimeEmscripten602Sdklinuxx64Version>
12-
<MicrosoftNETRuntimeEmscripten602Cachelinuxx64Version>12.0.0-alpha.1.26513.107</MicrosoftNETRuntimeEmscripten602Cachelinuxx64Version>
10+
<MicrosoftNETRuntimeEmscripten602Nodelinuxx64Version>12.0.0-alpha.1.26531.102</MicrosoftNETRuntimeEmscripten602Nodelinuxx64Version>
11+
<MicrosoftNETRuntimeEmscripten602Sdklinuxx64Version>12.0.0-alpha.1.26531.102</MicrosoftNETRuntimeEmscripten602Sdklinuxx64Version>
12+
<MicrosoftNETRuntimeEmscripten602Cachelinuxx64Version>12.0.0-alpha.1.26531.102</MicrosoftNETRuntimeEmscripten602Cachelinuxx64Version>
1313
<!-- arcade -->
14-
<MicrosoftDotNetBuildTasksPackagingVersion>12.0.0-beta.26513.107</MicrosoftDotNetBuildTasksPackagingVersion>
14+
<MicrosoftDotNetBuildTasksPackagingVersion>12.0.0-beta.26531.102</MicrosoftDotNetBuildTasksPackagingVersion>
1515
</PropertyGroup>
1616
<PropertyGroup>
1717
<WasiSdkVersion>33</WasiSdkVersion>

‎eng/common/core-templates/job/onelocbuild.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106
outputVariableName: 'GitHubAppInstallationToken'
107107
condition: ${{ parameters.condition }}
108108

109-
- task: OneLocBuild@2
109+
- task: OneLocBuild@3
110110
displayName: OneLocBuild
111111
env:
112112
SYSTEM_ACCESSTOKEN: $(System.AccessToken)

‎eng/common/native/NativeAotSupported.props‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,15 @@
33

44
<!-- Reject unsupported OS via RID prefix match -->
55
<_NativeAotSupportedOS Condition="
6-
'$(TargetOS)' != 'browser' and
76
'$(TargetOS)' != 'haiku' and
87
'$(TargetOS)' != 'illumos' and
98
'$(TargetOS)' != 'netbsd' and
10-
'$(TargetOS)' != 'solaris'
9+
'$(TargetOS)' != 'solaris' and
10+
'$(TargetOS)' != 'openharmony'
1111
">true</_NativeAotSupportedOS>
1212

1313
<!-- Reject unsupported architectures via RID suffix match -->
1414
<_NativeAotSupportedArch Condition="
15-
'$(TargetArchitecture)' != 'wasm' and
1615
'$(TargetArchitecture)' != 's390x' and
1716
'$(TargetArchitecture)' != 'ppc64le' and
1817
('$(TargetArchitecture)' != 'x86' or '$(TargetOS)' == 'windows')

‎eng/common/native/install-dependencies.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ case "$os" in
2626
apt install -y build-essential gettext locales cmake llvm clang lld lldb liblldb-dev libunwind8-dev libicu-dev liblttng-ust-dev \
2727
libssl-dev libkrb5-dev pigz cpio ninja-build file
2828

29-
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
29+
localedef -i en_US -c -f UTF-8 en_US.UTF-8
3030
elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos" ]; then
3131
pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)"
3232
$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

‎eng/common/sdk-task.ps1‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,16 @@ function Print-Usage() {
4949
Write-Host "Command line arguments not listed above are passed thru to msbuild."
5050
}
5151

52-
function Build([string]$target) {
53-
$logSuffix = if ($target -eq 'Execute') { '' } else { ".$target" }
54-
$log = Join-Path $LogDir "$task$logSuffix.binlog"
52+
# Restore is driven by MSBuild's /restore switch, which the shared MSBuild helper adds
53+
# whenever restore is enabled. No separate restore invocation is necessary.
54+
function Build() {
55+
$log = Join-Path $LogDir "$task.binlog"
5556
$binaryLogArg = if ($binaryLog) { "/bl:$log" } else { "" }
5657
$outputPath = Join-Path $ToolsetDir "$task\"
5758

5859
MSBuild $taskProject `
5960
$binaryLogArg `
60-
/t:$target `
61+
/t:Execute `
6162
/p:Configuration=$configuration `
6263
/p:RepoRoot=$RepoRoot `
6364
/p:BaseIntermediateOutputPath=$outputPath `
@@ -88,11 +89,7 @@ try {
8889
ExitWithExitCode 1
8990
}
9091

91-
if ($restore) {
92-
Build 'Restore'
93-
}
94-
95-
Build 'Execute'
92+
Build
9693
}
9794
catch {
9895
Write-Host $_.ScriptStackTrace

‎eng/common/sdk-task.sh‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,17 @@ while [[ -h "$source" ]]; do
2828
done
2929
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
3030

31+
# Restore is driven by MSBuild's /restore switch, which the shared MSBuild helper adds
32+
# whenever restore is enabled. No separate restore invocation is necessary.
3133
Build() {
32-
local target=$1
33-
local log_suffix=""
34-
[[ "$target" != "Execute" ]] && log_suffix=".$target"
35-
local log="$log_dir/$task$log_suffix.binlog"
34+
local log="$log_dir/$task.binlog"
3635
local binaryLogArg=""
3736
[[ $binary_log == true ]] && binaryLogArg="/bl:$log"
3837
local output_path="$toolset_dir/$task/"
3938

4039
MSBuild "$taskProject" \
4140
$binaryLogArg \
42-
/t:"$target" \
41+
/t:Execute \
4342
/p:Configuration="$configuration" \
4443
/p:RepoRoot="$repo_root" \
4544
/p:BaseIntermediateOutputPath="$output_path" \
@@ -121,11 +120,7 @@ if [[ ! -e "$taskProject" ]]; then
121120
ExitWithExitCode 1
122121
fi
123122

124-
if $restore; then
125-
Build "Restore"
126-
fi
127-
128-
Build "Execute"
123+
Build
129124

130125

131126
ExitWithExitCode 0

‎eng/common/tools.ps1‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,9 @@ function MSBuild() {
811811
}
812812
}
813813

814-
$cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci"
814+
$restoreSwitch = if ($restore) { ' /restore' } else { '' }
815+
816+
$cmdArgs = "$($buildTool.Command)$restoreSwitch /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci"
815817

816818
# Build with MSBuild's multi-threaded mode, but not with msbuild.exe (VS MSBuild) for now.
817819
# TODO: Enable for VS MSBuild as well: https://github.com/dotnet/dotnet/issues/9989

‎eng/common/tools.sh‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,12 @@ function MSBuild {
615615
warnnotaserror_switch="/warnnotaserror:$warn_not_as_error /p:AdditionalWarningsNotAsErrors=${warn_not_as_error//;/%3B}"
616616
fi
617617

618-
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 "$@"
618+
local restore_switch=""
619+
if [[ "$restore" == true ]]; then
620+
restore_switch="/restore"
621+
fi
622+
623+
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 "$@"
619624
}
620625

621626
function GetDarc {

‎global.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "11.0.100-rc.1.26420.103",
3+
"version": "12.0.100-alpha.1.26480.102",
44
"allowPrerelease": true,
55
"rollForward": "major",
66
"paths": [
@@ -10,11 +10,11 @@
1010
"errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it."
1111
},
1212
"tools": {
13-
"dotnet": "11.0.100-rc.1.26420.103"
13+
"dotnet": "12.0.100-alpha.1.26480.102"
1414
},
1515
"msbuild-sdks": {
1616
"Microsoft.Build.Traversal": "3.4.0",
17-
"Microsoft.DotNet.Arcade.Sdk": "12.0.0-beta.26513.107",
18-
"Microsoft.DotNet.Helix.Sdk": "12.0.0-beta.26513.107"
17+
"Microsoft.DotNet.Arcade.Sdk": "12.0.0-beta.26531.102",
18+
"Microsoft.DotNet.Helix.Sdk": "12.0.0-beta.26531.102"
1919
}
2020
}

0 commit comments

Comments
 (0)