Skip to content

Commit

Permalink
Merge pull request #1662 from filipw/feature/msbuild16.4
Browse files Browse the repository at this point in the history
updated to msbuild 16.4.0 and Microsoft.NETFramework.ReferenceAssemblies 1.0.0
  • Loading branch information
JoeRobich authored Dec 9, 2019
2 parents 3a331cd + 890ce12 commit 34d2c54
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
All changes to the project will be documented in this file.

## [1.34.9] - not yet released
* Updated to MsBuild 16.4.0 (PR:[#1662](https://github.com/OmniSharp/omnisharp-roslyn/pull/1662))
* Line pragma is now respected in find references ([#1649](https://github.com/OmniSharp/omnisharp-roslyn/issues/1649), PR:[#1660](https://github.com/OmniSharp/omnisharp-roslyn/pull/1660))
* Do not set mono paths when running in standalone mode ([omnisharp-vscode#3410](https://github.com/OmniSharp/omnisharp-vscode/issues/3410), [omnisharp-vscode#3340](https://github.com/OmniSharp/omnisharp-vscode/issues/3340), [#1650](https://github.com/OmniSharp/omnisharp-roslyn/issues/1650), PR:[#1656](https://github.com/OmniSharp/omnisharp-roslyn/pull/1656))
* Fixed a bug where OmniSharp would crash on startup if the path contained `=` sign ([omnisharp-vscode#3436](https://github.com/OmniSharp/omnisharp-vscode/issues/3436), PR:[#1661](https://github.com/OmniSharp/omnisharp-roslyn/pull/1661))
Expand Down
4 changes: 2 additions & 2 deletions build/Packages.props
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.3.0-preview-19426-01</MSBuildPackageVersion>
<MSBuildPackageVersion>16.4.0</MSBuildPackageVersion>
<NuGetPackageVersion>5.2.0</NuGetPackageVersion>
<RoslynPackageVersion>3.5.0-beta1-19571-01</RoslynPackageVersion>
<XunitPackageVersion>2.4.0</XunitPackageVersion>
Expand Down Expand Up @@ -50,7 +50,7 @@
<PackageReference Update="Microsoft.Extensions.Options" Version="2.1.1" />
<PackageReference Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />

<PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.1" />
<PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="15.7.2" />
<PackageReference Update="Microsoft.TestPlatform.TranslationLayer" Version="15.7.2" />
<PackageReference Update="Microsoft.VisualStudio.CodingConventions" Version="1.1.20180503.2" />
Expand Down
10 changes: 5 additions & 5 deletions tools/packages.config
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Cake" version="0.32.1" />
<package id="Microsoft.Build" version="16.3.0" />
<package id="Microsoft.Build.Framework" version="16.3.0" />
<package id="Microsoft.Build.Runtime" version="16.3.0" />
<package id="Microsoft.Build.Tasks.Core" version="16.3.0" />
<package id="Microsoft.Build.Utilities.Core" version="16.3.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.3.1" />
<package id="Microsoft.DotNet.MSBuildSdkResolver" version="3.0.101-servicing.19476.7" />
<package id="NuGet.Build.Tasks" version="5.3.1" />
Expand Down

0 comments on commit 34d2c54

Please sign in to comment.