Skip to content

Commit e75c661

Browse files
333fred333fred
committed
Update to release nuget packages (dotnet#77261)
* 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 dotnet#77293. (cherry picked from commit 3350036)
1 parent d47fa08 commit e75c661

File tree

4 files changed

+38
-36
lines changed

4 files changed

+38
-36
lines changed

‎eng/Directory.Packages.props

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<_BasicReferenceAssembliesVersion>1.7.9</_BasicReferenceAssembliesVersion>
99
<!-- CodeStyleAnalyzerVersion should we updated together with version of dotnet-format in dotnet-tools.json -->
1010
<CodeStyleAnalyzerVersion>4.8.0-3.final</CodeStyleAnalyzerVersion>
11-
<VisualStudioEditorPackagesVersion>17.12.145-preview</VisualStudioEditorPackagesVersion>
11+
<VisualStudioEditorPackagesVersion>17.13.226</VisualStudioEditorPackagesVersion>
1212
<ILAsmPackageVersion>9.0.0-rc.2.24462.10</ILAsmPackageVersion>
1313
<ILDAsmPackageVersion>6.0.0-rtm.21518.12</ILDAsmPackageVersion>
1414
<MicrosoftILVerificationVersion>7.0.0-alpha.1.22060.1</MicrosoftILVerificationVersion>
@@ -44,10 +44,10 @@
4444
</ItemGroup>
4545

4646
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true' and '$(TargetFramework)' == 'net472'">
47-
<PackageVersion Include="Microsoft.Build" Version="17.12.0-preview-24426-07" />
48-
<PackageVersion Include="Microsoft.Build.Framework" Version="17.12.0-preview-24426-07" />
49-
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.12.0-preview-24426-07" />
50-
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.0-preview-24426-07" />
47+
<PackageVersion Include="Microsoft.Build" Version="17.13.9" />
48+
<PackageVersion Include="Microsoft.Build.Framework" Version="17.13.9" />
49+
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.13.9" />
50+
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.13.9" />
5151
</ItemGroup>
5252

5353
<ItemGroup>
@@ -56,10 +56,10 @@
5656
<!--
5757
Visual Studio
5858
-->
59-
<PackageVersion Include="Microsoft.VisualStudio.SDK" Version="17.12.39557-preview.2.1" />
59+
<PackageVersion Include="Microsoft.VisualStudio.SDK" Version="17.13.40008" />
6060
<PackageVersion Include="Microsoft.Internal.VisualStudio.Shell.Framework" Version="17.9.36524" />
6161
<PackageVersion Include="Microsoft.ServiceHub.Client" Version="4.2.1017" />
62-
<PackageVersion Include="Microsoft.VisualStudio.Extensibility.Sdk" Version="17.12.39557-preview.2.1" />
62+
<PackageVersion Include="Microsoft.VisualStudio.Extensibility.Sdk" Version="17.13.40008" />
6363
<PackageVersion Include="Microsoft.VisualStudio.Extensibility" Version="17.12.2037-preview3" />
6464
<PackageVersion Include="Microsoft.VisualStudio.Extensibility.JsonGenerators.Sdk" Version="17.12.2037-preview3" />
6565
<PackageVersion Include="Microsoft.VSSDK.Debugger.VSDConfigTool" Version="17.13.1100801-preview" />
@@ -91,31 +91,31 @@
9191
Subset of Microsoft.VisualStudio.Sdk meta-package (run `csi generate-vssdk-versions.csx` to update based on VSSDK meta-package).
9292
See https://github.com/dotnet/arcade/blob/main/Documentation/MirroringPackages.md if any of these packages fail to restore.
9393
-->
94-
<PackageVersion Include="Microsoft.ServiceHub.Framework" Version="4.7.32-beta" />
95-
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.12.17-preview" />
96-
<PackageVersion Include="Microsoft.VisualStudio.Composition.Analyzers" Version="17.12.17-preview" />
97-
<PackageVersion Include="Microsoft.VisualStudio.CoreUtility" Version="17.12.145-preview" />
98-
<PackageVersion Include="Microsoft.VisualStudio.Editor" Version="17.12.145-preview" />
99-
<PackageVersion Include="Microsoft.VisualStudio.ImageCatalog" Version="17.12.39557-preview.2.1" />
100-
<PackageVersion Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" Version="17.12.39557-preview.2.1" />
101-
<PackageVersion Include="Microsoft.VisualStudio.Language" Version="17.12.145-preview" />
102-
<PackageVersion Include="Microsoft.VisualStudio.Language.NavigateTo.Interfaces" Version="17.12.145-preview" />
103-
<PackageVersion Include="Microsoft.VisualStudio.Language.StandardClassification" Version="17.12.145-preview" />
104-
<PackageVersion Include="Microsoft.VisualStudio.LanguageServer.Client" Version="17.12.39-preview" />
94+
<PackageVersion Include="Microsoft.ServiceHub.Framework" Version="4.8.3" />
95+
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.12.20" />
96+
<PackageVersion Include="Microsoft.VisualStudio.Composition.Analyzers" Version="17.12.20" />
97+
<PackageVersion Include="Microsoft.VisualStudio.CoreUtility" Version="17.13.226" />
98+
<PackageVersion Include="Microsoft.VisualStudio.Editor" Version="17.13.226" />
99+
<PackageVersion Include="Microsoft.VisualStudio.ImageCatalog" Version="17.13.40008" />
100+
<PackageVersion Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" Version="17.13.40008" />
101+
<PackageVersion Include="Microsoft.VisualStudio.Language" Version="17.13.226" />
102+
<PackageVersion Include="Microsoft.VisualStudio.Language.NavigateTo.Interfaces" Version="17.13.226" />
103+
<PackageVersion Include="Microsoft.VisualStudio.Language.StandardClassification" Version="17.13.226" />
104+
<PackageVersion Include="Microsoft.VisualStudio.LanguageServer.Client" Version="17.13.33" />
105105
<PackageVersion Include="Microsoft.VisualStudio.RemoteControl" Version="16.3.52" />
106-
<PackageVersion Include="Microsoft.VisualStudio.RpcContracts" Version="17.12.11-preview" />
107-
<PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="17.12.39557-preview.2.1" />
106+
<PackageVersion Include="Microsoft.VisualStudio.RpcContracts" Version="17.13.7" />
107+
<PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="17.13.40008" />
108108
<PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="17.14.2" />
109-
<PackageVersion Include="Microsoft.VisualStudio.Text.Data" Version="17.12.145-preview" />
110-
<PackageVersion Include="Microsoft.VisualStudio.Text.Logic" Version="17.12.145-preview" />
111-
<PackageVersion Include="Microsoft.VisualStudio.Text.UI" Version="17.12.145-preview" />
112-
<PackageVersion Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="17.12.145-preview" />
113-
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.12.13-preview" />
114-
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.12.13-preview" />
109+
<PackageVersion Include="Microsoft.VisualStudio.Text.Data" Version="17.13.226" />
110+
<PackageVersion Include="Microsoft.VisualStudio.Text.Logic" Version="17.13.226" />
111+
<PackageVersion Include="Microsoft.VisualStudio.Text.UI" Version="17.13.226" />
112+
<PackageVersion Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="17.13.226" />
113+
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.13.2" />
114+
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.2" />
115115
<PackageVersion Include="Microsoft.VisualStudio.Utilities.Internal" Version="16.3.90" />
116116
<PackageVersion Include="Nerdbank.Streams" Version="2.11.79" />
117117
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
118-
<PackageVersion Include="StreamJsonRpc" Version="2.20.8-beta" />
118+
<PackageVersion Include="StreamJsonRpc" Version="2.21.10" />
119119

120120
<!--
121121
VS Debugger
@@ -253,7 +253,7 @@
253253
<PackageVersion Include="Microsoft.VisualStudio.Extensibility.Testing.SourceGenerator" Version="$(MicrosoftVisualStudioExtensibilityTestingVersion)" />
254254
<PackageVersion Include="Microsoft.VisualStudio.Extensibility.Testing.Xunit" Version="$(MicrosoftVisualStudioExtensibilityTestingVersion)" />
255255
<PackageVersion Include="System.Management" Version="7.0.0" />
256-
<PackageVersion Include="System.Drawing.Common" Version="8.0.0" />
256+
<PackageVersion Include="System.Drawing.Common" Version="8.0.8" />
257257
<PackageVersion Include="NuGet.SolutionRestoreManager.Interop" Version="4.8.0" />
258258
<PackageVersion Include="Moq" Version="4.10.1" />
259259
<PackageVersion Include="System.CodeDom" Version="7.0.0" />

‎src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpGoToImplementation.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@ await TestServices.Editor.SetTextAsync(
111111
}
112112

113113
[IdeTheory]
114-
[CombinatorialData]
114+
//[CombinatorialData]
115+
[InlineData(false, Skip = "https://github.com/dotnet/roslyn/issues/77293")]
116+
[InlineData(true)]
115117
public async Task GoToImplementationFromMetadataAsSource(bool asyncNavigation)
116118
{
117119
await TestServices.Editor.ConfigureAsyncNavigation(asyncNavigation ? AsyncNavigationKind.Asynchronous : AsyncNavigationKind.Synchronous, HangMitigatingCancellationToken);

‎src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpWinForms.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ private void ExecuteWhenButtonClicked(object sender, EventArgs e)
109109
}", codeFileActualText);
110110
}
111111

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

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

179-
[IdeFact]
179+
[IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/77293")]
180180
public async Task ChangeAccessibility()
181181
{
182182
var project = ProjectName;
@@ -205,7 +205,7 @@ await TestServices.Workspace.WaitForAllAsyncOperationsAsync(
205205
var actualText = await TestServices.Editor.GetTextAsync(HangMitigatingCancellationToken);
206206
Assert.Contains(@"public System.Windows.Forms.Button SomeButton;", actualText);
207207
}
208-
[IdeFact]
208+
[IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/77293")]
209209
public async Task DeleteControl()
210210
{
211211
if (ExecutionConditionUtil.IsBitness64)

‎src/Workspaces/MSBuild/Test/VisualStudioMSBuildWorkspaceTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ private static MetadataReference GetMetadataReferenceByAlias(Project project, st
199199
private static Metadata GetMetadata(MetadataReference metadataReference)
200200
=> ((PortableExecutableReference)metadataReference).GetMetadata();
201201

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

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

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

0 commit comments

Comments
 (0)