Skip to content

Commit

Permalink
Shipping tasks (#73617)
Browse files Browse the repository at this point in the history
* Update nuget versions to release where possible.

* Mark APIs as shipped

* Suppress new warnings

* Update unit tests to set required VSTelemetry environment variable

* Remove unneeded workaround

---------

Co-authored-by: David Barbet <[email protected]>
  • Loading branch information
333fred and dibarbet authored May 23, 2024
1 parent 9c14768 commit 2b7d172
Show file tree
Hide file tree
Showing 20 changed files with 195 additions and 211 deletions.
54 changes: 27 additions & 27 deletions eng/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<MicrosoftVisualStudioExtensibilityTestingVersion>0.1.187-beta</MicrosoftVisualStudioExtensibilityTestingVersion>
<!-- CodeStyleAnalyzerVersion should we updated together with version of dotnet-format in dotnet-tools.json -->
<CodeStyleAnalyzerVersion>4.8.0-3.final</CodeStyleAnalyzerVersion>
<VisualStudioEditorPackagesVersion>17.9.80-preview</VisualStudioEditorPackagesVersion>
<VisualStudioEditorPackagesVersion>17.10.191</VisualStudioEditorPackagesVersion>
<ILAsmPackageVersion>6.0.0-rtm.21518.12</ILAsmPackageVersion>
<ILDAsmPackageVersion>6.0.0-rtm.21518.12</ILDAsmPackageVersion>
<MicrosoftILVerificationVersion>7.0.0-alpha.1.22060.1</MicrosoftILVerificationVersion>
Expand All @@ -21,7 +21,7 @@
<MicrosoftWindowsDesktopAppRuntimePackagesVersion>8.0.0</MicrosoftWindowsDesktopAppRuntimePackagesVersion>
<xunitVersion>2.4.1</xunitVersion>
<SqliteVersion>2.1.0</SqliteVersion>
<MicrosoftVisualStudioExtensibilityVersion>17.10.22-preview-1</MicrosoftVisualStudioExtensibilityVersion>
<MicrosoftVisualStudioExtensibilityVersion>17.10.2083</MicrosoftVisualStudioExtensibilityVersion>
</PropertyGroup>

<!--
Expand All @@ -43,9 +43,9 @@
</ItemGroup>

<ItemGroup Condition="'$(DotnetBuildFromSource)' != 'true' and '$(TargetFramework)' == 'net472'">
<PackageVersion Include="Microsoft.Build" Version="17.10.0-preview-24081-01" />
<PackageVersion Include="Microsoft.Build.Framework" Version="17.10.0-preview-24081-01" />
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.10.0-preview-24081-01" />
<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" />
</ItemGroup>

<ItemGroup>
Expand Down Expand Up @@ -88,31 +88,31 @@
<!--
Subset of Microsoft.VisualStudio.Sdk meta-package (run `csi generate-vssdk-versions.csx` to update based on VSSDK meta-package).
-->
<PackageVersion Include="Microsoft.ServiceHub.Framework" Version="4.4.22" />
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.10.8-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Composition.Analyzers" Version="17.10.8-preview" />
<PackageVersion Include="Microsoft.VisualStudio.CoreUtility" Version="17.10.13-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Editor" Version="17.10.13-preview" />
<PackageVersion Include="Microsoft.VisualStudio.ImageCatalog" Version="17.10.234-preview.1" />
<PackageVersion Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" Version="17.10.157-preview.1" />
<PackageVersion Include="Microsoft.VisualStudio.Language" Version="17.10.13-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Language.NavigateTo.Interfaces" Version="17.10.13-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Language.StandardClassification" Version="17.10.13-preview" />
<PackageVersion Include="Microsoft.VisualStudio.LanguageServer.Client" Version="17.10.11-preview" />
<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.VisualStudio.RemoteControl" Version="16.3.52" />
<PackageVersion Include="Microsoft.VisualStudio.RpcContracts" Version="17.10.3-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="17.10.234-preview.1" />
<PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="17.9.102" />
<PackageVersion Include="Microsoft.VisualStudio.Text.Data" Version="17.10.13-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Text.Logic" Version="17.10.13-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Text.UI" Version="17.10.13-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="17.10.13-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.10.12-preview" />
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.10.12-preview" />
<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.10.32" />
<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.10.41" />
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.10.41" />
<PackageVersion Include="Microsoft.VisualStudio.Utilities.Internal" Version="16.3.56" />
<PackageVersion Include="Nerdbank.Streams" Version="2.10.69" />
<PackageVersion Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
<PackageVersion Include="StreamJsonRpc" Version="2.18.6-preview" />
<PackageVersion Include="StreamJsonRpc" Version="2.18.48" />

<!--
VS Debugger
Expand Down Expand Up @@ -267,7 +267,7 @@
<PackageVersion Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
<PackageVersion Include="System.IO.FileSystem" Version="4.3.0" />
<PackageVersion Include="System.Management" Version="7.0.0" />
<PackageVersion Include="System.Drawing.Common" Version="7.0.0" />
<PackageVersion Include="System.Drawing.Common" Version="8.0.0" />
<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
20 changes: 0 additions & 20 deletions eng/targets/VisualStudio.targets
Original file line number Diff line number Diff line change
Expand Up @@ -143,24 +143,4 @@
</Target>

<Import Project="GeneratePkgDef.targets" Condition="'$(MSBuildRuntimeType)' != 'Core' and '$(GeneratePkgDefFile)' == 'true' and '$(DesignTimeBuild)' != 'true' and '$(BuildingForLiveUnitTesting)' != 'true'" />

<!--
TODO: Workaround for a bug in Microsoft.VisualStudio.Extensibility.JsonGenerators.Sdk
Remove once we can update to a version that includes the fix.
Replaces ExtensionJsonOutputGroup target defined in Microsoft.VisualStudio.Extensibility.JsonGenerators.Sdk.props
-->
<Target Name="ExtensionJsonOutputGroup" Returns="@(ExtensionJsonOutputGroupOutput)" DependsOnTargets="IncludeGeneratedExtensionManifests">
<ItemGroup>
<ExtensionJsonOutputGroupOutput Include="$(OutDir)\.vsextension\extension.json" Condition="Exists('$(OutDir)\.vsextension\extension.json')" TargetPath=".vsextension\extension.json" />
</ItemGroup>
</Target>

<!--
Microsoft.VisualStudio.Extensibility.JsonGenerators.Sdk.props creates content items for all files in .vsextension dir.
NuGet includes content items in package, by default but these items should only be included in the VSIX.
-->
<ItemGroup>
<Content Update=".vsextension\**\*" Pack="false" />
</ItemGroup>
</Project>
Loading

0 comments on commit 2b7d172

Please sign in to comment.