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

Update build tools to match NET 6 Preview 5 #2175

Merged
merged 4 commits into from
Jun 18, 2021
Merged

Update build tools to match NET 6 Preview 5 #2175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
120827e
Update minimal build tools to match NET 6 Preview 5
JoeRobich Jun 18, 2021
29468d4
Update ICSharpCode.Decompiler to 7.1.0.6543
JoeRobich Jun 18, 2021
1f0bc6b
Bump Roslyn version to 4.0.0-2.21314.7
JoeRobich Jun 18, 2021
913eaff
Port version upgrades from the feature/omnisharp-vnext
JoeRobich Jun 18, 2021
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
19 changes: 11 additions & 8 deletions build/Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup>
<AspNetCorePackageVersion>2.1.1</AspNetCorePackageVersion>
<MicrosoftExtensionPackageVersion>3.1.12</MicrosoftExtensionPackageVersion>
<MSBuildPackageVersion>16.9.0</MSBuildPackageVersion>
<AspNetCorePackageVersion>2.2.0</AspNetCorePackageVersion>
<MicrosoftExtensionPackageVersion>5.0.0</MicrosoftExtensionPackageVersion>
<MicrosoftTestPackageVersion>16.9.4</MicrosoftTestPackageVersion>
<MSBuildPackageVersion>16.10.0</MSBuildPackageVersion>
<NuGetPackageVersion>5.2.0</NuGetPackageVersion>
<RoslynPackageVersion>3.11.0-1.21262.10</RoslynPackageVersion>
<RoslynPackageVersion>4.0.0-2.21314.7</RoslynPackageVersion>
<XunitPackageVersion>2.4.1</XunitPackageVersion>
</PropertyGroup>

Expand All @@ -15,7 +16,7 @@

<PackageReference Update="Dotnet.Script.DependencyModel" Version="1.1.0" />
<PackageReference Update="Dotnet.Script.DependencyModel.NuGet" Version="1.1.0" />
<PackageReference Update="ICSharpCode.Decompiler" Version="7.0.0.6488" />
<PackageReference Update="ICSharpCode.Decompiler" Version="7.1.0.6543" />

<PackageReference Update="McMaster.Extensions.CommandLineUtils" Version="2.2.4" />

Expand Down Expand Up @@ -45,7 +46,7 @@
<PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionPackageVersion)" />
<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionPackageVersion)" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionPackageVersion)" />
<PackageReference Update="Microsoft.Extensions.DependencyModel" Version="3.1.6" />
<PackageReference Update="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionPackageVersion)" />
<PackageReference Update="Microsoft.Extensions.FileProviders.Physical" Version="$(MicrosoftExtensionPackageVersion)" />
<PackageReference Update="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionPackageVersion)" />
<PackageReference Update="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionPackageVersion)" />
Expand All @@ -54,8 +55,10 @@
<PackageReference Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionPackageVersion)" />

<PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Update="Microsoft.TestPlatform.TranslationLayer" Version="16.6.1" />

<PackageReference Update="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestPackageVersion)" />
<PackageReference Update="Microsoft.TestPlatform.TranslationLayer" Version="$(MicrosoftTestPackageVersion)" />

<PackageReference Update="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="1.14.114" />
<PackageReference Update="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.12" />

Expand Down
2 changes: 1 addition & 1 deletion src/OmniSharp.Abstractions/Configuration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ internal static class Configuration
{
public static bool ZeroBasedIndices = false;

public const string RoslynVersion = "3.11.0.0";
public const string RoslynVersion = "4.0.0.0";
public const string RoslynPublicKeyToken = "31bf3856ad364e35";

public readonly static string RoslynFeatures = GetRoslynAssemblyFullName("Microsoft.CodeAnalysis.Features");
Expand Down
10 changes: 5 additions & 5 deletions src/OmniSharp.Http.Driver/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,23 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis.Workspaces" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis.Features" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp.Features" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
Expand Down
10 changes: 5 additions & 5 deletions src/OmniSharp.LanguageServerProtocol/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,23 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis.Workspaces" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis.Features" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp.Features" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
Expand Down
10 changes: 5 additions & 5 deletions src/OmniSharp.Stdio.Driver/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,23 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis.Workspaces" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis.Features" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp.Features" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
Expand Down
6 changes: 3 additions & 3 deletions tests/OmniSharp.Roslyn.CSharp.Tests/AbstractGoToDefinitionFacts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,13 +160,13 @@ public static void main()
public async Task ReturnsPartialMethodDefinitionWithBody(string filename)
{
var testFile = new TestFile(filename, @"
public partial class MyClass
public partial class MyClass
{
public MyClass()
{
Met$$hod();
}

partial void {|def:Method|}()
{
//do stuff
Expand Down Expand Up @@ -468,7 +468,7 @@ public void Baz() {
// second comment should indicate we have decompiled
var comments = compilationUnit.DescendantTrivia().Where(t => t.Kind() == SyntaxKind.SingleLineCommentTrivia).ToArray();
Assert.NotNull(comments);
Assert.Equal("// Decompiled with ICSharpCode.Decompiler 7.0.0.6488", comments[1].ToString());
Assert.Equal("// Decompiled with ICSharpCode.Decompiler 7.1.0.6543", comments[1].ToString());

// contrary to regular metadata, we should have methods with full bodies
// this condition would fail if decompilation wouldn't work
Expand Down
10 changes: 5 additions & 5 deletions tests/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,23 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis.Workspaces" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis.Features" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp.Features" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.11.0.0" newVersion="3.11.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
Expand Down
36 changes: 18 additions & 18 deletions tools/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
-->

<!-- These packages should match the "MicrosoftNETSdkPackageVersion" property-->
<package id="Microsoft.NET.Sdk" version="6.0.100-preview.4.21262.19" />
<package id="Microsoft.DotNet.MSBuildSdkResolver" version="6.0.100-preview.4.21262.19" />
<package id="Microsoft.NET.Sdk" version="6.0.100-preview.5.21308.18" />
<package id="Microsoft.DotNet.MSBuildSdkResolver" version="6.0.100-preview.5.21308.18" />

<!-- These packages should match the "MicrosoftNETCoreDotNetHostResolverPackageVersion" property -->
<package id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.4.21253.7" />
<package id="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.4.21253.7" />
<package id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.4.21253.7" />
<package id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.4.21253.7" />
<package id="runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.4.21253.7" />
<package id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.5.21301.5" />
<package id="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.5.21301.5" />
<package id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.5.21301.5" />
<package id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.5.21301.5" />
<package id="runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.5.21301.5" />

<!--
The version for these packages can be found in the dotnet/sdk eng/Versions.props file in
Expand All @@ -30,22 +30,22 @@
-->

<!-- These packages should match the "MicrosoftBuildPackageVersion" property -->
<package id="Microsoft.Build" version="16.11.0-preview-21254-21" />
<package id="Microsoft.Build.Framework" version="16.11.0-preview-21254-21" />
<package id="Microsoft.Build.Runtime" version="16.11.0-preview-21254-21" />
<package id="Microsoft.Build.Tasks.Core" version="16.11.0-preview-21254-21" />
<package id="Microsoft.Build.Utilities.Core" version="16.11.0-preview-21254-21" />
<package id="Microsoft.Build" version="17.0.0-preview-21307-02" />
<package id="Microsoft.Build.Framework" version="17.0.0-preview-21307-02" />
<package id="Microsoft.Build.Runtime" version="17.0.0-preview-21307-02" />
<package id="Microsoft.Build.Tasks.Core" version="17.0.0-preview-21307-02" />
<package id="Microsoft.Build.Utilities.Core" version="17.0.0-preview-21307-02" />
<!-- 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-21254-21" />
<package id="Microsoft.NET.StringTools" version="1.0.0-preview-21307-02" />

<!-- This package should match the "MicrosoftNetCompilersToolsetPackageVersion" property-->
<package id="Microsoft.Net.Compilers.Toolset" version="4.0.0-2.21254.26" />
<package id="Microsoft.Net.Compilers.Toolset" version="4.0.0-1.21304.5" />

<!-- These packages should match the "NuGetBuildTasksPackageVersion" property -->
<package id="Microsoft.Build.NuGetSdkResolver" version="5.10.0-rc.7240" />
<package id="NuGet.Build.Tasks" version="5.10.0-rc.7240" />
<package id="NuGet.Commands" version="5.10.0-rc.7240" />
<package id="NuGet.Credentials" version="5.10.0-rc.7240" />
<package id="Microsoft.Build.NuGetSdkResolver" version="6.0.0-preview.1.66" />
<package id="NuGet.Build.Tasks" version="6.0.0-preview.1.66" />
<package id="NuGet.Commands" version="6.0.0-preview.1.66" />
<package id="NuGet.Credentials" version="6.0.0-preview.1.66" />

<!-- This package should match the "NewtonsoftJsonPackageVersion" property-->
<package id="Newtonsoft.Json" version="12.0.3" />
Expand Down