From 9d21ad47ecbd24efacd06715345ee58d0e3427ad Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 6 Mar 2025 05:02:30 +0000
Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/roslyn
build 20250305.15
Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework
From Version 4.14.0-3.25154.7 -> To Version 4.14.0-3.25155.15
---
eng/Version.Details.xml | 36 ++++++++++++++++++------------------
eng/Versions.props | 16 ++++++++--------
2 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 1569be899231..79254098e806 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -93,43 +93,43 @@
<Sha>e4889bb53328e6a75855c3f3d2122d0aacae7a4b</Sha>
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
</Dependency>
- <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.14.0-3.25154.7">
+ <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.14.0-3.25155.15">
<Uri>https://github.com/dotnet/roslyn</Uri>
- <Sha>37ec9cdcfbcb805026ff34ea6feccf68b6f55927</Sha>
+ <Sha>68501c0866aaacff3c6adfdd424f82d8e6557f50</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
- <Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.14.0-3.25154.7">
+ <Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.14.0-3.25155.15">
<Uri>https://github.com/dotnet/roslyn</Uri>
- <Sha>37ec9cdcfbcb805026ff34ea6feccf68b6f55927</Sha>
+ <Sha>68501c0866aaacff3c6adfdd424f82d8e6557f50</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
- <Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.14.0-3.25154.7">
+ <Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.14.0-3.25155.15">
<Uri>https://github.com/dotnet/roslyn</Uri>
- <Sha>37ec9cdcfbcb805026ff34ea6feccf68b6f55927</Sha>
+ <Sha>68501c0866aaacff3c6adfdd424f82d8e6557f50</Sha>
</Dependency>
- <Dependency Name="Microsoft.CodeAnalysis" Version="4.14.0-3.25154.7">
+ <Dependency Name="Microsoft.CodeAnalysis" Version="4.14.0-3.25155.15">
<Uri>https://github.com/dotnet/roslyn</Uri>
- <Sha>37ec9cdcfbcb805026ff34ea6feccf68b6f55927</Sha>
+ <Sha>68501c0866aaacff3c6adfdd424f82d8e6557f50</Sha>
</Dependency>
- <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.14.0-3.25154.7">
+ <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.14.0-3.25155.15">
<Uri>https://github.com/dotnet/roslyn</Uri>
- <Sha>37ec9cdcfbcb805026ff34ea6feccf68b6f55927</Sha>
+ <Sha>68501c0866aaacff3c6adfdd424f82d8e6557f50</Sha>
</Dependency>
- <Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.14.0-3.25154.7">
+ <Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.14.0-3.25155.15">
<Uri>https://github.com/dotnet/roslyn</Uri>
- <Sha>37ec9cdcfbcb805026ff34ea6feccf68b6f55927</Sha>
+ <Sha>68501c0866aaacff3c6adfdd424f82d8e6557f50</Sha>
</Dependency>
- <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.14.0-3.25154.7">
+ <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.14.0-3.25155.15">
<Uri>https://github.com/dotnet/roslyn</Uri>
- <Sha>37ec9cdcfbcb805026ff34ea6feccf68b6f55927</Sha>
+ <Sha>68501c0866aaacff3c6adfdd424f82d8e6557f50</Sha>
</Dependency>
- <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0-3.25154.7">
+ <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0-3.25155.15">
<Uri>https://github.com/dotnet/roslyn</Uri>
- <Sha>37ec9cdcfbcb805026ff34ea6feccf68b6f55927</Sha>
+ <Sha>68501c0866aaacff3c6adfdd424f82d8e6557f50</Sha>
</Dependency>
- <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0-3.25154.7">
+ <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0-3.25155.15">
<Uri>https://github.com/dotnet/roslyn</Uri>
- <Sha>37ec9cdcfbcb805026ff34ea6feccf68b6f55927</Sha>
+ <Sha>68501c0866aaacff3c6adfdd424f82d8e6557f50</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="9.0.2-rtm.25067.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 79a96f2e0ad4..ba876385d315 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -202,14 +202,14 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn -->
- <MicrosoftNetCompilersToolsetVersion>4.14.0-3.25154.7</MicrosoftNetCompilersToolsetVersion>
- <MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.14.0-3.25154.7</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
- <MicrosoftCodeAnalysisPackageVersion>4.14.0-3.25154.7</MicrosoftCodeAnalysisPackageVersion>
- <MicrosoftCodeAnalysisCSharpPackageVersion>4.14.0-3.25154.7</MicrosoftCodeAnalysisCSharpPackageVersion>
- <MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.14.0-3.25154.7</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
- <MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.14.0-3.25154.7</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
- <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.14.0-3.25154.7</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
- <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.14.0-3.25154.7</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
+ <MicrosoftNetCompilersToolsetVersion>4.14.0-3.25155.15</MicrosoftNetCompilersToolsetVersion>
+ <MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.14.0-3.25155.15</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
+ <MicrosoftCodeAnalysisPackageVersion>4.14.0-3.25155.15</MicrosoftCodeAnalysisPackageVersion>
+ <MicrosoftCodeAnalysisCSharpPackageVersion>4.14.0-3.25155.15</MicrosoftCodeAnalysisCSharpPackageVersion>
+ <MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.14.0-3.25155.15</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
+ <MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.14.0-3.25155.15</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
+ <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.14.0-3.25155.15</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
+ <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.14.0-3.25155.15</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
From 908d24964d32d82aa73ce42da5728da6dcc4d8ef Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Thu, 6 Mar 2025 08:11:08 -0600
Subject: [PATCH 2/2] Update prebuilt baseline versions
---
eng/SourceBuildPrebuiltBaseline.xml | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index d70041ea7b7a..664b28fa7a1b 100644
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -22,9 +22,9 @@
<UsagePattern IdentityGlob="Microsoft.Extensions.FileSystemGlobbing/*6.0.0*" />
<UsagePattern IdentityGlob="Microsoft.NET.StringTools/17.7.2" />
<UsagePattern IdentityGlob="Microsoft.VisualStudio.Setup.Configuration.Interop/3.2.2146" />
- <UsagePattern IdentityGlob="System.Collections.Immutable/8.0.0" />
+ <UsagePattern IdentityGlob="System.Collections.Immutable/9.0.0" />
<UsagePattern IdentityGlob="System.CommandLine.Rendering/0.4.0-alpha.24112.1" />
- <UsagePattern IdentityGlob="System.Composition/*8.0.0*" />
+ <UsagePattern IdentityGlob="System.Composition/*9.0.0*" />
<UsagePattern IdentityGlob="System.Composition.AttributedModel/*7.0.0*" />
<UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/*7.0.0*" />
<UsagePattern IdentityGlob="System.Composition.Convention/*7.0.0*" />
@@ -32,10 +32,10 @@
<UsagePattern IdentityGlob="System.Composition.Runtime/*7.0.0*" />
<UsagePattern IdentityGlob="System.Composition.TypedParts/*7.0.0*" />
<UsagePattern IdentityGlob="System.Diagnostics.DiagnosticSource/*8.0.1*" />
- <UsagePattern IdentityGlob="System.Diagnostics.EventLog/*7.0.0*" />
+ <UsagePattern IdentityGlob="System.Diagnostics.EventLog/*9.0.0*" />
<UsagePattern IdentityGlob="System.Formats.Asn1/*8.0.1*" />
<UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/*7.0.0*" />
- <UsagePattern IdentityGlob="System.Reflection.Metadata/8.0.0" />
+ <UsagePattern IdentityGlob="System.Reflection.Metadata/9.0.0" />
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*7.0.0*" />
<!-- Transitive dependencies from MSBuild -->
@@ -43,9 +43,10 @@
<!-- Transitive dependencies from roslyn -->
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/8.0.0" />
- <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection/8.0.0" />
- <UsagePattern IdentityGlob="Microsoft.Extensions.Options/8.0.0" />
- <UsagePattern IdentityGlob="Microsoft.Extensions.Primitives/8.0.0" />
+ <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection/9.0.0" />
+ <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection.Abstractions/9.0.0" />
+ <UsagePattern IdentityGlob="Microsoft.Extensions.Options/9.0.0" />
+ <UsagePattern IdentityGlob="Microsoft.Extensions.Primitives/9.0.0" />
<UsagePattern IdentityGlob="System.Buffers/4.6.0" />
<UsagePattern IdentityGlob="System.Memory/4.6.0" />
<UsagePattern IdentityGlob="System.Numerics.Vectors/4.6.0" />
@@ -58,8 +59,8 @@
<!-- These are coming in via runtime but the source-build infra isn't able to automatically pick up the right intermediate. -->
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*9.0.*" />
- <UsagePattern IdentityGlob="System.IO.Pipelines/*8.0.0*" />
- <UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*8.0.0*" />
+ <UsagePattern IdentityGlob="System.IO.Pipelines/*9.0.0*" />
+ <UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*9.0.0*" />
</IgnorePatterns>
</UsageData>