Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 10 additions & 10 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet-dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26313.102</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26313.102</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26313.102</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.26313.102</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-preview.6.26313.102</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>11.0.0-preview.6.26313.102</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>11.0.0-preview.6.26313.102</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-preview.6.26313.102</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.6.26313.102</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-preview.6.26313.102</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26317.104</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26317.104</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26317.104</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.26317.104</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-preview.6.26317.104</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>11.0.0-preview.6.26317.104</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>11.0.0-preview.6.26317.104</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-preview.6.26317.104</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.6.26317.104</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-preview.6.26317.104</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<!-- dotnet-macios dependencies -->
<MicrosoftiOSSdknet100_260PackageVersion>26.0.11017</MicrosoftiOSSdknet100_260PackageVersion>
<MicrosoftiOSSdknet100_265PackageVersion>26.5.10291</MicrosoftiOSSdknet100_265PackageVersion>
Expand Down
40 changes: 20 additions & 20 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.6.26313.102">
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.6.26317.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-preview.6.26313.102">
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-preview.6.26317.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="11.0.0-preview.6.26313.102">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="11.0.0-preview.6.26317.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="11.0.0-preview.6.26313.102">
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="11.0.0-preview.6.26317.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
</Dependency>
<!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if changing the version outside of dependency flow -->
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.6.26313.102">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.6.26317.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26313.102">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26317.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
</Dependency>
<!-- This is a subscription of the .NET 10/Xcode 26.0 versions of our packages -->
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_26.0" Version="26.0.11017">
Expand Down Expand Up @@ -61,25 +61,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26313.102">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26317.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.26313.102">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.26317.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-preview.6.26313.102">
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-preview.6.26317.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="11.0.0-prerelease.26217.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>866707736d49c2323628744716cda2475b3af9ee</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26313.102">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26317.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
<Sha>a065c06c0c5f5647d8e312fc70dec3f5ca77b830</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
Expand Down
6 changes: 5 additions & 1 deletion eng/common/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,11 @@ try {
if (-not $excludeCIBinarylog) {
$binaryLog = $true
}
$nodeReuse = $false
# Disable node reuse on CI unless explicitly opted in via MSBUILD_NODEREUSE_ENABLED.
# Internal testing only; this env var will be replaced with a switch (https://github.com/dotnet/arcade/issues/17013) and must not be depended on.
if ($env:MSBUILD_NODEREUSE_ENABLED -ne "1") {
$nodeReuse = $false
}
}

if (-not [string]::IsNullOrEmpty($binaryLogName)) {
Expand Down
6 changes: 5 additions & 1 deletion eng/common/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,11 @@ if [[ -z "$configuration" ]]; then
fi

if [[ "$ci" == true ]]; then
node_reuse=false
# Disable node reuse on CI unless explicitly opted in via MSBUILD_NODEREUSE_ENABLED.
# Internal testing only; this env var will be replaced with a switch (https://github.com/dotnet/arcade/issues/17013) and must not be depended on.
if [[ "${MSBUILD_NODEREUSE_ENABLED:-}" != "1" ]]; then
node_reuse=false
fi
if [[ "$exclude_ci_binary_log" == false ]]; then
binary_log=true
fi
Expand Down
1 change: 1 addition & 0 deletions eng/common/dotnet.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ $dotnetRoot = InitializeDotNetCli -install:$true
if ($args.count -gt 0) {
$env:DOTNET_NOLOGO=1
& "$dotnetRoot\dotnet.exe" $args
ExitWithExitCode $LASTEXITCODE
}
6 changes: 5 additions & 1 deletion eng/common/msbuild.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ Param(

try {
if ($ci) {
$nodeReuse = $false
# Disable node reuse on CI unless explicitly opted in via MSBUILD_NODEREUSE_ENABLED.
# Internal testing only; this env var will be replaced with a switch (https://github.com/dotnet/arcade/issues/17013) and must not be depended on.
if ($env:MSBUILD_NODEREUSE_ENABLED -ne "1") {
$nodeReuse = $false
}
}

MSBuild @extraArgs
Expand Down
6 changes: 5 additions & 1 deletion eng/common/msbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,11 @@ done
. "$scriptroot/tools.sh"

if [[ "$ci" == true ]]; then
node_reuse=false
# Disable node reuse on CI unless explicitly opted in via MSBUILD_NODEREUSE_ENABLED.
# Internal testing only; this env var will be replaced with a switch (https://github.com/dotnet/arcade/issues/17013) and must not be depended on.
if [[ "${MSBUILD_NODEREUSE_ENABLED:-}" != "1" ]]; then
node_reuse=false
fi
fi

MSBuild $extra_args
Expand Down
4 changes: 3 additions & 1 deletion eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,9 @@ function MSBuild() {
ExitWithExitCode 1
}

if ($nodeReuse) {
# Node reuse must be disabled in CI builds unless explicitly opted in via MSBUILD_NODEREUSE_ENABLED.
# Internal testing only; this env var will be replaced with a switch (https://github.com/dotnet/arcade/issues/17013) and must not be depended on.
if ($nodeReuse -and $env:MSBUILD_NODEREUSE_ENABLED -ne "1") {
Write-PipelineTelemetryError -Category 'Build' -Message 'Node reuse must be disabled in CI build.'
ExitWithExitCode 1
}
Expand Down
4 changes: 3 additions & 1 deletion eng/common/tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,9 @@ function MSBuild {
ExitWithExitCode 1
fi

if [[ "$node_reuse" == true ]]; then
# Node reuse must be disabled in CI builds unless explicitly opted in via MSBUILD_NODEREUSE_ENABLED.
# Internal testing only; this env var will be replaced with a switch (https://github.com/dotnet/arcade/issues/17013) and must not be depended on.
if [[ "$node_reuse" == true && "${MSBUILD_NODEREUSE_ENABLED:-}" != "1" ]]; then
Write-PipelineTelemetryError -category 'Build' "Node reuse must be disabled in CI build."
ExitWithExitCode 1
fi
Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"sdk": {
"version": "11.0.100-preview.6.26313.102",
"version": "11.0.100-preview.6.26317.104",
"paths": [
"builds/downloads/dotnet",
"$host$"
],
"errorMessage": "The .NET SDK could not be found, please run 'make dotnet -C builds'."
},
"tools": {
"dotnet": "11.0.100-preview.6.26313.102"
"dotnet": "11.0.100-preview.6.26317.104"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26313.102"
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26317.104"
}
}
Loading