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

Jump to bottom

Update VSSDK versions #75594

Merged
merged 3 commits into from
Nov 12, 2024
Merged

Update VSSDK versions #75594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84e2b49
Update VSSDK and Gladstone versions
tmat Oct 23, 2024
d1f0374
Update VS SDK to 17.12.39557-preview.2.1
tmat Oct 28, 2024
f155e6b
Editor
tmat Oct 28, 2024
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
61 changes: 31 additions & 30 deletions eng/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<_BasicReferenceAssembliesVersion>1.7.9</_BasicReferenceAssembliesVersion>
<!-- CodeStyleAnalyzerVersion should we updated together with version of dotnet-format in dotnet-tools.json -->
<CodeStyleAnalyzerVersion>4.8.0-3.final</CodeStyleAnalyzerVersion>
<VisualStudioEditorPackagesVersion>17.10.191</VisualStudioEditorPackagesVersion>
<VisualStudioEditorPackagesVersion>17.12.145-preview</VisualStudioEditorPackagesVersion>
<ILAsmPackageVersion>9.0.0-rc.2.24462.10</ILAsmPackageVersion>
<ILDAsmPackageVersion>6.0.0-rtm.21518.12</ILDAsmPackageVersion>
<MicrosoftILVerificationVersion>7.0.0-alpha.1.22060.1</MicrosoftILVerificationVersion>
Expand Down Expand Up @@ -46,10 +46,10 @@
</ItemGroup>

<ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true' and '$(TargetFramework)' == 'net472'">
<PackageVersion Include="Microsoft.Build" Version="17.10.4" />
<PackageVersion Include="Microsoft.Build.Framework" Version="17.10.4" />
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.10.4" />
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.10.4" />
<PackageVersion Include="Microsoft.Build" Version="17.12.0-preview-24426-07" />
<PackageVersion Include="Microsoft.Build.Framework" Version="17.12.0-preview-24426-07" />
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.12.0-preview-24426-07" />
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.0-preview-24426-07" />
</ItemGroup>

<ItemGroup>
Expand All @@ -58,7 +58,7 @@
<!--
Visual Studio
-->
<PackageVersion Include="Microsoft.VisualStudio.SDK" Version="17.10.234-preview.1" />
<PackageVersion Include="Microsoft.VisualStudio.SDK" Version="17.12.39557-preview.2.1" />
<PackageVersion Include="Microsoft.Internal.VisualStudio.Shell.Framework" Version="17.9.36524" />
<PackageVersion Include="Microsoft.ServiceHub.Client" Version="4.2.1017" />
<PackageVersion Include="Microsoft.VisualStudio.Extensibility" Version="$(MicrosoftVisualStudioExtensibilityVersion)" />
Expand Down Expand Up @@ -91,32 +91,33 @@

<!--
Subset of Microsoft.VisualStudio.Sdk meta-package (run `csi generate-vssdk-versions.csx` to update based on VSSDK meta-package).
See https://github.com/dotnet/arcade/blob/main/Documentation/MirroringPackages.md if any of these packages fail to restore.
-->
<PackageVersion Include="Microsoft.ServiceHub.Framework" Version="4.5.31" />
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.10.37" />
<PackageVersion Include="Microsoft.VisualStudio.Composition.Analyzers" Version="17.10.37" />
<PackageVersion Include="Microsoft.VisualStudio.CoreUtility" Version="17.10.191" />
<PackageVersion Include="Microsoft.VisualStudio.Editor" Version="17.10.191" />
<PackageVersion Include="Microsoft.VisualStudio.ImageCatalog" Version="17.10.40170" />
<PackageVersion Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" Version="17.10.40152" />
<PackageVersion Include="Microsoft.VisualStudio.Language" Version="17.10.191" />
<PackageVersion Include="Microsoft.VisualStudio.Language.NavigateTo.Interfaces" Version="17.10.191" />
<PackageVersion Include="Microsoft.VisualStudio.Language.StandardClassification" Version="17.10.191" />
<PackageVersion Include="Microsoft.VisualStudio.LanguageServer.Client" Version="17.10.124" />
<PackageVersion Include="Microsoft.ServiceHub.Framework" Version="4.7.32-beta" />
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.12.17-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Composition.Analyzers" Version="17.12.17-preview" />
<PackageVersion Include="Microsoft.VisualStudio.CoreUtility" Version="17.12.145-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Editor" Version="17.12.145-preview" />
<PackageVersion Include="Microsoft.VisualStudio.ImageCatalog" Version="17.12.39557-preview.2.1" />
<PackageVersion Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" Version="17.12.39557-preview.2.1" />
<PackageVersion Include="Microsoft.VisualStudio.Language" Version="17.12.145-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Language.NavigateTo.Interfaces" Version="17.12.145-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Language.StandardClassification" Version="17.12.145-preview" />
<PackageVersion Include="Microsoft.VisualStudio.LanguageServer.Client" Version="17.12.39-preview" />
<PackageVersion Include="Microsoft.VisualStudio.RemoteControl" Version="16.3.52" />
<PackageVersion Include="Microsoft.VisualStudio.RpcContracts" Version="17.10.21" />
<PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="17.10.40170" />
<PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="17.13.14" />
<PackageVersion Include="Microsoft.VisualStudio.Text.Data" Version="17.10.191" />
<PackageVersion Include="Microsoft.VisualStudio.Text.Logic" Version="17.10.191" />
<PackageVersion Include="Microsoft.VisualStudio.Text.UI" Version="17.10.191" />
<PackageVersion Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="17.10.191" />
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.11.20" />
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.11.20" />
<PackageVersion Include="Microsoft.VisualStudio.Utilities.Internal" Version="16.3.90" />
<PackageVersion Include="Nerdbank.Streams" Version="2.10.69" />
<PackageVersion Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
<PackageVersion Include="StreamJsonRpc" Version="2.18.48" />
<PackageVersion Include="Microsoft.VisualStudio.RpcContracts" Version="17.12.11-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="17.12.39557-preview.2.1" />
<PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="17.12.32" />
<PackageVersion Include="Microsoft.VisualStudio.Text.Data" Version="17.12.145-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Text.Logic" Version="17.12.145-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Text.UI" Version="17.12.145-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="17.12.145-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.12.13-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.12.13-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Utilities.Internal" Version="16.3.73" />
<PackageVersion Include="Nerdbank.Streams" Version="2.11.79" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="StreamJsonRpc" Version="2.20.8-beta" />

<!--
VS Debugger
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<SystemDiagnosticsEventLogVersion>8.0.0</SystemDiagnosticsEventLogVersion>
<SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
<SystemComponentModelCompositionVersion>8.0.0</SystemComponentModelCompositionVersion>
<SystemDiagnosticsDiagnosticSourceVersion>8.0.0</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsDiagnosticSourceVersion>8.0.1</SystemDiagnosticsDiagnosticSourceVersion>
<SystemIOHashingVersion>8.0.0</SystemIOHashingVersion>
<SystemIOPipelinesVersion>8.0.0</SystemIOPipelinesVersion>
<SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/EditorFeatures/TestUtilities/StubSettingsManagerHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ Task<string> ISettingsManagerHost2.GetTelemetrySettingsAsync()
throw new NotImplementedException();
}

Task<Stream> ISettingsManagerHost5.GetServiceStreamAsync(string serviceMoniker, CancellationToken cancellationToken)
Task<Stream> ISettingsManagerHost5.GetServiceStreamAsync(CancellationToken cancellationToken)
{
throw new NotImplementedException();
}
Expand Down
2 changes: 1 addition & 1 deletion src/VisualStudio/Core/Def/LanguageService/AbstractPackage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke

await JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);

_componentModel_doNotAccessDirectly = (IComponentModel)await GetServiceAsync(typeof(SComponentModel)).ConfigureAwait(true);
_componentModel_doNotAccessDirectly = (IComponentModel?)await GetServiceAsync(typeof(SComponentModel)).ConfigureAwait(true);
Assumes.Present(_componentModel_doNotAccessDirectly);
}

Expand Down
3 changes: 2 additions & 1 deletion src/VisualStudio/Core/Def/RoslynPackage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,8 @@ private async Task LoadStackTraceExplorerMenusAsync(CancellationToken cancellati
// Obtain services and QueryInterface from the main thread
await JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);

var menuCommandService = (OleMenuCommandService)await GetServiceAsync(typeof(IMenuCommandService)).ConfigureAwait(true);
var menuCommandService = (OleMenuCommandService?)await GetServiceAsync(typeof(IMenuCommandService)).ConfigureAwait(true);
Assumes.Present(menuCommandService);
StackTraceExplorerCommandHandler.Initialize(menuCommandService, this);
}

Expand Down
4 changes: 2 additions & 2 deletions src/VisualStudio/TestUtilities2/MockComponentModel.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,12 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests
_exportProvider = exportProvider
End Sub

#Disable Warning BC40000 ' Type or member is obsolete
<Obsolete>
Public ReadOnly Property DefaultCatalog As ComposablePartCatalog Implements IComponentModel.DefaultCatalog
Get
Throw New NotImplementedException
End Get
End Property
#Enable Warning BC40000 ' Type or member is obsolete

Public ReadOnly Property DefaultCompositionService As ICompositionService Implements IComponentModel.DefaultCompositionService
Get
Expand All @@ -38,6 +37,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests
End Get
End Property

<Obsolete>
Public Function GetCatalog(catalogName As String) As ComposablePartCatalog Implements IComponentModel.GetCatalog
Throw New NotImplementedException
End Function
Expand Down
Loading