Skip to content

Add System.Collections.Immutable package dependency #8817

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

Merged
merged 2 commits into from
Jun 12, 2023
Merged

Add System.Collections.Immutable package dependency #8817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7ba03e
Add System.Collections.Immutable package dependency
NikolaMilosavljevic Jun 8, 2023
951af46
Fix for code check
NikolaMilosavljevic Jun 8, 2023
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
10 changes: 7 additions & 3 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,16 @@
<Sha>9e7fbcab4e5275f63c0cd37553ba426de9194309</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
<!-- Necessary for source-build. This allows the package to be retrieved from previously-source-built artifacts
and flow in as dependencies of the packages produced by razor. Without this entry an SBRP version of the
dependency would be bundled together with the produced package, causing issues for the consumer. -->
<!-- Necessary for source-build. This allows Microsoft.Extensions.ObjectPool and System.Collections.Immutable packages
to be retrieved from live source-build and their content consumed by packages produced by razor.
Without these entries, due to PVP flow work, SBRP packages would be consumed causing runtime issue. -->
<Dependency Name="Microsoft.Extensions.ObjectPool" Version="6.0.0">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>ae1a6cbe225b99c0bf38b7e31bf60cb653b73a52</Sha>
</Dependency>
<Dependency Name="System.Collections.Immutable" Version="6.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
8 changes: 5 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,12 @@
<MicrosoftVisualStudioLanguageServicesPackageVersion>4.7.0-2.23301.2</MicrosoftVisualStudioLanguageServicesPackageVersion>
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23252.2</MicrosoftSourceLinkGitHubPackageVersion>
<MicrosoftDotNetXliffTasksPackageVersion>1.0.0-beta.23266.1</MicrosoftDotNetXliffTasksPackageVersion>
<!-- Exception - this version is not updated by automation, but is in Version.Details due to source-build.
See its entry in Version.Details for more information. -->
<!--
Exception - Microsoft.Extensions.ObjectPool and System.Collections.Immutable packages are not updated by automation,
but are present in Version.Details.xml for source-build PVP flow. See the comment in Version.Details.xml for more information.
-->
<MicrosoftExtensionsObjectPoolPackageVersion>6.0.0</MicrosoftExtensionsObjectPoolPackageVersion>
<SystemCollectionsImmutablePackageVersion>6.0.0</SystemCollectionsImmutablePackageVersion>
Copy link
Member

@jaredpar jaredpar Jun 8, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

This repo needs to be on SCI 7.0, not 6.0. What happens when we fix that?

Copy link
Member Author

@NikolaMilosavljevic NikolaMilosavljevic Jun 8, 2023

Choose a reason for hiding this comment

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

It is currently on 6.0.0 - I'm only moving the property to a different group within the file.

Should update to SCI 7.0.0 be part of a separate PR?

Copy link
Member

@333fred 333fred Jun 8, 2023

Choose a reason for hiding this comment

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

I think Jared is asking what will be the impact to source-build of upgrading it?

Copy link
Member Author

@NikolaMilosavljevic NikolaMilosavljevic Jun 9, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

No impact on source-build - it always picks the latest live version anyway - 8.0.x.

However, due to recent improvements in source-build infra, all those dependencies need to be expressed in Version.Details.xml. As this particular dependency is not automatic (no maestro subscription) there isn't even a need to keep this version in Version.Details.xml and 'Versions.props`, in sync - it would be nice to do that though.

</PropertyGroup>
<!--
Expand All @@ -95,7 +98,6 @@
<VisualStudioLanguageServerProtocolVersion>17.6.22</VisualStudioLanguageServerProtocolVersion>
<!-- dotnet/runtime packages -->
<MicrosoftExtensionsPackageVersion>6.0.0</MicrosoftExtensionsPackageVersion>
<SystemCollectionsImmutablePackageVersion>6.0.0</SystemCollectionsImmutablePackageVersion>
<SystemCompositionPackageVersion>7.0.0</SystemCompositionPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>6.0.0</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemResourcesExtensionsPackageVersion>6.0.0</SystemResourcesExtensionsPackageVersion>
Expand Down