Skip to content

[release/10.0] Source code updates from dotnet/dotnet #36601

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

Merged
cincuranet merged 1 commit into from
Aug 19, 2025
Merged

[release/10.0] Source code updates from dotnet/dotnet #36601

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
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 @@ -7,24 +7,24 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25416.105</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25416.105</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25416.105</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0-rc.2.25416.105</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>10.0.0-rc.2.25416.105</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0-rc.2.25416.105</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0-rc.2.25416.105</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0-rc.2.25416.105</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0-rc.2.25416.105</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-rc.2.25416.105</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rc.2.25416.105</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>10.0.0-rc.2.25416.105</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.2.25416.105</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.2.25416.105</MicrosoftNETCorePlatformsPackageVersion>
<SystemFormatsAsn1PackageVersion>10.0.0-rc.2.25416.105</SystemFormatsAsn1PackageVersion>
<SystemRuntimeCachingPackageVersion>10.0.0-rc.2.25416.105</SystemRuntimeCachingPackageVersion>
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.2.25416.105</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>10.0.0-rc.2.25416.105</SystemTextJsonPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25416.109</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25416.109</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25416.109</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0-rc.2.25416.109</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>10.0.0-rc.2.25416.109</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0-rc.2.25416.109</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0-rc.2.25416.109</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0-rc.2.25416.109</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0-rc.2.25416.109</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-rc.2.25416.109</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rc.2.25416.109</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>10.0.0-rc.2.25416.109</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.2.25416.109</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.2.25416.109</MicrosoftNETCorePlatformsPackageVersion>
<SystemFormatsAsn1PackageVersion>10.0.0-rc.2.25416.109</SystemFormatsAsn1PackageVersion>
<SystemRuntimeCachingPackageVersion>10.0.0-rc.2.25416.109</SystemRuntimeCachingPackageVersion>
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.2.25416.109</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>10.0.0-rc.2.25416.109</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="a01724db6d16445177cb31c6f300d38b0af06290" BarId="279606" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e" BarId="279809" />
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.2.25416.105">
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.2.25416.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-rc.2.25416.105">
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-rc.2.25416.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.2.25416.105">
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.2.25416.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.2.25416.105">
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.2.25416.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-rc.2.25416.105">
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-rc.2.25416.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.2.25416.105">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.2.25416.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-rc.2.25416.105">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-rc.2.25416.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rc.2.25416.105">
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rc.2.25416.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-rc.2.25416.105">
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-rc.2.25416.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.2.25416.105">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.2.25416.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.2.25416.105">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.2.25416.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="10.0.0-rc.2.25416.105">
<Dependency Name="System.Text.Json" Version="10.0.0-rc.2.25416.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.2.25416.105">
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.2.25416.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
</Dependency>
<Dependency Name="System.Formats.Asn1" Version="10.0.0-rc.2.25416.105">
<Dependency Name="System.Formats.Asn1" Version="10.0.0-rc.2.25416.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
</Dependency>
<Dependency Name="System.Runtime.Caching" Version="10.0.0-rc.2.25416.105">
<Dependency Name="System.Runtime.Caching" Version="10.0.0-rc.2.25416.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25416.105">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25416.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25416.105">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25416.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25416.105">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25416.109">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 2 additions & 4 deletions eng/common/core-templates/steps/install-microbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,8 @@ steps:
zipSources: false
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
${{ if eq(parameters.microbuildUseESRP, true) }}:
${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
useEsrpCli: true
${{ elseif eq(variables['System.TeamProject'], 'DevDiv') }}:
ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)'
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
${{ else }}:
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
Expand Down
49 changes: 43 additions & 6 deletions eng/common/generate-locproject.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,27 @@ $jsonTemplateFiles | ForEach-Object {

$jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern

$wxlFilesV3 = @()
$wxlFilesV5 = @()
$wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them
if (-not $wxlFiles) {
$wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } # pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files
if ($wxlEnFiles) {
$wxlFiles = @()
$wxlEnFiles | ForEach-Object {
$destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)"
$wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
}
$wxlFiles = @()
$wxlEnFiles | ForEach-Object {
$destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)"
$content = Get-Content $_.FullName -Raw

# Split files on schema to select different parser settings in the generated project.
if ($content -like "*http://wixtoolset.org/schemas/v4/wxl*")
{
$wxlFilesV5 += Copy-Item $_.FullName -Destination $destinationFile -PassThru
}
elseif ($content -like "*http://schemas.microsoft.com/wix/2006/localization*")
{
$wxlFilesV3 += Copy-Item $_.FullName -Destination $destinationFile -PassThru
}
}
}
}

Expand Down Expand Up @@ -114,7 +126,32 @@ $locJson = @{
CloneLanguageSet = "WiX_CloneLanguages"
LssFiles = @( "wxl_loc.lss" )
LocItems = @(
$wxlFiles | ForEach-Object {
$wxlFilesV3 | ForEach-Object {
$outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
$continue = $true
foreach ($exclusion in $exclusions.Exclusions) {
if ($_.FullName.Contains($exclusion)) {
$continue = $false
}
}
$sourceFile = ($_.FullName | Resolve-Path -Relative)
if ($continue)
{
return @{
SourceFile = $sourceFile
CopyOption = "LangIDOnPath"
OutputPath = $outputPath
}
}
}
)
},
@{
LanguageSet = $LanguageSet
CloneLanguageSet = "WiX_CloneLanguages"
LssFiles = @( "P210WxlSchemaV4.lss" )
LocItems = @(
$wxlFilesV5 | ForEach-Object {
$outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
$continue = $true
foreach ($exclusion in $exclusions.Exclusions) {
Expand Down
6 changes: 4 additions & 2 deletions eng/common/tools.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,15 +544,17 @@ function LocateVisualStudio([object]$vsRequirements = $null){
if (Get-Member -InputObject $GlobalJson.tools -Name 'vswhere') {
$vswhereVersion = $GlobalJson.tools.vswhere
} else {
$vswhereVersion = '2.5.2'
# keep this in sync with the VSWhereVersion in DefaultVersions.props
$vswhereVersion = '3.1.7'
}

$vsWhereDir = Join-Path $ToolsDir "vswhere\$vswhereVersion"
$vsWhereExe = Join-Path $vsWhereDir 'vswhere.exe'

if (!(Test-Path $vsWhereExe)) {
Create-Directory $vsWhereDir
Write-Host 'Downloading vswhere'
Write-Host 'Downloading vswhere $vswhereVersion'
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
Retry({
Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe
})
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 @@ -18,7 +18,7 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25416.105",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25416.105"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25416.109",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25416.109"
}
}
Loading