Skip to content
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

Bump BCL references to 9.0 #76890

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

Bump BCL references to 9.0 #76890

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
22e1b3f
Bump BCL references to 9.0
genlu Jan 23, 2025
551a1e6
Add expected dependency
genlu Jan 23, 2025
47800f4
fix
genlu Jan 23, 2025
55ce3e4
Update BCL dependencies with darc
JoeRobich Jan 23, 2025
adb8717
Clean up xliff changes
JoeRobich Jan 23, 2025
7d04b76
pin SCI version in syntax generator
genlu Jan 24, 2025
1858680
Merge remote-tracking branch 'origin/UpgradeBcl' into UpgradeBcl
genlu Jan 24, 2025
dfbabaf
fix
genlu Jan 24, 2025
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
108 changes: 51 additions & 57 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,101 +24,101 @@
<SourceBuild RepoName="command-line-api" ManagedOnly="true" />
</Dependency>
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
<Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0">
<Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="8.0.0">
<Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="8.0.0">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="8.0.0">
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0">
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0">
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Options.ConfigurationExtension" Version="8.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Options" Version="8.0.0">
<Dependency Name="Microsoft.Extensions.Options" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Primitives" Version="8.0.0">
<Dependency Name="Microsoft.Extensions.Primitives" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="System.Collections.Immutable" Version="8.0.0">
<Dependency Name="System.Collections.Immutable" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.Composition" Version="8.0.0">
<Dependency Name="System.ComponentModel.Composition" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="8.0.0">
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="System.IO.Hashing" Version="8.0.0">
<Dependency Name="System.IO.Hashing" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="System.IO.Pipelines" Version="8.0.0">
<Dependency Name="System.IO.Pipelines" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="8.0.0">
<Dependency Name="System.Resources.Extensions" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="8.0.0">
<Dependency Name="System.Text.Encodings.Web" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="8.0.0">
<Dependency Name="System.Text.Json" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="System.Threading.Tasks.Dataflow" Version="8.0.0">
<Dependency Name="System.Threading.Tasks.Dataflow" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="System.Reflection.Metadata" Version="8.0.0">
<Dependency Name="System.Reflection.Metadata" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="8.0.0">
<Dependency Name="System.Configuration.ConfigurationManager" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="8.0.0">
<Dependency Name="System.Diagnostics.EventLog" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0">
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="8.0.0">
<Dependency Name="System.Security.Permissions" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="8.0.0">
<Dependency Name="System.Windows.Extensions" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand All @@ -132,15 +132,9 @@
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.xliff-tasks" Version="1.0.0-beta.23475.1">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25065.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
</Dependency>
<Dependency Name="Microsoft.DiaSymReader" Version="2.0.0">
<Uri>https://github.com/dotnet/symreader</Uri>
Expand All @@ -166,9 +160,9 @@
</Dependency>
<!-- Entries below are necessary for source-build. This allows the packages to be retrieved from previously-source-built
artifacts and flow in as dependencies of the packages produced by roslyn. -->
<Dependency Name="System.Composition" Version="8.0.0">
<Dependency Name="System.Composition" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
Expand Down
51 changes: 25 additions & 26 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,37 +47,37 @@
-->
<PropertyGroup>
<SystemCommandLineVersion>2.0.0-beta4.24528.1</SystemCommandLineVersion>
JoeRobich marked this conversation as resolved.
Show resolved Hide resolved
<SystemCompositionVersion>8.0.0</SystemCompositionVersion>
<SystemConfigurationConfigurationManagerVersion>8.0.0</SystemConfigurationConfigurationManagerVersion>
<SystemDiagnosticsEventLogVersion>8.0.0</SystemDiagnosticsEventLogVersion>
<SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
<SystemComponentModelCompositionVersion>8.0.0</SystemComponentModelCompositionVersion>
<SystemDiagnosticsDiagnosticSourceVersion>8.0.1</SystemDiagnosticsDiagnosticSourceVersion>
<SystemIOHashingVersion>8.0.0</SystemIOHashingVersion>
<SystemIOPipelinesVersion>8.0.0</SystemIOPipelinesVersion>
<SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
<SystemResourcesExtensionsVersion>8.0.0</SystemResourcesExtensionsVersion>
<SystemSecurityCryptographyProtectedDataVersion>8.0.0</SystemSecurityCryptographyProtectedDataVersion>
<SystemSecurityPermissionsVersion>8.0.0</SystemSecurityPermissionsVersion>
<SystemTextEncodingsWebVersion>8.0.0</SystemTextEncodingsWebVersion>
<SystemCompositionVersion>9.0.0</SystemCompositionVersion>
<SystemConfigurationConfigurationManagerVersion>9.0.0</SystemConfigurationConfigurationManagerVersion>
<SystemDiagnosticsEventLogVersion>9.0.0</SystemDiagnosticsEventLogVersion>
<SystemCollectionsImmutableVersion>9.0.0</SystemCollectionsImmutableVersion>
<SystemComponentModelCompositionVersion>9.0.0</SystemComponentModelCompositionVersion>
<SystemDiagnosticsDiagnosticSourceVersion>9.0.0</SystemDiagnosticsDiagnosticSourceVersion>
<SystemIOHashingVersion>9.0.0</SystemIOHashingVersion>
<SystemIOPipelinesVersion>9.0.0</SystemIOPipelinesVersion>
<SystemReflectionMetadataVersion>9.0.0</SystemReflectionMetadataVersion>
<SystemResourcesExtensionsVersion>9.0.0</SystemResourcesExtensionsVersion>
<SystemSecurityCryptographyProtectedDataVersion>9.0.0</SystemSecurityCryptographyProtectedDataVersion>
<SystemSecurityPermissionsVersion>9.0.0</SystemSecurityPermissionsVersion>
<SystemTextEncodingsWebVersion>9.0.0</SystemTextEncodingsWebVersion>
<!-- Note: When updating SystemTextJsonVersion ensure that the version is no higher than what is used by MSBuild in VS (would lead to NGEN failures on insertion). -->
<SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
<SystemThreadingTasksDataflowVersion>8.0.0</SystemThreadingTasksDataflowVersion>
<SystemWindowsExtensionsVersion>8.0.0</SystemWindowsExtensionsVersion>
<MicrosoftBclAsyncInterfacesVersion>8.0.0</MicrosoftBclAsyncInterfacesVersion>
<SystemTextJsonVersion>9.0.0</SystemTextJsonVersion>
<SystemThreadingTasksDataflowVersion>9.0.0</SystemThreadingTasksDataflowVersion>
<SystemWindowsExtensionsVersion>9.0.0</SystemWindowsExtensionsVersion>
<MicrosoftBclAsyncInterfacesVersion>9.0.0</MicrosoftBclAsyncInterfacesVersion>
<MicrosoftCodeAnalysisAnalyzersVersion>3.11.0</MicrosoftCodeAnalysisAnalyzersVersion>
<MicrosoftCodeAnalysisAnalyzerUtilitiesVersion>3.3.0</MicrosoftCodeAnalysisAnalyzerUtilitiesVersion>
<MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview.23468.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
<MicrosoftDiaSymReaderVersion>2.0.0</MicrosoftDiaSymReaderVersion>
<MicrosoftExtensionsConfigurationVersion>8.0.0</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsDependencyInjectionVersion>8.0.0</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsConfigurationVersion>9.0.0</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsDependencyInjectionVersion>9.0.0</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsFileSystemGlobbingVersion>8.0.0</MicrosoftExtensionsFileSystemGlobbingVersion>
<MicrosoftExtensionsLoggingVersion>8.0.0</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>8.0.0</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingVersion>9.0.0</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConsoleVersion>9.0.0</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsOptionsConfigurationExtensionVersion>8.0.0</MicrosoftExtensionsOptionsConfigurationExtensionVersion>
<MicrosoftExtensionsOptionsVersion>8.0.0</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>8.0.0</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftExtensionsOptionsVersion>9.0.0</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>9.0.0</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftVSSDKBuildToolsVersion>17.9.3137-preview3</MicrosoftVSSDKBuildToolsVersion>
<vswhereVersion>2.4.1</vswhereVersion>
<!--
Expand All @@ -89,8 +89,7 @@
<MicrosoftIdentityModelJsonWebTokensVersion>6.34.0</MicrosoftIdentityModelJsonWebTokensVersion>
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
<SystemIdentityModelTokensJwtVersion>6.34.0</SystemIdentityModelTokensJwtVersion>
<!-- TODO: remove https://github.com/dotnet/roslyn/issues/71827 -->
<MicrosoftDotNetXliffTasksVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">9.0.0-beta.24076.5</MicrosoftDotNetXliffTasksVersion>
<MicrosoftDotNetXliffTasksVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">9.0.0-beta.25065.2</MicrosoftDotNetXliffTasksVersion>
<MicrosoftIdentityClientVersion>4.61.3</MicrosoftIdentityClientVersion>
<SystemIdentityModelTokensJwtVersion>6.34.0</SystemIdentityModelTokensJwtVersion>
</PropertyGroup>
Expand Down
2 changes: 2 additions & 0 deletions src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
<_Dependency Remove="MessagePack"/>
<_Dependency Remove="MessagePack.Annotations"/>
<_Dependency Remove="Microsoft.Bcl.AsyncInterfaces"/>
<_Dependency Remove="Microsoft.Bcl.HashCode" />
<_Dependency Remove="Microsoft.Build"/>
<_Dependency Remove="Microsoft.Build.Framework"/>
<_Dependency Remove="Microsoft.Build.Tasks.Core"/>
Expand All @@ -132,6 +133,7 @@
<_Dependency Remove="System.Configuration.ConfigurationManager"/>
<_Dependency Remove="System.Diagnostics.DiagnosticSource"/>
<_Dependency Remove="System.Drawing.Common"/>
<_Dependency Remove="System.Formats.Nrbf" />
<_Dependency Remove="System.IO.Packaging"/>
<_Dependency Remove="System.IO.Pipelines"/>
<_Dependency Remove="System.Memory"/>
Expand Down
2 changes: 2 additions & 0 deletions ...s/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
<Project Sdk="Microsoft.NET.Sdk">
Expand All @@ -14,6 +14,8 @@
<ItemGroup>
<!-- Make sure to reference the same version of Microsoft.CodeAnalysis.Analyzers as the rest of the build -->
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
<!-- Pin SCI to 8.0, since this generator is built & consumed in our pipeline so it has to work with stock compiler in msbuild (currently shipped with SCI 8.0) -->
<PackageReference Include="System.Collections.Immutable" VersionOverride="8.0.0" PrivateAssets="All" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<!-- Pin SCI to 8.0, since this generator is built & consumed in our pipeline so it has to work with stock compiler in msbuild (currently shipped with SCI 8.0) -->
<PackageReference Include="System.Collections.Immutable" VersionOverride="8.0.0" PrivateAssets="All" />
<!-- Pin SRM & SCI to 8.0, since this generator is built & consumed in our pipeline so it has to work with stock compiler in msbuild (currently shipped with SRM & SCI 8.0) -->
<PackageReference Include="System.Reflection.Metadata" VersionOverride="8.0.0" PrivateAssets="All" />
<PackageReference Include="System.Collections.Immutable" VersionOverride="8.0.0" PrivateAssets="All" />

</ItemGroup>
<ItemGroup>
<!-- If we're building the command line tool, we have to include some dependencies used for grammar generation -->
Expand Down
2 changes: 2 additions & 0 deletions src/Workspaces/MSBuild/BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
The version targeted is only used for build time, since we use MSBuildLocator to discover the proper version at runtime.
-->
<_MsbuildVersion>17.3.4</_MsbuildVersion>
<!-- S.C.I 9.0 no longer supports .NET 6 -->
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<!-- S.C.I 9.0 no longer supports .NET 6 -->
<!-- Some of the 9.0 packages no longer have been tested against .NET 6, but we're OK with that -->

<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jasonmalinowski Would we want to pin the BuildHost at S.C.I 8.0.0 until we are ready to bump the tfm?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally we should be bumping the BuildHost TFM "as late as possible". Once we merge the other PR that makes the library netstandard2.0, somebody could theoretically try to use MSBuildWorkspace in a 6.0 app...but if the BuildHost only runs on 8.0 or later you end up creating an implicit version limitation there.

That is of course not to say that we should bend backwards to support older versions -- but if we can do a minimal amount of work to keep stuff older, that might be easier than dealing the inevitable bugs people file when old versions don't work.

I think setting this property seems easiest; frankly I'm kinda surprised we added such a property in the first place. I'd propose changing the comment though since I'm sure other package upgrades will depend on this than just System.Collections.Immutable.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And oh: I imagine this is easier to set this than it is to pin versions and deal with the special problems that creates.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah ok, I was afraid the package wasn't shipping with netstandard or net6.0 builds but it still has netstardard2.0

</PropertyGroup>
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
<PackageReference Include="Microsoft.Build" VersionOverride="$(_MsbuildVersion)" ExcludeAssets="Runtime" PrivateAssets="All" />
Expand Down
2 changes: 1 addition & 1 deletion src/Workspaces/Remote/ServiceHub.CoreComponents/CoreComponents.Shared.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
Always include BCL in the vsix for non-official build to avoid breakage. Since VS used on CI machines
as well as by external contributors usually lags behind our insertion target.
-->
<_ExcludeRuntimeLibraries Condition="'$(OfficialBuild)' == 'true'">true</_ExcludeRuntimeLibraries>
<_ExcludeRuntimeLibraries Condition="'$(OfficialBuild)' == 'true'">false</_ExcludeRuntimeLibraries>
</PropertyGroup>

<ItemGroup>
Expand Down
Loading