-
Notifications
You must be signed in to change notification settings - Fork 4k
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.
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
Upgrade editor packages #49253
Upgrade editor packages #49253
Conversation
e8ae99a
to
c1b6a38
Compare
src/VisualStudio/Setup.Dependencies/Roslyn.VisualStudio.Setup.Dependencies.csproj
Outdated
Show resolved
Hide resolved
@genlu: Do you plan on merging this soon, as it might be a bit before we have a 16.9 VS image that we can run integration tests on. |
@jasonmalinowski There's no hurry on this, but I do want to run our unit tests with newer version here to make sure the editor regression is fixed. |
c1b6a38
to
b9ac96c
Compare
<PackageReference Include="Microsoft.VisualStudio.ProjectSystem.Managed" Version="$(MicrosoftVisualStudioProjectSystemManagedVersion)" /> | ||
<PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="$(MicrosoftVisualStudioShell150Version)" /> | ||
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.8.0" Version="$(MicrosoftVisualStudioShellInterop80Version)" /> | ||
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.10.0" Version="$(MicrosoftVisualStudioShellInterop100Version)" /> | ||
<!-- Work around https://devdiv.visualstudio.com/DevDiv/_workitems/edit/725508 by referencing Microsoft.VisualStudio.Text.Data --> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is fixed.
@@ -115,13 +115,6 @@ | |||
Exclude dependencies that are not inserted from Roslyn repo and are installed by other VS components. | |||
|
|||
Note: can't use globs due to https://github.com/Microsoft/msbuild/issues/3791. | |||
|
|||
these dependency should be removed once StreamJsonRpc adds a build target for | |||
net472 - https://github.com/dotnet/roslyn/issues/34558 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#34558 is fixed
Previous regression is fixed, but it seems there's new regression with new editor packages. FYI @AmadeusW |
3c64e98
to
6046587
Compare
@JoeRobich I updated the PR to reference 16.9p4 bits. Not sure if it's OK to merge this now w/o breaking anything. |
16.9p4 will be rolled out to the scouting queue on the 17th. Assuming there are no breaks we could move to that queue and take this change then. |
eng/Versions.props
Outdated
<MicrosoftVisualStudioGraphModelVersion>16.9.30921.310</MicrosoftVisualStudioGraphModelVersion> | ||
<MicrosoftVisualStudioImageCatalogVersion>16.9.30921.310</MicrosoftVisualStudioImageCatalogVersion> | ||
<MicrosoftVisualStudioImagingVersion>16.9.30921.310</MicrosoftVisualStudioImagingVersion> | ||
<MicrosoftVisualStudioImagingInterop140DesignTimeVersion>16.9.30921.310</MicrosoftVisualStudioImagingInterop140DesignTimeVersion> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would it be worthwhile setting these to the ShellPackagesVersion as well?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, if they becomes out of sync in the future, we can undo it.
eng/Versions.props
Outdated
<MicrosoftBuildRuntimeVersion>15.3.409</MicrosoftBuildRuntimeVersion> | ||
<MicrosoftBuildTasksCoreVersion>15.3.409</MicrosoftBuildTasksCoreVersion> | ||
<MicrosoftBuildRuntimeVersion>16.5.0</MicrosoftBuildRuntimeVersion> | ||
<MicrosoftBuildTasksCoreVersion>16.5.0</MicrosoftBuildTasksCoreVersion> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we introduce a MicrosoftBuildPackagesVersion
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.
@JoeRobich I have a validation build running now. I assume this can be safely merged if CI and RPS are all green? |
Typically, would be fine. We aren't inserting master-vs-deps at this time. @RikkiGibson You see any need to wait on this one? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Auto-approval
@JoeRobich Hmm, seems CI stuck even though all integration tests legs are green. |
CI is passing. RPS is passing. Merging this PR. |
Fix #48870
New version of editor packages are released in 16.9p4