Skip to content

Commit e71eb7a

Browse files
[main] Update dependencies from dotnet/roslyn, nuget/nuget.client (#9642)
* Update dependencies from https://github.com/dotnet/roslyn build 20240113.2 Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23629.3 -> To Version 4.10.0-1.24063.2 * Update dependencies from https://github.com/dotnet/roslyn build 20240119.13 Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23629.3 -> To Version 4.10.0-1.24069.13 * Update dependencies from https://github.com/nuget/nuget.client build 6.10.0.9 NuGet.Build.Tasks From Version 6.9.0-preview.1.70 -> To Version 6.10.0-preview.1.9 * Update dependencies from https://github.com/dotnet/roslyn build 20240126.10 Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23629.3 -> To Version 4.10.0-1.24076.10 * Update dependencies from https://github.com/nuget/nuget.client build 6.10.0.12 NuGet.Build.Tasks From Version 6.9.0-preview.1.70 -> To Version 6.10.0-preview.1.12 * Update dependencies from https://github.com/dotnet/roslyn build 20240204.1 Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23629.3 -> To Version 4.10.0-2.24104.1 * Update dependencies from https://github.com/nuget/nuget.client build 6.10.0.18 NuGet.Build.Tasks From Version 6.9.0-preview.1.70 -> To Version 6.10.0-preview.1.18 * Update Directory.Build.targets --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <[email protected]>
1 parent 553649b commit e71eb7a

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

Directory.Build.targets

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,13 @@
3737
<RemoveDir Directories="$(_PackageFolderInGlobalPackages)"
3838
Condition="Exists('$(_PackageFolderInGlobalPackages)')" />
3939
</Target>
40+
41+
<!-- Make APICompat use roslyn from the toolset SDK instead of from the toolset package. This avoids unification issues on desktop msbuild.
42+
TODO: Remove when a 8.0.200 or 9.0 SDK is consumed. -->
43+
<Target Name="FixAPICompatWorkAroundRoslynMove" AfterTargets="CollectApiCompatInputs">
44+
<PropertyGroup>
45+
<RoslynAssembliesPath>$(RoslynTargetsPath)</RoslynAssembliesPath>
46+
</PropertyGroup>
47+
</Target>
48+
4049
</Project>

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,13 @@
8787
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
8888
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
8989
</Dependency>
90-
<Dependency Name="NuGet.Build.Tasks" Version="6.9.0-preview.1.70">
90+
<Dependency Name="NuGet.Build.Tasks" Version="6.10.0-preview.1.18">
9191
<Uri>https://github.com/nuget/nuget.client</Uri>
92-
<Sha>6a82332d4936d893fb1e22fd86f2e3cb4d54c471</Sha>
92+
<Sha>f207cbb3530350f785d1b04014e15563cc9b5e03</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.9.0-3.23629.3">
94+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.10.0-2.24104.1">
9595
<Uri>https://github.com/dotnet/roslyn</Uri>
96-
<Sha>ebb588725e707db23d8723b633258e7eb918277b</Sha>
96+
<Sha>d9272a3f01928b1c3614a942bdbbfeb0fb17a43b</Sha>
9797
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
9898
</Dependency>
9999
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24060.4">

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24060.4</MicrosoftDotNetXUnitExtensionsVersion>
5454
<MicrosoftExtensionsDependencyModelVersion>7.0.0</MicrosoftExtensionsDependencyModelVersion>
5555
<MicrosoftIORedistVersion>6.0.0</MicrosoftIORedistVersion>
56-
<MicrosoftNetCompilersToolsetVersion>4.9.0-3.23629.3</MicrosoftNetCompilersToolsetVersion>
57-
<NuGetBuildTasksVersion>6.9.0-preview.1.70</NuGetBuildTasksVersion>
56+
<MicrosoftNetCompilersToolsetVersion>4.10.0-2.24104.1</MicrosoftNetCompilersToolsetVersion>
57+
<NuGetBuildTasksVersion>6.10.0-preview.1.18</NuGetBuildTasksVersion>
5858
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
5959
</PropertyGroup>
6060
<Target Name="OverrideArcadeFileVersion" AfterTargets="_InitializeAssemblyVersion">

0 commit comments

Comments
 (0)