Skip to content

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

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 2 commits into
base: main
Choose a base branch
from
+101 −114
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
633b4b7
Backflow from https://github.com/dotnet/dotnet / 887f3d5 build 297286
dotnet-maestro[bot] Jan 14, 2026
5740f90
Update dependencies
dotnet-maestro[bot] Jan 14, 2026
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
2 changes: 2 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
<PackageProjectUrl>https://docs.microsoft.com/ef/core/</PackageProjectUrl>
<PackageIconFullPath>$(MSBuildThisFileDirectory)logo\ef-logo.png</PackageIconFullPath>
<PublishWindowsPdb>false</PublishWindowsPdb>

<DefaultNetCoreTargetFramework>$(NetCurrent)</DefaultNetCoreTargetFramework>
</PropertyGroup>

<PropertyGroup Condition="'$(DeveloperBuild)' == 'true'">
Expand Down
3 changes: 0 additions & 3 deletions activate.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ function deactivate ([switch]$init) {
}

Remove-Item env:DOTNET_ROOT -ErrorAction Ignore
Remove-Item env:DOTNET_MULTILEVEL_LOOKUP -ErrorAction Ignore
if (-not $init) {
# Remove the deactivate function
Remove-Item function:deactivate
Expand All @@ -33,8 +32,6 @@ deactivate -init
$_OLD_PATH = $env:PATH
# Tell dotnet where to find itself
$env:DOTNET_ROOT = "$PSScriptRoot\.dotnet"
# Tell dotnet not to look beyond the DOTNET_ROOT folder for more dotnet things
$env:DOTNET_MULTILEVEL_LOOKUP = 0
# Put dotnet first on PATH
$env:PATH = "${env:DOTNET_ROOT};${env:PATH}"

Expand Down
3 changes: 0 additions & 3 deletions activate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ deactivate () {
fi

unset DOTNET_ROOT
unset DOTNET_MULTILEVEL_LOOKUP
if [ ! "${1:-}" = "init" ] ; then
# Remove the deactivate function
unset -f deactivate
Expand All @@ -42,8 +41,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
_OLD_PATH="$PATH"
# Tell dotnet where to find itself
export DOTNET_ROOT="$DIR/.dotnet"
# Tell dotnet not to look beyond the DOTNET_ROOT folder for more dotnet things
export DOTNET_MULTILEVEL_LOOKUP=0
# Put dotnet first on PATH
export PATH="$DOTNET_ROOT:$PATH"

Expand Down
36 changes: 18 additions & 18 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,24 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25578.104</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25578.104</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25578.104</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0-rc.3.25578.104</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>10.0.0-rc.3.25578.104</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0-rc.3.25578.104</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0-rc.3.25578.104</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0-rc.3.25578.104</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0-rc.3.25578.104</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-rc.3.25578.104</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rc.3.25578.104</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>10.0.0-rc.3.25578.104</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.3.25578.104</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.3.25578.104</MicrosoftNETCorePlatformsPackageVersion>
<SystemFormatsAsn1PackageVersion>10.0.0-rc.3.25578.104</SystemFormatsAsn1PackageVersion>
<SystemRuntimeCachingPackageVersion>10.0.0-rc.3.25578.104</SystemRuntimeCachingPackageVersion>
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.3.25578.104</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>10.0.0-rc.3.25578.104</SystemTextJsonPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26064.107</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26064.107</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26064.107</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>11.0.0-alpha.1.26064.107</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>11.0.0-alpha.1.26064.107</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>11.0.0-alpha.1.26064.107</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>11.0.0-alpha.1.26064.107</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>11.0.0-alpha.1.26064.107</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>11.0.0-alpha.1.26064.107</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>11.0.0-alpha.1.26064.107</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>11.0.0-alpha.1.26064.107</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>11.0.0-alpha.1.26064.107</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-alpha.1.26064.107</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-alpha.1.26064.107</MicrosoftNETCorePlatformsPackageVersion>
<SystemFormatsAsn1PackageVersion>11.0.0-alpha.1.26064.107</SystemFormatsAsn1PackageVersion>
<SystemRuntimeCachingPackageVersion>11.0.0-alpha.1.26064.107</SystemRuntimeCachingPackageVersion>
<SystemTextEncodingsWebPackageVersion>11.0.0-alpha.1.26064.107</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>11.0.0-alpha.1.26064.107</SystemTextJsonPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand Down
74 changes: 37 additions & 37 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,80 +1,80 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1" BarId="292651" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="887f3d5a26e1001ee2777afde10cadcacb8cc735" BarId="297286" />
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.3.25578.104">
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="11.0.0-alpha.1.26064.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-rc.3.25578.104">
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="11.0.0-alpha.1.26064.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.3.25578.104">
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="11.0.0-alpha.1.26064.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.3.25578.104">
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="11.0.0-alpha.1.26064.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-rc.3.25578.104">
<Dependency Name="Microsoft.Extensions.Configuration" Version="11.0.0-alpha.1.26064.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.3.25578.104">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="11.0.0-alpha.1.26064.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-rc.3.25578.104">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="11.0.0-alpha.1.26064.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rc.3.25578.104">
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="11.0.0-alpha.1.26064.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-rc.3.25578.104">
<Dependency Name="Microsoft.Extensions.Logging" Version="11.0.0-alpha.1.26064.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.3.25578.104">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-alpha.1.26064.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.3.25578.104">
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-alpha.1.26064.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="10.0.0-rc.3.25578.104">
<Dependency Name="System.Text.Json" Version="11.0.0-alpha.1.26064.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.3.25578.104">
<Dependency Name="System.Text.Encodings.Web" Version="11.0.0-alpha.1.26064.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
</Dependency>
<Dependency Name="System.Formats.Asn1" Version="10.0.0-rc.3.25578.104">
<Dependency Name="System.Formats.Asn1" Version="11.0.0-alpha.1.26064.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
</Dependency>
<Dependency Name="System.Runtime.Caching" Version="10.0.0-rc.3.25578.104">
<Dependency Name="System.Runtime.Caching" Version="11.0.0-alpha.1.26064.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25578.104">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26064.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25578.104">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.26064.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25578.104">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26064.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1</Sha>
<Sha>887f3d5a26e1001ee2777afde10cadcacb8cc735</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
14 changes: 8 additions & 6 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,27 @@
<Import Project="Version.Details.props" />

<PropertyGroup Label="Version settings">
<VersionPrefix>10.0.3</VersionPrefix>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<PreReleaseVersionIteration></PreReleaseVersionIteration>
<VersionPrefix>11.0.0</VersionPrefix>
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
<!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->
<DotNetFinalVersionKind></DotNetFinalVersionKind>

<IncludeSourceRevisionInInformationalVersion>False</IncludeSourceRevisionInInformationalVersion>
<DefaultNetCoreTargetFramework>net10.0</DefaultNetCoreTargetFramework>

<!-- Arcade features -->
<UsingToolXliff>false</UsingToolXliff>
</PropertyGroup>
<PropertyGroup Label="MSBuild and Roslyn" Condition="'$(PreReleaseVersionLabel)' == 'servicing'">
<!-- Use the current stable builds for MSBuild and Roslyn packages, next version (non-servicing) will use the preview builds -->

<PropertyGroup Label="MSBuild and Roslyn">
<MicrosoftBuildFrameworkVersion>18.0.2</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildUtilitiesCoreVersion>18.0.2</MicrosoftBuildUtilitiesCoreVersion>
<MicrosoftBuildTasksCoreVersion>18.0.2</MicrosoftBuildTasksCoreVersion>
<MicrosoftCodeAnalysisCSharpVersion>5.0.0</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>5.0.0</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildVersion>5.0.0</MicrosoftCodeAnalysisWorkspacesMSBuildVersion>
</PropertyGroup>

<PropertyGroup Label="Test dependencies">
<!-- For this prerelease version, see https://github.com/dotnet/roslyn-sdk/issues/1175 -->
<MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.3-beta1.25564.1</MicrosoftCodeAnalysisAnalyzerTestingVersion>
Expand All @@ -33,8 +33,10 @@
<OpenTelemetryExporterInMemoryVersion>1.12.0</OpenTelemetryExporterInMemoryVersion>
<SQLitePCLRawVersion>3.0.2</SQLitePCLRawVersion>
</PropertyGroup>

<PropertyGroup Label="Analyzers">
<StyleCopAnalyzersVersion>1.1.118</StyleCopAnalyzersVersion>
<DotNetAnalyzersDocumentationAnalyzersVersion>1.0.0-beta.59</DotNetAnalyzersDocumentationAnalyzersVersion>
</PropertyGroup>

</Project>
2 changes: 2 additions & 0 deletions eng/common/core-templates/job/job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ jobs:
templateContext: ${{ parameters.templateContext }}

variables:
- name: AllowPtrToDetectTestRunRetryFiles
value: true
- ${{ if ne(parameters.enableTelemetry, 'false') }}:
- name: DOTNET_CLI_TELEMETRY_PROFILE
value: '$(Build.Repository.Uri)'
Expand Down
2 changes: 1 addition & 1 deletion eng/common/core-templates/job/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
demands: ImageOverride -equals build.ubuntu.2204.amd64
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
image: 1es-mariner-2
image: 1es-azurelinux-3
os: linux
${{ else }}:
pool:
Expand Down
2 changes: 1 addition & 1 deletion eng/common/core-templates/steps/install-microbuild-impl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ parameters:
type: boolean

steps:
- ${{ if eq(parameters.enablePreviewMicrobuild, 'true') }}:
- ${{ if eq(parameters.enablePreviewMicrobuild, true) }}:
- task: MicroBuildSigningPluginPreview@4
displayName: Install Preview MicroBuild plugin
inputs: ${{ parameters.microbuildTaskInputs }}
Expand Down
2 changes: 1 addition & 1 deletion eng/common/core-templates/steps/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ steps:
# in the default public locations.
internalRuntimeDownloadArgs=
if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey '$(dotnetbuilds-internal-container-read-token-base64)''
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
fi

buildConfig=Release
Expand Down
4 changes: 2 additions & 2 deletions eng/common/core-templates/steps/source-index-stage1-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ steps:
workingDirectory: $(Agent.TempDirectory)

- script: |
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
$(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --source ${{parameters.sourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
$(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --source ${{parameters.sourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools
displayName: "Source Index: Download netsourceindex Tools"
# Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk.
workingDirectory: $(Agent.TempDirectory)
Expand Down
4 changes: 2 additions & 2 deletions eng/common/cross/build-rootfs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ __AlpinePackages+=" krb5-dev"
__AlpinePackages+=" openssl-dev"
__AlpinePackages+=" zlib-dev"

__FreeBSDBase="13.4-RELEASE"
__FreeBSDBase="13.5-RELEASE"
__FreeBSDPkg="1.21.3"
__FreeBSDABI="13"
__FreeBSDPackages="libunwind"
Expand Down Expand Up @@ -383,7 +383,7 @@ while :; do
;;
freebsd14)
__CodeName=freebsd
__FreeBSDBase="14.2-RELEASE"
__FreeBSDBase="14.3-RELEASE"
__FreeBSDABI="14"
__SkipUnmount=1
;;
Expand Down
2 changes: 1 addition & 1 deletion eng/common/native/install-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ case "$os" in
libssl-dev libkrb5-dev pigz cpio

localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos"]; then
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
elif [ "$ID" = "amzn" ]; then
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates-official/post-build/setup-maestro-vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ steps:
is1ESPipeline: true

${{ each parameter in parameters }}:
${{ parameter.key }}: ${{ parameter.value }}
${{ parameter.key }}: ${{ parameter.value }}
Loading
Loading