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 versions to match .NET SDK 6 RC1 #2217

Closed
wants to merge 4 commits into from
Closed

Update versions to match .NET SDK 6 RC1 #2217

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
2bc6849
Update versions to match .NET SDK 6 RC1
nohwnd Aug 30, 2021
12aa385
Update readme for 1.37.15
nohwnd Aug 30, 2021
c6d27ea
Merge branch 'changelog-1.37.15' into update-dependencies-for-net6-rc1
nohwnd Aug 30, 2021
00da3db
Merge branch 'master' into update-dependencies-for-net6-rc1
filipw Aug 30, 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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# Changelog
All changes to the project will be documented in this file.

## [1.37.15] - Not released
* Update versions to match .NET SDK 6 RC1 (PR: [#2217](https://github.com/OmniSharp/omnisharp-roslyn/pull/2217))
* Use FullPaths for Locations that are returned with relative paths. (PR: [#2216](https://github.com/OmniSharp/omnisharp-roslyn/pull/2216))
* Improved logging in project manager (PR: [#2203](https://github.com/OmniSharp/omnisharp-roslyn/pull/2203))
* Log a warning when external features path has no assemblies (PR: [#2202](https://github.com/OmniSharp/omnisharp-roslyn/pull/2202))

## [1.37.14] - 2021-07-27
* Update to latest .NET SDKs (PR: [#2197](https://github.com/OmniSharp/omnisharp-roslyn/pull/2197))
* Update included Build Tools to match .NET SDK 6 Preview 7 (PR: [#2196](https://github.com/OmniSharp/omnisharp-roslyn/pull/2196))
Expand Down
42 changes: 21 additions & 21 deletions tools/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,46 +9,46 @@
<!--
The version for these packages can be found in the dotnet/installer eng/Versions.props file in
the branch that corresponds with the SDK Toolset being modeled.
ex. https://github.com/dotnet/installer/blob/release/6.0.1xx-preview6/eng/Versions.props
ex. https://github.com/dotnet/installer/blob/release/6.0.1xx-rc1/eng/Versions.props
-->

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

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

<!--
The version for these packages can be found in the dotnet/sdk eng/Versions.props file in
the branch that corresponds with the "Microsoft.NET.Sdk package" being referenced.
ex. https://github.com/dotnet/sdk/blob/release/6.0.1xx-preview6/eng/Versions.props
ex. https://github.com/dotnet/sdk/blob/release/6.0.1xx-rc1/eng/Versions.props
-->

<!-- These packages should match the "MicrosoftBuildPackageVersion" property -->
<package id="Microsoft.Build" version="17.0.0-preview-21376-04" />
<package id="Microsoft.Build.Framework" version="17.0.0-preview-21376-04" />
<package id="Microsoft.Build.Runtime" version="17.0.0-preview-21376-04" />
<package id="Microsoft.Build.Tasks.Core" version="17.0.0-preview-21376-04" />
<package id="Microsoft.Build.Utilities.Core" version="17.0.0-preview-21376-04" />
<package id="Microsoft.Build" version="17.0.0-preview-21426-01" />
<package id="Microsoft.Build.Framework" version="17.0.0-preview-21426-01" />
<package id="Microsoft.Build.Runtime" version="17.0.0-preview-21426-01" />
<package id="Microsoft.Build.Tasks.Core" version="17.0.0-preview-21426-01" />
<package id="Microsoft.Build.Utilities.Core" version="17.0.0-preview-21426-01" />
<!-- 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-21376-04" />
<package id="Microsoft.NET.StringTools" version="1.0.0-preview-21426-01" />

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

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

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

<!-- This package should match the "DeploymentReleasesVersion" property-->
<package id="Microsoft.Deployment.DotNet.Releases" version="1.0.0-preview1.1.21112.1" />
Expand Down