Merge pull request OmniSharp#2363 from OmniSharp/update-build-tools7

Update build tools to match .NET SDK 6.0.201
dut3062796s · Mar 20, 2022 · 628930c · 628930c
2 parents b1dd617 + ea5d258
commit 628930c
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,17 @@
 # Changelog
 All changes to the project will be documented in this file.
 
+## [1.38.2]
+* Add analyze open documents only (PR: [#2346](https://github.com/OmniSharp/omnisharp-roslyn/pull/2346))
+* Create a new GoToTypeDefinition endpoint ([#2297](https://github.com/OmniSharp/omnisharp-roslyn/issues/2297), PR: [#2315](https://github.com/OmniSharp/omnisharp-roslyn/pull/2315))
+* Eliminate more instances of IWorkspaceOptionsProvider (PR: [#2343](https://github.com/OmniSharp/omnisharp-roslyn/pull/2343))
+* Update Build.md brew cask instructions (PR: [#2355](https://github.com/OmniSharp/omnisharp-roslyn/pull/2355))
+* Remove not used middleware extension methods and unify adding middleware (PR: [#2340](https://github.com/OmniSharp/omnisharp-roslyn/pull/2340))
+* Pass --overwrite when pushing build artifacts to azure (PR: [#2358](https://github.com/OmniSharp/omnisharp-roslyn/pull/2358))
+* Delete System.Configuration.ConfigurationManager from deployed packages ([omnisharp-vscode#5113](https://github.com/OmniSharp/omnisharp-vscode/issues/5113), PR: [#2359](https://github.com/OmniSharp/omnisharp-roslyn/pull/2359))
+* Support inlay hints (PR: [#2357](https://github.com/OmniSharp/omnisharp-roslyn/pull/2357))
+* Update build tools to match .NET SDK 6.0.201 ([#2363](https://github.com/OmniSharp/omnisharp-roslyn/pull/2363))
+
 ## [1.38.1] - 2022-02-18
 * Reuse Roslyn's analyzer assembly loader (PR: [#2236](https://github.com/OmniSharp/omnisharp-roslyn/pull/2236))
 * Pass Completion, Rename and Block Structure options directly instead of updating the Workspace (PR: [#2306](https://github.com/OmniSharp/omnisharp-roslyn/pull/2306))

diff --git a/NuGet.Config b/NuGet.Config
@@ -3,6 +3,7 @@
  <packageSources>
  <clear />
  <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
+ <add key="darc-pub-DotNet-msbuild-Trusted-a02f736" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-a02f7365/nuget/v3/index.json" />
  <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
  <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
  <add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />

diff --git a/build/Packages.props b/build/Packages.props
@@ -7,7 +7,7 @@
  <MicrosoftTestPackageVersion>17.0.0</MicrosoftTestPackageVersion>
  <MSBuildPackageVersion>17.0.0</MSBuildPackageVersion>
  <NuGetPackageVersion>6.0.0</NuGetPackageVersion>
- <RoslynPackageVersion>4.2.0-3.22157.8</RoslynPackageVersion>
+ <RoslynPackageVersion>4.2.0-3.22169.1</RoslynPackageVersion>
  <XunitPackageVersion>2.4.1</XunitPackageVersion>
  </PropertyGroup>
 
@@ -75,7 +75,7 @@
  <PackageReference Update="OmniSharp.Extensions.LanguageServer" Version="0.19.0" />
  <PackageReference Update="OmniSharp.Extensions.LanguageProtocol.Testing" Version="0.19.0" />
 
- <PackageReference Update="SQLitePCLRaw.bundle_green" Version="2.0.4" />
+ <PackageReference Update="SQLitePCLRaw.bundle_green" Version="2.0.7" />
  <PackageReference Update="System.Collections.Immutable" Version="5.0.0" />
  <PackageReference Update="System.ComponentModel.Composition" Version="4.5.0" />
  <PackageReference Update="System.Composition" Version="1.0.31" />

diff --git a/src/OmniSharp.Http.Driver/app.config b/src/OmniSharp.Http.Driver/app.config
@@ -48,7 +48,7 @@
 
  <dependentAssembly>
  <assemblyIdentity name="System.Composition.AttributedModel" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
- <bindingRedirect oldVersion="0.0.0.0-1.0.31.0" newVersion="1.0.31.0"/>
+ <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
  </dependentAssembly>
  <dependentAssembly>
  <assemblyIdentity name="System.Composition.Hosting" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>

diff --git a/src/OmniSharp.LanguageServerProtocol/app.config b/src/OmniSharp.LanguageServerProtocol/app.config
@@ -48,7 +48,7 @@
 
  <dependentAssembly>
  <assemblyIdentity name="System.Composition.AttributedModel" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
- <bindingRedirect oldVersion="0.0.0.0-1.0.31.0" newVersion="1.0.31.0"/>
+ <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
  </dependentAssembly>
  <dependentAssembly>
  <assemblyIdentity name="System.Composition.Hosting" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>

diff --git a/src/OmniSharp.Roslyn.CSharp/Services/InlayHints/InlayHintService.cs b/src/OmniSharp.Roslyn.CSharp/Services/InlayHints/InlayHintService.cs
@@ -95,7 +95,7 @@ public async Task<InlayHint> Handle(InlayHintResolveRequest request)
  return request.Hint;
  }
 
- var descriptionTags = await roslynHint.GetDescrptionAsync(document, CancellationToken.None);
+ var descriptionTags = await roslynHint.GetDescriptionAsync(document, CancellationToken.None);
  StringBuilder stringBuilder = new StringBuilder();
  MarkdownHelpers.TaggedTextToMarkdown(
  descriptionTags,

diff --git a/src/OmniSharp.Stdio.Driver/app.config b/src/OmniSharp.Stdio.Driver/app.config
@@ -48,7 +48,7 @@
 
  <dependentAssembly>
  <assemblyIdentity name="System.Composition.AttributedModel" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
- <bindingRedirect oldVersion="0.0.0.0-1.0.31.0" newVersion="1.0.31.0"/>
+ <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
  </dependentAssembly>
  <dependentAssembly>
  <assemblyIdentity name="System.Composition.Hosting" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>

diff --git a/tests/app.config b/tests/app.config
@@ -32,7 +32,7 @@
 
  <dependentAssembly>
  <assemblyIdentity name="System.Composition.AttributedModel" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
- <bindingRedirect oldVersion="0.0.0.0-1.0.31.0" newVersion="1.0.31.0"/>
+ <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
  </dependentAssembly>
  <dependentAssembly>
  <assemblyIdentity name="System.Composition.Hosting" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>

diff --git a/tools/packages.config b/tools/packages.config
@@ -13,16 +13,16 @@
  -->
 
  <!-- These packages should match the "MicrosoftNETSdkPackageVersion" property-->
- <package id="Microsoft.NET.Sdk" version="6.0.200-rtm.22104.9" />
- <package id="Microsoft.DotNet.MSBuildSdkResolver" version="6.0.200-rtm.22104.9" />
+ <package id="Microsoft.NET.Sdk" version="6.0.201-servicing.22124.17" />
+ <package id="Microsoft.DotNet.MSBuildSdkResolver" version="6.0.201-servicing.22124.17" />
 
  <!-- These packages should match the "MicrosoftNETCoreDotNetHostResolverPackageVersion" property -->
- <package id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.2" />
- <package id="runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver" version="6.0.2" />
- <package id="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.2" />
- <package id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.2" />
- <package id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" version="6.0.2" />
- <package id="runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" version="6.0.2" />
+ <package id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.3" />
+ <package id="runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver" version="6.0.3" />
+ <package id="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.3" />
+ <package id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.3" />
+ <package id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" version="6.0.3" />
+ <package id="runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" version="6.0.3" />
 
  <!--
  The version for these packages can be found in the dotnet/sdk eng/Versions.props file in
@@ -31,16 +31,17 @@
  -->
 
  <!-- These packages should match the "MicrosoftBuildPackageVersion" property -->
- <package id="Microsoft.Build" version="17.1.0-preview-22075-05" />
- <package id="Microsoft.Build.Framework" version="17.1.0-preview-22075-05" />
- <package id="Microsoft.Build.Runtime" version="17.1.0-preview-22075-05" />
- <package id="Microsoft.Build.Tasks.Core" version="17.1.0-preview-22075-05" />
- <package id="Microsoft.Build.Utilities.Core" version="17.1.0-preview-22075-05" />
- <!-- This package should match as well except the Major & Minor version are set to 1.0 -->
- <package id="Microsoft.NET.StringTools" version="1.0.0-preview-22075-05" />
+ <package id="Microsoft.Build" version="17.1.1" />
+ <package id="Microsoft.Build.Framework" version="17.1.1" />
+ <package id="Microsoft.Build.Runtime" version="17.1.1" />
+ <package id="Microsoft.Build.Tasks.Core" version="17.1.1" />
+ <package id="Microsoft.Build.Utilities.Core" version="17.1.1" />
+
+ <!-- This package should be set to 1.0.0 -->
+ <package id="Microsoft.NET.StringTools" version="1.0.0" />
 
  <!-- This package should match the "MicrosoftNetCompilersToolsetPackageVersion" property-->
- <package id="Microsoft.Net.Compilers.Toolset" version="4.1.0-5.22116.13" />
+ <package id="Microsoft.Net.Compilers.Toolset" version="4.1.0-5.22128.4" />
 
  <!-- These packages should match the "NuGetBuildTasksPackageVersion" property -->
  <package id="Microsoft.Build.NuGetSdkResolver" version="6.1.0-rc.103" />
@@ -71,9 +72,9 @@
  <package id="System.Resources.Extensions" version="4.7.1" />
 
  <!-- These packages should match "SQLitePCLRawbundle_greenVersion" property -->
- <package id="SQLitePCLRaw.bundle_green" version="2.0.4" />
- <package id="SQLitePCLRaw.core" version="2.0.4" />
- <package id="SQLitePCLRaw.provider.e_sqlite3" version="2.0.4" />
+ <package id="SQLitePCLRaw.bundle_green" version="2.0.7" />
+ <package id="SQLitePCLRaw.core" version="2.0.7" />
+ <package id="SQLitePCLRaw.provider.e_sqlite3" version="2.0.7" />
 
  <!-- This package is needed. -->
  <package id="Microsoft.IO.Redist" version="6.0.0" />