10000 update CPS package version by LittleLittleCloud · Pull Request #9663 · dotnet/project-system · GitHub
[go: up one dir, main page]
Skip to content

update CPS package version #9663

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 4 commits into from
May 28, 2025
Merged

update CPS package version #9663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
857ff08
update CPS
LittleLittleCloud May 27, 2025
6b76b9b
rename publicapi folder from .net8 to .net9
LittleLittleCloud May 27, 2025
f042c2b
change net8.0 to net9.0 for a few more places
LittleLittleCloud May 27, 2025
51ea7af
convert CodeAnalysis to net8.0
LittleLittleCloud May 27, 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
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<PropertyGroup>
<MinimumVisualStudioVersion>17.0</MinimumVisualStudioVersion>
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<NetCoreTargetFramework>net8.0</NetCoreTargetFramework>
<NetCoreTargetFramework>net9.0</NetCoreTargetFramework>
<!--
IMPORTANT: The reason we use 99.0.0 is because we need a version number that will always be above the published version of the assemblies/packages.
This causes VS to always prefer our locally build packages for debugging (F5) purposes.
Expand Down
33 changes: 15 additions & 18 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<VSDebuggerVersion>17.13.0-beta.24561.1</VSDebuggerVersion>
<VSDebuggerVersion>17.13.0-beta.25105.1</VSDebuggerVersion>
</PropertyGroup>

<!--
Expand Down Expand Up @@ -34,17 +34,17 @@
<PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild.Vsman" Version="2.0.115" />
<PackageVersion Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="1.0.0" />
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.79-alpha" />
<PackageVersion Include="Nerdbank.Streams" Version="2.11.79" />
<PackageVersion Include="System.IO.Pipelines" Version="8.0.0" />
<PackageVersion Include="StreamJsonRpc" Version="2.20.17" />
<PackageVersion Include="Nerdbank.Streams" Version="2.12.87" />
<PackageVersion Include="System.IO.Pipelines" Version="9.0.0" />
<PackageVersion Include="StreamJsonRpc" Version="2.22.7" />

<!-- VS SDK -->
<!-- https://dev.azure.com/azure-public/vside/_artifacts/feed/vssdk -->
<PackageVersion Include="EnvDTE" Version="17.13.38055-preview.1" />
<PackageVersion Include="Microsoft.Internal.VisualStudio.Interop" Version="17.13.38055-preview.1" />
<PackageVersion Include="Microsoft.ServiceHub.Framework" Version="4.7.37" />
<PackageVersion Include="Microsoft.ServiceHub.Framework" Version="4.8.55" />
<PackageVersion Include="Microsoft.VisualStudio.ComponentModelHost" Version="17.13.13-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.12.18" />
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.13.41" />
<PackageVersion Include="Microsoft.VisualStudio.Debugger.Contracts" Version="$(VSDebuggerVersion)" />
<PackageVersion Include="Microsoft.VisualStudio.Debugger.UI.Interfaces" Version="$(VSDebuggerVersion)" />
<PackageVersion Include="Microsoft.VisualStudio.Data.Core" Version="17.13.38047-preview.1" />
Expand All @@ -55,21 +55,21 @@
<PackageVersion Include="Microsoft.VisualStudio.ImageCatalog" Version="17.13.38055-preview.1" />
<PackageVersion Include="Microsoft.VisualStudio.Interop" Version="17.13.38055-preview.1" />
<PackageVersion Include="Microsoft.VisualStudio.ManagedInterfaces" Version="17.13.38047-preview.1" />
<PackageVersion Include="Microsoft.VisualStudio.RpcContracts" Version="17.13.3-preview" />
<PackageVersion Include="Microsoft.VisualStudio.RpcContracts" Version="17.14.20" />
<PackageVersion Include="Microsoft.VisualStudio.Settings.15.0" Version="17.13.38055-preview.1" />
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.12.2159" />
<PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="17.13.38055-preview.1" />
<PackageVersion Include="Microsoft.VisualStudio.Shell.Design" Version="17.13.38055-preview.1" />
<PackageVersion Include="Microsoft.VisualStudio.Shell.Framework" Version="17.13.38055-preview.1" />
<PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="17.12.48" />
<PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="17.14.8" />
<PackageVersion Include="Microsoft.VisualStudio.TemplateWizardInterface" Version="17.13.38055-preview.1" />
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.12.19" />
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.12.19" />
<PackageVersion Include="Microsoft.VisualStudio.Utilities" Version="17.13.38299-preview.1" />
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.14.14" />
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.14.14" />
<PackageVersion Include="Microsoft.VisualStudio.Utilities" Version="17.14.39795" />
<PackageVersion Include="Microsoft.VisualStudio.Validation" Version="17.8.8" />
<PackageVersion Include="Microsoft.VisualStudio.XmlEditor" Version="17.13.0-preview-1-35408-014" />
<PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.13.17-preview1-ga15b669c04" />
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="8.0.0" />
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="9.0.0" />
<PackageVersion Include="System.Formats.Asn1" Version="8.0.1" />
<PackageVersion Include="Microsoft.VSDesigner" Version="17.13.38055-preview.1" />
<PackageVersion Include="VsWebSite.Interop" Version="17.13.38055-preview.1" />
Expand Down Expand Up @@ -102,9 +102,9 @@
<PackageVersion Include="NuGet.VisualStudio" Version="17.13.0-preview.1.10" />

<!-- Framework packages -->
<PackageVersion Include="Microsoft.IO.Redist" Version="6.0.1" />
<PackageVersion Include="Microsoft.IO.Redist" Version="6.1.0" />
<!-- Pin version to avoid CVE in System.Text.Json 8.0.4 -->
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
<PackageVersion Include="System.Text.Json" Version="9.0.0" />

<!-- MSBuild (for tests only) -->
<PackageVersion Include="Microsoft.Build" Version="17.13.0-preview-24504-04" />
Expand Down Expand Up @@ -142,10 +142,7 @@
<PackageVersion Include="CommandLineParser" Version="2.9.1" />

<!-- MessagePack -->
<!-- Fix: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2286088/ -->
<!-- The security vulnerable version of MessagePack package dependency is introduced by `Microsoft.VisualStudio.Utilities 17.12.40093` -->
<!-- We should be able to no longer explicitly-pinned MessagePack version after Microsoft.VisualStudio.Utilities update their MessagePack dependency -->
<PackageVersion Include="MessagePack" Version="2.5.187" />
<PackageVersion Include="MessagePack" Version="2.5.192" />
</ItemGroup>

</Project>
1 change: 0 additions & 1 deletion eng/imports/HostAgnostic.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
<!-- VS MEF -->
<PackageReference Include="Microsoft.VisualStudio.Composition" />

<!-- Pin MessagePack to a patched version with security vulnerable fix -->
<PackageReference Include="MessagePack" />
Copy link
Member

Choose a reason for hiding this comment

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

Can we remove this pin now, if we get a good version via a transitive reference? This was only added to work around such an issue.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Since MessagePack is bound in devenv.exe.config, it would be better to pin the specific package version so it's not surprisingly updated?

Copy link
Member

Choose a reason for hiding this comment

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

There are quite a few packages that we depend upon indirectly. We generally only add these pins when we need to (for component governance issues) and try to remove them again once things settle. It reduces the number of package updates we have to manually define in PRs like. Not a big deal though.


<!-- Roslyn -->
Expand Down
2 changes: 1 addition & 1 deletion eng/imports/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- Any changes to this file or format requires updates in project-system-vscode -->
<Project>
<PropertyGroup>
<CPSPackageVersion>17.13.42-pre</CPSPackageVersion>
<CPSPackageVersion>18.0.62-pre</CPSPackageVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion ...io.ProjectSystem.Managed.VS/ProjectSystem/VS/ProjectCapabilitiesMissingVetoProjectLoad.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public ProjectCapabilitiesMissingVetoProjectLoad(UnconfiguredProject project, IP
_projectCapabilitiesService = projectCapabilitiesService;
}

public Task<bool> AllowProjectLoadAsync(bool isNewProject, ProjectConfiguration activeConfiguration, CancellationToken cancellationToken = default)
public Task<bool> AllowProjectLoadAsync(bool isNewProject, ProjectConfiguration? activeConfiguration, CancellationToken cancellationToken = default)
{
ProjectType? projectType = GetCurrentProjectType();
if (projectType is null) // Unrecognized, probably a Shared Project
Expand Down
1 change: 0 additions & 1 deletion src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/PublicAPI.Shipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,5 +450,4 @@ Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext.Item
Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext.QueryProjectPropertiesContext(bool isProjectFile, string! file, string? itemType, string? itemName) -> void
override Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext.Equals(object! obj) -> bool
override Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext.GetHashCode() -> int
static Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext.TryCreateFromEntityId(Microsoft.VisualStudio.ProjectSystem.Query.EntityIdentity! id, out Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext? propertiesContext) -> bool
static readonly Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext.ProjectFile -> Microsoft.VisualStudio.ProjectSystem.VS.Query.QueryProjectPropertiesContext!
0 ...ed/PublicAPI/net8.0/PublicAPI.Shipped.txt → ...ed/PublicAPI/net9.0/PublicAPI.Shipped.txt
View file
Open in desktop
File renamed without changes.
0 .../PublicAPI/net8.0/PublicAPI.Unshipped.txt → .../PublicAPI/net9.0/PublicAPI.Unshipped.txt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/Setup/PackageContentTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ private static IEnumerable<string> GetNpmPackageContents()
config,
"obj",
"Microsoft.VisualStudio.ProjectSystem.Managed",
"net8.0",
"net9.0",
"npmsrc");

return Directory.EnumerateFiles(packagesDirectory, "*", SearchOption.AllDirectories)
Expand Down
Loading
0