Skip to content

Update the minimal MSBuild to better support .NET 5 Previews #1746

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

Merged
filipw merged 9 commits into from
Mar 25, 2020
Merged

Update the minimal MSBuild to better support .NET 5 Previews #1746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ccb093f
Update the tools packages to roughly match VS16.5
JoeRobich Mar 23, 2020
2b1b9b2
Upgrade NuGet tools to preview build
JoeRobich Mar 24, 2020
04a71de
Update changelog
JoeRobich Mar 24, 2020
6b53197
Add issue link to changelog
JoeRobich Mar 24, 2020
b2831ed
Merge branch 'master' into update-tools-16.5
JoeRobich Mar 24, 2020
ffbd155
Add ability install multiple SDKs for tests
JoeRobich Mar 25, 2020
8877673
Add .NET 5.0 test project
JoeRobich Mar 25, 2020
aa99c2d
Bump MSBuild version
JoeRobich Mar 25, 2020
39811e1
Handle various shortnames until net5.0 TFM is final
JoeRobich Mar 25, 2020
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ All changes to the project will be documented in this file.

## [1.34.15] - not yet released
* Support for .NET Core 3.1 in csx files (PR: [#1731](https://github.com/OmniSharp/omnisharp-roslyn/pull/1731))
* Update the minimal MSBuild to better support .NET 5 Previews ([omnisharp-vscode#3653](https://github.com/OmniSharp/omnisharp-vscode/issues/3653), PR: [#1746](https://github.com/OmniSharp/omnisharp-roslyn/pull/1746))
* Updated to Roslyn [3.6.0-3.20170.19] (PR: [#1745](https://github.com/OmniSharp/omnisharp-roslyn/pull/1745))

## [1.34.14] - 2020-03-09
Expand Down
9 changes: 6 additions & 3 deletions build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,12 @@ Task("InstallDotNetCoreSdk")
{
if (!useGlobalDotNetSdk)
{
InstallDotNetSdk(env, buildPlan,
version: buildPlan.DotNetVersion,
installFolder: env.Folders.DotNetSdk);
foreach (var dotnetVersion in buildPlan.DotNetVersions)
{
InstallDotNetSdk(env, buildPlan,
version: dotnetVersion,
installFolder: env.Folders.DotNetSdk);
}

// Add non-legacy .NET SDK to PATH
var oldPath = Environment.GetEnvironmentVariable("PATH");
Expand Down
12 changes: 8 additions & 4 deletions build.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{
"DotNetInstallScriptURL": "https://dot.net/v1",
"DotNetChannel": "Current",
"DotNetVersion": "3.0.100",
"DotNetChannel": "Preview",
"DotNetVersions": [
"3.0.100",
"5.0.100-preview.2.20169.1"
],
"RequiredMonoVersion": "6.6.0",
"DownloadURL": "https://roslynomnisharp.blob.core.windows.net/ext",
"MonoRuntimeMacOS": "mono.macOS-6.8.0.105.zip",
Expand Down Expand Up @@ -35,7 +38,8 @@
"ProjectWithMultiTFMLib",
"ExternAlias",
"ProjectWithComplexAnalyzers",
"NetCore30Project"
"NetCore30Project",
"Net50Project"
],
"CakeTestAssets": [
"CakeProject"
Expand All @@ -46,4 +50,4 @@
"RestoreOnlyTestAssets": [
"ProjectWithMissingType"
]
}
}
4 changes: 2 additions & 2 deletions build/Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup>
<MSBuildPackageVersion>16.4.0</MSBuildPackageVersion>
<MSBuildPackageVersion>16.5.0</MSBuildPackageVersion>
<NuGetPackageVersion>5.2.0</NuGetPackageVersion>
<RoslynPackageVersion>3.6.0-2.20167.2</RoslynPackageVersion>
<XunitPackageVersion>2.4.0</XunitPackageVersion>
Expand Down Expand Up @@ -82,7 +82,7 @@
<PackageReference Update="xunit" Version="$(XunitPackageVersion)" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
</ItemGroup>


Expand Down
2 changes: 1 addition & 1 deletion scripts/common.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ public class BuildPlan
{
public string DotNetInstallScriptURL { get; set; }
public string DotNetChannel { get; set; }
public string DotNetVersion { get; set; }
public string[] DotNetVersions { get; set; }
public string RequiredMonoVersion { get; set; }
public string DownloadURL { get; set; }
public string MonoRuntimeMacOS { get; set; }
Expand Down
48 changes: 48 additions & 0 deletions test-assets/test-projects/Net50Project/Net50Solution.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26124.0
MinimumVisualStudioVersion = 15.0.26124.0
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "console-app", "console-app\console-app.csproj", "{ADE4E8E3-05F1-429F-966F-151F8E889485}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "net50-lib", "net50-lib\net50-lib.csproj", "{DD826619-8811-4F84-8697-4B6C6D535B1C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{ADE4E8E3-05F1-429F-966F-151F8E889485}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ADE4E8E3-05F1-429F-966F-151F8E889485}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ADE4E8E3-05F1-429F-966F-151F8E889485}.Debug|x64.ActiveCfg = Debug|Any CPU
{ADE4E8E3-05F1-429F-966F-151F8E889485}.Debug|x64.Build.0 = Debug|Any CPU
{ADE4E8E3-05F1-429F-966F-151F8E889485}.Debug|x86.ActiveCfg = Debug|Any CPU
{ADE4E8E3-05F1-429F-966F-151F8E889485}.Debug|x86.Build.0 = Debug|Any CPU
{ADE4E8E3-05F1-429F-966F-151F8E889485}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ADE4E8E3-05F1-429F-966F-151F8E889485}.Release|Any CPU.Build.0 = Release|Any CPU
{ADE4E8E3-05F1-429F-966F-151F8E889485}.Release|x64.ActiveCfg = Release|Any CPU
{ADE4E8E3-05F1-429F-966F-151F8E889485}.Release|x64.Build.0 = Release|Any CPU
{ADE4E8E3-05F1-429F-966F-151F8E889485}.Release|x86.ActiveCfg = Release|Any CPU
{ADE4E8E3-05F1-429F-966F-151F8E889485}.Release|x86.Build.0 = Release|Any CPU
{DD826619-8811-4F84-8697-4B6C6D535B1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DD826619-8811-4F84-8697-4B6C6D535B1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DD826619-8811-4F84-8697-4B6C6D535B1C}.Debug|x64.ActiveCfg = Debug|Any CPU
{DD826619-8811-4F84-8697-4B6C6D535B1C}.Debug|x64.Build.0 = Debug|Any CPU
{DD826619-8811-4F84-8697-4B6C6D535B1C}.Debug|x86.ActiveCfg = Debug|Any CPU
{DD826619-8811-4F84-8697-4B6C6D535B1C}.Debug|x86.Build.0 = Debug|Any CPU
{DD826619-8811-4F84-8697-4B6C6D535B1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DD826619-8811-4F84-8697-4B6C6D535B1C}.Release|Any CPU.Build.0 = Release|Any CPU
{DD826619-8811-4F84-8697-4B6C6D535B1C}.Release|x64.ActiveCfg = Release|Any CPU
{DD826619-8811-4F84-8697-4B6C6D535B1C}.Release|x64.Build.0 = Release|Any CPU
{DD826619-8811-4F84-8697-4B6C6D535B1C}.Release|x86.ActiveCfg = Release|Any CPU
{DD826619-8811-4F84-8697-4B6C6D535B1C}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
12 changes: 12 additions & 0 deletions test-assets/test-projects/Net50Project/console-app/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using System;

namespace ConsoleApp
{
class Program
{
static void Main(string[] args)
{
Console.WriteLine("Hello World!");
}
}
}
10 changes: 10 additions & 0 deletions test-assets/test-projects/Net50Project/console-app/console-app.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp5.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\net50-lib\net50-lib.csproj" />
</ItemGroup>
</Project>
5 changes: 5 additions & 0 deletions test-assets/test-projects/Net50Project/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"sdk": {
"version": "5.0.100-preview.2.20169.1"
}
}
8 changes: 8 additions & 0 deletions test-assets/test-projects/Net50Project/net50-lib/Class1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using System;

namespace Net50Lib
{
public class Class1
{
}
}
7 changes: 7 additions & 0 deletions test-assets/test-projects/Net50Project/net50-lib/net50-lib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>

</Project>
21 changes: 21 additions & 0 deletions tests/OmniSharp.MSBuild.Tests/WorkspaceInformationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,27 @@ public async Task NetCore30Project()
}
}

[Fact]
public async Task Net50Solution()
{
using (var testProject = await TestAssets.Instance.GetTestProjectAsync("Net50Project"))
using (var host = CreateMSBuildTestHost(testProject.Directory))
{
var workspaceInfo = await host.RequestMSBuildWorkspaceInfoAsync();

Assert.NotNull(workspaceInfo.Projects);
Assert.Equal(2, workspaceInfo.Projects.Count);
var appProject = workspaceInfo.Projects.Single(proj => proj.IsExe);
Assert.Equal("console-app", appProject.AssemblyName);
Assert.Equal(".NETCoreApp,Version=v5.0", appProject.TargetFramework);
Assert.Contains(appProject.TargetFrameworks[0].ShortName, new[] { "net5.0", "netcoreapp5.0" });
var libProject = workspaceInfo.Projects.Single(proj => !proj.IsExe);
Assert.Equal("net50-lib", libProject.AssemblyName);
Assert.Equal(".NETCoreApp,Version=v5.0", libProject.TargetFramework);
Assert.Contains(libProject.TargetFrameworks[0].ShortName, new[] { "net50", "net5.0" });
}
}

[Fact]
public async Task TwoProjectsWithSolution()
{
Expand Down
50 changes: 25 additions & 25 deletions tools/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Cake" version="0.37.0" />
<package id="Microsoft.Build" version="16.4.0" />
<package id="Microsoft.Build.Framework" version="16.4.0" />
<package id="Microsoft.Build.Runtime" version="16.4.0" />
<package id="Microsoft.Build.Tasks.Core" version="16.4.0" />
<package id="Microsoft.Build.Utilities.Core" version="16.4.0" />
<package id="Microsoft.Net.Compilers" version="3.4.0" />
<package id="Microsoft.DotNet.MSBuildSdkResolver" version="3.0.101-servicing.19476.7" />
<package id="Microsoft.Build.NuGetSdkResolver" version="5.4.0-rtm.6292" />
<package id="Newtonsoft.Json" version="9.0.1" />
<package id="NuGet.Build.Tasks" version="5.4.0-rtm.6292" />
<package id="NuGet.Commands" version="5.4.0-rtm.6292" />
<package id="NuGet.Common" version="5.4.0-rtm.6292" />
<package id="NuGet.Configuration" version="5.4.0-rtm.6292" />
<package id="NuGet.Credentials" version="5.4.0-rtm.6292" />
<package id="NuGet.DependencyResolver.Core" version="5.4.0-rtm.6292" />
<package id="NuGet.Frameworks" version="5.4.0-rtm.6292" />
<package id="NuGet.LibraryModel" version="5.4.0-rtm.6292" />
<package id="NuGet.Packaging" version="5.4.0-rtm.6292" />
<package id="NuGet.ProjectModel" version="5.4.0-rtm.6292" />
<package id="NuGet.Protocol" version="5.4.0-rtm.6292" />
<package id="NuGet.Versioning" version="5.4.0-rtm.6292" />
<package id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" version="3.0.0" />
<package id="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" version="3.0.0" />
<package id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" version="3.0.0" />
<package id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" version="3.0.0" />
<package id="Microsoft.Build" version="16.5.0" />
<package id="Microsoft.Build.Framework" version="16.5.0" />
<package id="Microsoft.Build.Runtime" version="16.5.0" />
<package id="Microsoft.Build.Tasks.Core" version="16.5.0" />
<package id="Microsoft.Build.Utilities.Core" version="16.5.0" />
<package id="Microsoft.Net.Compilers" version="3.5.0" />
<package id="Microsoft.DotNet.MSBuildSdkResolver" version="3.1.200-preview.20126.2" />
<package id="Microsoft.Build.NuGetSdkResolver" version="5.6.0-preview.2.6508" />
<package id="Newtonsoft.Json" version="11.0.1" />
<package id="NuGet.Build.Tasks" version="5.6.0-preview.2.6508" />
<package id="NuGet.Commands" version="5.6.0-preview.2.6508" />
<package id="NuGet.Common" version="5.6.0-preview.2.6508" />
<package id="NuGet.Configuration" version="5.6.0-preview.2.6508" />
<package id="NuGet.Credentials" version="5.6.0-preview.2.6508" />
<package id="NuGet.DependencyResolver.Core" version="5.6.0-preview.2.6508" />
<package id="NuGet.Frameworks" version="5.6.0-preview.2.6508" />
<package id="NuGet.LibraryModel" version="5.6.0-preview.2.6508" />
<package id="NuGet.Packaging" version="5.6.0-preview.2.6508" />
<package id="NuGet.ProjectModel" version="5.6.0-preview.2.6508" />
<package id="NuGet.Protocol" version="5.6.0-preview.2.6508" />
<package id="NuGet.Versioning" version="5.6.0-preview.2.6508" />
<package id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" version="3.1.2" />
<package id="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" version="3.1.2" />
<package id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" version="3.1.2" />
<package id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" version="3.1.2" />
<package id="SQLitePCLRaw.bundle_green" version="1.1.2" />
<package id="SQLitePCLRaw.core" version="1.1.2" />
<package id="SQLitePCLRaw.provider.e_sqlite3.net45" version="1.1.2" />
Expand Down