Skip to content

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

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
dotnet-maestro wants to merge 1 commit into
base: main
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 17 additions & 17 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet-dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26313.102</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26313.102</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26313.102</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>11.0.0-preview.6.26313.102</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>11.0.0-preview.6.26313.102</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>11.0.0-preview.6.26313.102</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>11.0.0-preview.6.26313.102</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>11.0.0-preview.6.26313.102</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>11.0.0-preview.6.26313.102</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>11.0.0-preview.6.26313.102</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>11.0.0-preview.6.26313.102</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.6.26313.102</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-preview.6.26313.102</MicrosoftNETCorePlatformsPackageVersion>
<SystemFormatsAsn1PackageVersion>11.0.0-preview.6.26313.102</SystemFormatsAsn1PackageVersion>
<SystemRuntimeCachingPackageVersion>11.0.0-preview.6.26313.102</SystemRuntimeCachingPackageVersion>
<SystemTextEncodingsWebPackageVersion>11.0.0-preview.6.26313.102</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>11.0.0-preview.6.26313.102</SystemTextJsonPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26319.105</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26319.105</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26319.105</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>11.0.0-preview.6.26319.105</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>11.0.0-preview.6.26319.105</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>11.0.0-preview.6.26319.105</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>11.0.0-preview.6.26319.105</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>11.0.0-preview.6.26319.105</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>11.0.0-preview.6.26319.105</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>11.0.0-preview.6.26319.105</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>11.0.0-preview.6.26319.105</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.6.26319.105</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-preview.6.26319.105</MicrosoftNETCorePlatformsPackageVersion>
<SystemFormatsAsn1PackageVersion>11.0.0-preview.6.26319.105</SystemFormatsAsn1PackageVersion>
<SystemRuntimeCachingPackageVersion>11.0.0-preview.6.26319.105</SystemRuntimeCachingPackageVersion>
<SystemTextEncodingsWebPackageVersion>11.0.0-preview.6.26319.105</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>11.0.0-preview.6.26319.105</SystemTextJsonPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand Down
70 changes: 35 additions & 35 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,76 +1,76 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="06787fc66d5364230924d00f2c5c251aeb7a31cd" BarId="318609" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="b756a8d8a0e64905e16c81911bb09a8110bc3395" BarId="319511" />
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="11.0.0-preview.6.26313.102">
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="11.0.0-preview.6.26313.102">
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="11.0.0-preview.6.26313.102">
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="11.0.0-preview.6.26313.102">
<Dependency Name="Microsoft.Extensions.Configuration" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="11.0.0-preview.6.26313.102">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="11.0.0-preview.6.26313.102">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="11.0.0-preview.6.26313.102">
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="11.0.0-preview.6.26313.102">
<Dependency Name="Microsoft.Extensions.Logging" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<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.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-preview.6.26313.102">
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="11.0.0-preview.6.26313.102">
<Dependency Name="System.Text.Json" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="11.0.0-preview.6.26313.102">
<Dependency Name="System.Text.Encodings.Web" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="System.Formats.Asn1" Version="11.0.0-preview.6.26313.102">
<Dependency Name="System.Formats.Asn1" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="System.Runtime.Caching" Version="11.0.0-preview.6.26313.102">
<Dependency Name="System.Runtime.Caching" Version="11.0.0-preview.6.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26313.102">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26313.102">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26313.102">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26319.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
<Sha>b756a8d8a0e64905e16c81911bb09a8110bc3395</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 5 additions & 1 deletion eng/common/build.ps1
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
26 changes: 26 additions & 0 deletions eng/common/native/NativeAotSupported.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<Project>
<PropertyGroup>

<!-- Reject unsupported OS via RID prefix match -->
<_NativeAotSupportedOS Condition="
'$(TargetOS)' != 'browser' and
'$(TargetOS)' != 'haiku' and
'$(TargetOS)' != 'illumos' and
'$(TargetOS)' != 'netbsd' and
'$(TargetOS)' != 'solaris'
">true</_NativeAotSupportedOS>

<!-- Reject unsupported architectures via RID suffix match -->
<_NativeAotSupportedArch Condition="
'$(TargetArchitecture)' != 'wasm' and
('$(TargetArchitecture)' != 'x86' or '$(TargetOS)' == 'windows')
">true</_NativeAotSupportedArch>

<NativeAotSupported Condition="
'$(NativeAotSupported)' == '' and
'$(_NativeAotSupportedOS)' == 'true' and
'$(_NativeAotSupportedArch)' == 'true'
">true</NativeAotSupported>

</PropertyGroup>
</Project>
4 changes: 3 additions & 1 deletion eng/common/tools.ps1
View file
Open in desktop
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
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26313.102",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26313.102",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26319.105",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26319.105",
"Microsoft.Build.NoTargets": "3.7.134"
}
}
Loading