Skip to content

[automated] Merge branch 'main' => 'feature/net11-scouting' #20069

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
github-actions wants to merge 7 commits into
base: feature/net11-scouting
Choose a base branch
from
Open

[automated] Merge branch 'main' => 'feature/net11-scouting' #20069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4eefd05
[main] Update dependencies from dotnet/msbuild (#20055)
dotnet-maestro[bot] Jul 21, 2026
2cd254e
[main] Update dependencies from dotnet/roslyn (#20052)
dotnet-maestro[bot] Jul 21, 2026
9fc230a
Localized file check-in by OneLocBuild Task: Build definition ID 499:…
dotnet-bot Jul 21, 2026
319136f
Reset files to feature/net11-scouting
github-actions[bot] Jul 21, 2026
e729d97
[main] Update dependencies from dotnet/arcade (#20054)
dotnet-maestro[bot] Jul 22, 2026
705b638
Reset infra/version files to current feature/net11-scouting
invalid-email-address Jul 22, 2026
fd5a2d2
Merge remote-tracking branch 'origin/main' into merge/main-to-feature…
invalid-email-address Jul 22, 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: 1 addition & 1 deletion azure-pipelines-PR.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,7 @@ stages:
workingDirectory: $(Build.SourcesDirectory)
installationPath: $(Build.SourcesDirectory)/.dotnet
- script: .\eng\common\dotnet.cmd
- script: .\Build.cmd $(_kind) -pack -c $(_BuildConfig)
- script: .\Build.cmd $(_kind) -ci -pack -c $(_BuildConfig)
env:
NativeToolsOnMachine: true
displayName: Initial build and prepare packages.
Expand Down
2 changes: 1 addition & 1 deletion eng/TargetFrameworks.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<PropertyGroup>
<!-- Default target framework for F# products - only set if not already provided -->
<FSharpNetCoreProductTargetFramework Condition="'$(FSharpNetCoreProductTargetFramework)' == ''">net10.0</FSharpNetCoreProductTargetFramework>
<FSharpNetCoreProductTargetFramework Condition="'$(FSharpNetCoreProductTargetFramework)' == ''">net11.0</FSharpNetCoreProductTargetFramework>

<!-- Derive major version by stripping 'net' prefix and '.0' suffix (e.g., net10.0 -> 10) -->
<FSharpNetCoreProductMajorVersion>$([System.Text.RegularExpressions.Regex]::Replace('$(FSharpNetCoreProductTargetFramework)', '^net(\d+)\.0$', '$1'))</FSharpNetCoreProductMajorVersion>
Expand Down
44 changes: 22 additions & 22 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,32 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet-arcade dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26324.4</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26369.1</MicrosoftDotNetArcadeSdkPackageVersion>
<!-- dotnet-msbuild dependencies -->
<MicrosoftBuildPackageVersion>18.10.0-1.26359.10</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>18.10.0-1.26359.10</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildTasksCorePackageVersion>18.10.0-1.26359.10</MicrosoftBuildTasksCorePackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>18.10.0-1.26359.10</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftBuildPackageVersion>18.10.0-1.26370.18</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>18.10.0-1.26370.18</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildTasksCorePackageVersion>18.10.0-1.26370.18</MicrosoftBuildTasksCorePackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>18.10.0-1.26370.18</MicrosoftBuildUtilitiesCorePackageVersion>
<!-- dotnet-optimization dependencies -->
<optimizationlinuxarm64MIBCRuntimePackageVersion>1.0.0-prerelease.26318.1</optimizationlinuxarm64MIBCRuntimePackageVersion>
<optimizationlinuxx64MIBCRuntimePackageVersion>1.0.0-prerelease.26318.1</optimizationlinuxx64MIBCRuntimePackageVersion>
<optimizationwindows_ntarm64MIBCRuntimePackageVersion>1.0.0-prerelease.26318.1</optimizationwindows_ntarm64MIBCRuntimePackageVersion>
<optimizationwindows_ntx64MIBCRuntimePackageVersion>1.0.0-prerelease.26318.1</optimizationwindows_ntx64MIBCRuntimePackageVersion>
<optimizationwindows_ntx86MIBCRuntimePackageVersion>1.0.0-prerelease.26318.1</optimizationwindows_ntx86MIBCRuntimePackageVersion>
<optimizationlinuxarm64MIBCRuntimePackageVersion>1.0.0-prerelease.26309.1</optimizationlinuxarm64MIBCRuntimePackageVersion>
<optimizationlinuxx64MIBCRuntimePackageVersion>1.0.0-prerelease.26309.1</optimizationlinuxx64MIBCRuntimePackageVersion>
<optimizationwindows_ntarm64MIBCRuntimePackageVersion>1.0.0-prerelease.26309.1</optimizationwindows_ntarm64MIBCRuntimePackageVersion>
<optimizationwindows_ntx64MIBCRuntimePackageVersion>1.0.0-prerelease.26309.1</optimizationwindows_ntx64MIBCRuntimePackageVersion>
<optimizationwindows_ntx86MIBCRuntimePackageVersion>1.0.0-prerelease.26309.1</optimizationwindows_ntx86MIBCRuntimePackageVersion>
<!-- dotnet-roslyn dependencies -->
<MicrosoftCodeAnalysisPackageVersion>5.10.0-1.26358.9</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCompilersPackageVersion>5.10.0-1.26358.9</MicrosoftCodeAnalysisCompilersPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>5.10.0-1.26358.9</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.10.0-1.26358.9</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.10.0-1.26358.9</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
<MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>5.10.0-1.26358.9</MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>
<MicrosoftCodeAnalysisFeaturesPackageVersion>5.10.0-1.26358.9</MicrosoftCodeAnalysisFeaturesPackageVersion>
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.10.0-1.26358.9</MicrosoftVisualStudioLanguageServicesPackageVersion>
<MicrosoftCodeAnalysisPackageVersion>5.10.0-1.26365.3</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCompilersPackageVersion>5.10.0-1.26365.3</MicrosoftCodeAnalysisCompilersPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>5.10.0-1.26365.3</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.10.0-1.26365.3</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.10.0-1.26365.3</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
<MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>5.10.0-1.26365.3</MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>
<MicrosoftCodeAnalysisFeaturesPackageVersion>5.10.0-1.26365.3</MicrosoftCodeAnalysisFeaturesPackageVersion>
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.10.0-1.26365.3</MicrosoftVisualStudioLanguageServicesPackageVersion>
<!-- dotnet-runtime dependencies -->
<SystemCollectionsImmutablePackageVersion>10.0.2</SystemCollectionsImmutablePackageVersion>
<SystemCompositionPackageVersion>10.0.2</SystemCompositionPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>10.0.2</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemReflectionMetadataPackageVersion>10.0.2</SystemReflectionMetadataPackageVersion>
<SystemCollectionsImmutablePackageVersion>10.0.8</SystemCollectionsImmutablePackageVersion>
<SystemCompositionPackageVersion>10.0.8</SystemCompositionPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>10.0.8</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemReflectionMetadataPackageVersion>10.0.8</SystemReflectionMetadataPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>10.0.8</SystemSecurityCryptographyXmlPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
Expand Down
82 changes: 41 additions & 41 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,75 +1,75 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="1358fe9202089df7bdb79282a191c9dbbb773a06" BarId="320196" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="c802bb0f0b272d8547b12719c604c65f6beb1912" BarId="313071" />
<ProductDependencies>
<Dependency Name="Microsoft.Build" Version="18.10.0-1.26359.10">
<Dependency Name="Microsoft.Build" Version="18.10.0-1.26370.18">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>ad7e074ca3a93f4af30405c4cd24db04151d7ce8</Sha>
<Sha>eae54023463db15e9a9081f35a959c9162797643</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Framework" Version="18.10.0-1.26359.10">
<Dependency Name="Microsoft.Build.Framework" Version="18.10.0-1.26370.18">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>ad7e074ca3a93f4af30405c4cd24db04151d7ce8</Sha>
<Sha>eae54023463db15e9a9081f35a959c9162797643</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Tasks.Core" Version="18.10.0-1.26359.10">
<Dependency Name="Microsoft.Build.Tasks.Core" Version="18.10.0-1.26370.18">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>ad7e074ca3a93f4af30405c4cd24db04151d7ce8</Sha>
<Sha>eae54023463db15e9a9081f35a959c9162797643</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.10.0-1.26359.10">
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.10.0-1.26370.18">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>ad7e074ca3a93f4af30405c4cd24db04151d7ce8</Sha>
<Sha>eae54023463db15e9a9081f35a959c9162797643</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis" Version="5.10.0-1.26358.9">
<Dependency Name="Microsoft.CodeAnalysis" Version="5.10.0-1.26365.3">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>35967bab3447f7edd6162baee7048f801f18fffe</Sha>
<Sha>3d32d464e2949f054086fbb5346e4beea0c6df56</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Features" Version="5.10.0-1.26358.9">
<Dependency Name="Microsoft.CodeAnalysis.Features" Version="5.10.0-1.26365.3">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>35967bab3447f7edd6162baee7048f801f18fffe</Sha>
<Sha>3d32d464e2949f054086fbb5346e4beea0c6df56</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.10.0-1.26358.9">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.10.0-1.26365.3">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>35967bab3447f7edd6162baee7048f801f18fffe</Sha>
<Sha>3d32d464e2949f054086fbb5346e4beea0c6df56</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.10.0-1.26358.9">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.10.0-1.26365.3">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>35967bab3447f7edd6162baee7048f801f18fffe</Sha>
<Sha>3d32d464e2949f054086fbb5346e4beea0c6df56</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.10.0-1.26358.9">
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.10.0-1.26365.3">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>35967bab3447f7edd6162baee7048f801f18fffe</Sha>
<Sha>3d32d464e2949f054086fbb5346e4beea0c6df56</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.10.0-1.26358.9">
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.10.0-1.26365.3">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>35967bab3447f7edd6162baee7048f801f18fffe</Sha>
<Sha>3d32d464e2949f054086fbb5346e4beea0c6df56</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Compilers" Version="5.10.0-1.26358.9">
<Dependency Name="Microsoft.CodeAnalysis.Compilers" Version="5.10.0-1.26365.3">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>35967bab3447f7edd6162baee7048f801f18fffe</Sha>
<Sha>3d32d464e2949f054086fbb5346e4beea0c6df56</Sha>
</Dependency>
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.10.0-1.26358.9">
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.10.0-1.26365.3">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>35967bab3447f7edd6162baee7048f801f18fffe</Sha>
<Sha>3d32d464e2949f054086fbb5346e4beea0c6df56</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.Collections.Immutable" Version="10.0.2">
<Dependency Name="System.Collections.Immutable" Version="10.0.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>
</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.Composition" Version="10.0.2">
<Dependency Name="System.Composition" Version="10.0.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>
</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="10.0.2">
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="10.0.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>
</Sha>
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="System.Reflection.Metadata" Version="10.0.2">
<Dependency Name="System.Reflection.Metadata" Version="10.0.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>
</Sha>
Expand All @@ -82,29 +82,29 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26324.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26369.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1373629deb1e04f3e8e66fb68bb48ae36479c5ef</Sha>
<Sha>09bc8c946f4c4ae5d031c8875b85a6b8f1876b93</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.26318.1">
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.26309.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>06d09f3116a8ce9eed58e97ab167a3d1f4e1f151</Sha>
<Sha>b5964e83d71a6fbe08ae90fd5f5a2556917d27e6</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.26318.1">
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.26309.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>06d09f3116a8ce9eed58e97ab167a3d1f4e1f151</Sha>
<Sha>b5964e83d71a6fbe08ae90fd5f5a2556917d27e6</Sha>
</Dependency>
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.26318.1">
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.26309.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>06d09f3116a8ce9eed58e97ab167a3d1f4e1f151</Sha>
<Sha>b5964e83d71a6fbe08ae90fd5f5a2556917d27e6</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.26318.1">
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.26309.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>06d09f3116a8ce9eed58e97ab167a3d1f4e1f151</Sha>
<Sha>b5964e83d71a6fbe08ae90fd5f5a2556917d27e6</Sha>
</Dependency>
<Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.26318.1">
<Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.26309.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>06d09f3116a8ce9eed58e97ab167a3d1f4e1f151</Sha>
<Sha>b5964e83d71a6fbe08ae90fd5f5a2556917d27e6</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
Loading