Skip to content

Commit 33ae58b

Browse files
AndriySvyrydAndriySvyryd
authored
Update MSBuild and Roslyn dependencies to sim-ship versions (#36707)
1 parent c020d82 commit 33ae58b

File tree

8 files changed

+53
-24
lines changed

8 files changed

+53
-24
lines changed

‎Directory.Packages.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsConfigurationAbstractionsVersion)" />
2323

2424
<!-- Roslyn dependencies-->
25-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion)" />
26-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisVersion)" />
27-
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftCodeAnalysisVersion)" />
25+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
26+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisCSharpWorkspacesVersion)" />
27+
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftCodeAnalysisWorkspacesMSBuildVersion)" />
2828

2929
<!-- analyzer dependencies-->
3030
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.1.118" />

‎eng/Version.Details.props‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@ This file should be imported by eng/Versions.props
2424
<SystemRuntimeCachingPackageVersion>10.0.0-rc.2.25427.104</SystemRuntimeCachingPackageVersion>
2525
<SystemTextEncodingsWebPackageVersion>10.0.0-rc.2.25427.104</SystemTextEncodingsWebPackageVersion>
2626
<SystemTextJsonPackageVersion>10.0.0-rc.2.25427.104</SystemTextJsonPackageVersion>
27+
<!-- dotnet/msbuild dependencies -->
28+
<MicrosoftBuildFrameworkPackageVersion>17.15.0-preview-25453-107</MicrosoftBuildFrameworkPackageVersion>
29+
<MicrosoftBuildUtilitiesCorePackageVersion>17.15.0-preview-25453-107</MicrosoftBuildUtilitiesCorePackageVersion>
30+
<MicrosoftBuildTasksCorePackageVersion>17.15.0-preview-25453-107</MicrosoftBuildTasksCorePackageVersion>
31+
<!-- dotnet/roslyn dependencies -->
32+
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-2.25453.107</MicrosoftCodeAnalysisCSharpPackageVersion>
33+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.0.0-2.25453.107</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
34+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.0.0-2.25453.107</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
2735
</PropertyGroup>
2836
<!--Property group for alternate package version names-->
2937
<PropertyGroup>
@@ -46,5 +54,13 @@ This file should be imported by eng/Versions.props
4654
<SystemRuntimeCachingVersion>$(SystemRuntimeCachingPackageVersion)</SystemRuntimeCachingVersion>
4755
<SystemTextEncodingsWebVersion>$(SystemTextEncodingsWebPackageVersion)</SystemTextEncodingsWebVersion>
4856
<SystemTextJsonVersion>$(SystemTextJsonPackageVersion)</SystemTextJsonVersion>
57+
<!-- dotnet/msbuild dependencies -->
58+
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildFrameworkPackageVersion)</MicrosoftBuildFrameworkVersion>
59+
<MicrosoftBuildUtilitiesCoreVersion>$(MicrosoftBuildUtilitiesCorePackageVersion)</MicrosoftBuildUtilitiesCoreVersion>
60+
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
61+
<!-- dotnet/roslyn dependencies -->
62+
<MicrosoftCodeAnalysisCSharpVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisCSharpVersion>
63+
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>$(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
64+
<MicrosoftCodeAnalysisWorkspacesMSBuildVersion>$(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion)</MicrosoftCodeAnalysisWorkspacesMSBuildVersion>
4965
</PropertyGroup>
5066
</Project>

‎eng/Version.Details.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,30 @@
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
6363
<Sha>7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3</Sha>
6464
</Dependency>
65+
<Dependency Name="Microsoft.Build.Framework" Version="17.15.0-preview-25453-107">
66+
<Uri>https://github.com/dotnet/msbuild</Uri>
67+
<Sha>53a2d6ba9edc932e724dc80a5a56eeb9943863cf</Sha>
68+
</Dependency>
69+
<Dependency Name="Microsoft.Build.Utilities.Core" Version="17.15.0-preview-25453-107">
70+
<Uri>https://github.com/dotnet/msbuild</Uri>
71+
<Sha>53a2d6ba9edc932e724dc80a5a56eeb9943863cf</Sha>
72+
</Dependency>
73+
<Dependency Name="Microsoft.Build.Tasks.Core" Version="17.15.0-preview-25453-107">
74+
<Uri>https://github.com/dotnet/msbuild</Uri>
75+
<Sha>53a2d6ba9edc932e724dc80a5a56eeb9943863cf</Sha>
76+
</Dependency>
77+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-2.25453.107">
78+
<Uri>https://github.com/dotnet/roslyn</Uri>
79+
<Sha>e5924c0044a45b9b10ccde820a447adbb636f8be</Sha>
80+
</Dependency>
81+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0-2.25453.107">
82+
<Uri>https://github.com/dotnet/roslyn</Uri>
83+
<Sha>e5924c0044a45b9b10ccde820a447adbb636f8be</Sha>
84+
</Dependency>
85+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0-2.25453.107">
86+
<Uri>https://github.com/dotnet/roslyn</Uri>
87+
<Sha>e5924c0044a45b9b10ccde820a447adbb636f8be</Sha>
88+
</Dependency>
6589
</ProductDependencies>
6690
<ToolsetDependencies>
6791
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25427.104">

‎eng/Versions.props‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,11 @@
1717
<UsingToolXliff>False</UsingToolXliff>
1818
</PropertyGroup>
1919
<PropertyGroup Label="Other dependencies">
20-
<MicrosoftBuildFrameworkVersion>17.14.8</MicrosoftBuildFrameworkVersion>
21-
<MicrosoftBuildUtilitiesCoreVersion>17.14.8</MicrosoftBuildUtilitiesCoreVersion>
22-
<MicrosoftBuildTasksCoreVersion>17.14.8</MicrosoftBuildTasksCoreVersion>
23-
<!-- NB: This version affects Visual Studio compatibility. See https://github.com/dotnet/roslyn/blob/main/docs/wiki/NuGet-packages.md and https://learn.microsoft.com/visualstudio/extensibility/roslyn-version-support -->
24-
<MicrosoftCodeAnalysisVersion>4.14.0</MicrosoftCodeAnalysisVersion>
2520
<MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.3-beta1.24423.1</MicrosoftCodeAnalysisAnalyzerTestingVersion>
2621
<MicrosoftCodeAnalysisCSharpTestingVersion>1.1.3-beta1.24352.1</MicrosoftCodeAnalysisCSharpTestingVersion>
2722
<AzureIdentityVersion>1.14.2</AzureIdentityVersion>
2823
<AzureResourceManagerCosmosDBVersion>1.3.2</AzureResourceManagerCosmosDBVersion>
2924
<OpenTelemetryExporterInMemoryVersion>1.12.0</OpenTelemetryExporterInMemoryVersion>
3025
<SQLitePCLRawVersion>2.1.11</SQLitePCLRawVersion>
3126
</PropertyGroup>
32-
</Project>
27+
</Project>

‎test/EFCore.Relational.Specification.Tests/Query/PrecompiledQueryRelationalTestBase.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,7 @@ public virtual Task Contains_with_parameterized_collection()
965965
=> Test(
966966
"""
967967
int[] ids = [1, 2, 3];
968-
_ = await context.Blogs.Where(b => ids.Contains(b.Id)).ToListAsync();
968+
_ = await context.Blogs.Where(b => ((IEnumerable<int>)ids).Contains(b.Id)).ToListAsync();
969969
""");
970970

971971
[ConditionalFact]

‎test/EFCore.Specification.Tests/Directory.Packages.props‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
<Project>
22
<Import Project="..\Directory.Packages.props" />
3-
<ItemGroup>
4-
<!-- Workaround for https://github.com/dotnet/roslyn-sdk/issues/1175 -->
5-
<PackageVersion Update="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion)" />
6-
<PackageVersion Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisVersion)" />
7-
<PackageVersion Update="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftCodeAnalysisVersion)" />
8-
</ItemGroup>
93
</Project>

‎test/EFCore.SqlServer.FunctionalTests/Query/PrecompiledQuerySqlServerTest.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1800,13 +1800,13 @@ public override async Task Contains_with_parameterized_collection()
18001800

18011801
AssertSql(
18021802
"""
1803-
@ids1='1'
1804-
@ids2='2'
1805-
@ids3='3'
1803+
@p1='1'
1804+
@p2='2'
1805+
@p3='3'
18061806
18071807
SELECT [b].[Id], [b].[Name], [b].[Json]
18081808
FROM [Blogs] AS [b]
1809-
WHERE [b].[Id] IN (@ids1, @ids2, @ids3)
1809+
WHERE [b].[Id] IN (@p1, @p2, @p3)
18101810
""");
18111811
}
18121812

‎test/EFCore.SqlServer.FunctionalTests/Query/PrecompiledSqlPregenerationQuerySqlServerTest.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -233,18 +233,18 @@ public virtual async Task Do_not_cache_is_respected()
233233
await Test(
234234
"""
235235
string[] names = ["foo", "bar"];
236-
var blogs = await context.Blogs.Where(b => names.Contains(b.Name)).ToListAsync();
236+
var blogs = await context.Blogs.Where(b => ((IEnumerable<string>)names).Contains(b.Name)).ToListAsync();
237237
""",
238238
interceptorCodeAsserter: code => Assert.Contains(nameof(RelationalCommandCache), code));
239239

240240
AssertSql(
241241
"""
242-
@names1='foo' (Size = 4000)
243-
@names2='bar' (Size = 4000)
242+
@p1='foo' (Size = 4000)
243+
@p2='bar' (Size = 4000)
244244
245245
SELECT [b].[Id], [b].[Name]
246246
FROM [Blogs] AS [b]
247-
WHERE [b].[Name] IN (@names1, @names2)
247+
WHERE [b].[Name] IN (@p1, @p2)
248248
""");
249249
}
250250

0 commit comments

Comments
 (0)