Skip to content

Commit

Permalink
Update to release nuget packages (#77261) (#77298)
Browse files Browse the repository at this point in the history
* Update to release nuget packages

In order to publish 17.13 nuget packages, we need to update a few dependencies. I updated the minimum number of packages required from our public packages, then fixed up any restore issues. For each updated package, I then went and confirmed that the dll was actually present in 17.13.0, so we should be safe from dependency loading issues. This change does not need to be inserted into VS.

* Skip tests for microsoft/vs-solutionpersistence#95

* Skip failing tests, see #77293.

(cherry picked from commit 3350036)
  • Loading branch information
333fred authored Feb 20, 2025
1 parent 00d0454 commit 2212158
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 35 deletions.
54 changes: 27 additions & 27 deletions eng/Directory.Packages.props
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.12.145-preview</VisualStudioEditorPackagesVersion>
<VisualStudioEditorPackagesVersion>17.13.226</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 @@ -44,10 +44,10 @@
</ItemGroup>

<ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true' and '$(TargetFramework)' == 'net472'">
<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" />
<PackageVersion Include="Microsoft.Build" Version="17.13.9" />
<PackageVersion Include="Microsoft.Build.Framework" Version="17.13.9" />
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.13.9" />
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.13.9" />
</ItemGroup>

<ItemGroup>
Expand All @@ -56,10 +56,10 @@
<!--
Visual Studio
-->
<PackageVersion Include="Microsoft.VisualStudio.SDK" Version="17.12.39557-preview.2.1" />
<PackageVersion Include="Microsoft.VisualStudio.SDK" Version="17.13.40008" />
<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.Sdk" Version="17.12.39557-preview.2.1" />
<PackageVersion Include="Microsoft.VisualStudio.Extensibility.Sdk" Version="17.13.40008" />
<PackageVersion Include="Microsoft.VisualStudio.Extensibility" Version="17.12.2037-preview3" />
<PackageVersion Include="Microsoft.VisualStudio.Extensibility.JsonGenerators.Sdk" Version="17.12.2037-preview3" />
<PackageVersion Include="Microsoft.VSSDK.Debugger.VSDConfigTool" Version="17.13.1100801-preview" />
Expand Down Expand Up @@ -91,31 +91,31 @@
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.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.ServiceHub.Framework" Version="4.8.3" />
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.12.20" />
<PackageVersion Include="Microsoft.VisualStudio.Composition.Analyzers" Version="17.12.20" />
<PackageVersion Include="Microsoft.VisualStudio.CoreUtility" Version="17.13.226" />
<PackageVersion Include="Microsoft.VisualStudio.Editor" Version="17.13.226" />
<PackageVersion Include="Microsoft.VisualStudio.ImageCatalog" Version="17.13.40008" />
<PackageVersion Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" Version="17.13.40008" />
<PackageVersion Include="Microsoft.VisualStudio.Language" Version="17.13.226" />
<PackageVersion Include="Microsoft.VisualStudio.Language.NavigateTo.Interfaces" Version="17.13.226" />
<PackageVersion Include="Microsoft.VisualStudio.Language.StandardClassification" Version="17.13.226" />
<PackageVersion Include="Microsoft.VisualStudio.LanguageServer.Client" Version="17.13.33" />
<PackageVersion Include="Microsoft.VisualStudio.RemoteControl" Version="16.3.52" />
<PackageVersion Include="Microsoft.VisualStudio.RpcContracts" Version="17.13.7" />
<PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="17.12.39557-preview.2.1" />
<PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="17.13.40008" />
<PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="17.14.2" />
<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.Text.Data" Version="17.13.226" />
<PackageVersion Include="Microsoft.VisualStudio.Text.Logic" Version="17.13.226" />
<PackageVersion Include="Microsoft.VisualStudio.Text.UI" Version="17.13.226" />
<PackageVersion Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="17.13.226" />
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.13.2" />
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.2" />
<PackageVersion Include="Microsoft.VisualStudio.Utilities.Internal" Version="16.3.90" />
<PackageVersion Include="Nerdbank.Streams" Version="2.11.79" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="StreamJsonRpc" Version="2.20.8-beta" />
<PackageVersion Include="StreamJsonRpc" Version="2.21.10" />

<!--
VS Debugger
Expand Down Expand Up @@ -253,7 +253,7 @@
<PackageVersion Include="Microsoft.VisualStudio.Extensibility.Testing.SourceGenerator" Version="$(MicrosoftVisualStudioExtensibilityTestingVersion)" />
<PackageVersion Include="Microsoft.VisualStudio.Extensibility.Testing.Xunit" Version="$(MicrosoftVisualStudioExtensibilityTestingVersion)" />
<PackageVersion Include="System.Management" Version="7.0.0" />
<PackageVersion Include="System.Drawing.Common" Version="8.0.0" />
<PackageVersion Include="System.Drawing.Common" Version="8.0.8" />
<PackageVersion Include="NuGet.SolutionRestoreManager.Interop" Version="4.8.0" />
<PackageVersion Include="Moq" Version="4.10.1" />
<PackageVersion Include="System.CodeDom" Version="7.0.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,9 @@ await TestServices.Editor.SetTextAsync(
}

[IdeTheory]
[CombinatorialData]
//[CombinatorialData]
[InlineData(false, Skip = "https://github.com/dotnet/roslyn/issues/77293")]
[InlineData(true)]
public async Task GoToImplementationFromMetadataAsSource(bool asyncNavigation)
{
await TestServices.Editor.ConfigureAsyncNavigation(asyncNavigation ? AsyncNavigationKind.Asynchronous : AsyncNavigationKind.Synchronous, HangMitigatingCancellationToken);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ private void ExecuteWhenButtonClicked(object sender, EventArgs e)
}", codeFileActualText);
}

[IdeFact]
[IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/77293")]
public async Task RenameControl()
{
var project = ProjectName;
Expand Down Expand Up @@ -146,7 +146,7 @@ await TestServices.Workspace.WaitForAllAsyncOperationsAsync(
Assert.DoesNotContain(@"private System.Windows.Forms.Button SomeButton;", actualText);
}

[IdeFact]
[IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/77293")]
public async Task RemoveEventHandler()
{
var project = ProjectName;
Expand Down Expand Up @@ -176,7 +176,7 @@ await TestServices.Workspace.WaitForAllAsyncOperationsAsync(
Assert.DoesNotContain(@"VisualStudio.Editor.SomeButton.Click += new System.EventHandler(VisualStudio.Editor.GooHandler);", actualText);
}

[IdeFact]
[IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/77293")]
public async Task ChangeAccessibility()
{
var project = ProjectName;
Expand Down Expand Up @@ -205,7 +205,7 @@ await TestServices.Workspace.WaitForAllAsyncOperationsAsync(
var actualText = await TestServices.Editor.GetTextAsync(HangMitigatingCancellationToken);
Assert.Contains(@"public System.Windows.Forms.Button SomeButton;", actualText);
}
[IdeFact]
[IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/77293")]
public async Task DeleteControl()
{
if (ExecutionConditionUtil.IsBitness64)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ private static MetadataReference GetMetadataReferenceByAlias(Project project, st
private static Metadata GetMetadata(MetadataReference metadataReference)
=> ((PortableExecutableReference)metadataReference).GetMetadata();

[ConditionalFact(typeof(VisualStudioMSBuildInstalled))]
[ConditionalFact(typeof(VisualStudioMSBuildInstalled), AlwaysSkip = "https://github.com/microsoft/vs-solutionpersistence/issues/95")]
[WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/552981")]
public async Task TestOpenSolution_DuplicateProjectGuids()
{
Expand Down Expand Up @@ -2713,7 +2713,7 @@ public async Task TestOpenSolution_SolutionFileHasMissingEndProject()
}
}

[ConditionalFact(typeof(VisualStudioMSBuildInstalled))]
[ConditionalFact(typeof(VisualStudioMSBuildInstalled), AlwaysSkip = "https://github.com/microsoft/vs-solutionpersistence/issues/95")]
[WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/792912")]
public async Task TestOpenSolution_WithDuplicatedGuidsBecomeSelfReferential()
{
Expand All @@ -2739,7 +2739,7 @@ public async Task TestOpenSolution_WithDuplicatedGuidsBecomeSelfReferential()
Assert.Empty(libraryProject.AllProjectReferences);
}

[ConditionalFact(typeof(VisualStudioMSBuildInstalled))]
[ConditionalFact(typeof(VisualStudioMSBuildInstalled), AlwaysSkip = "https://github.com/microsoft/vs-solutionpersistence/issues/95")]
[WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/792912")]
public async Task TestOpenSolution_WithDuplicatedGuidsBecomeCircularReferential()
{
Expand Down

0 comments on commit 2212158

Please sign in to comment.