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 from 6.0.1xx #2239

Merged
merged 2 commits into from
Oct 1, 2021
Merged

Update versions from 6.0.1xx #2239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49b6383
Update versions from 6.0.1xx
nohwnd Oct 1, 2021
1befe4c
Update changelog
nohwnd Oct 1, 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
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
# Changelog
All changes to the project will be documented in this file.

## [1.37.16] - 2021-10-01
* Update included Build Tools to match .NET SDK 6 (PR: [#2239](https://github.com/OmniSharp/omnisharp-roslyn/pull/2239))
* Add Custom .NET CLI support to OmniSharp (PR: [#2227](https://github.com/OmniSharp/omnisharp-roslyn/pull/2227))
* Handle .editorconfig changes without running a new design time build ([#2112](https://github.com/OmniSharp/omnisharp-roslyn/issues/2112) PR: [#2234](https://github.com/OmniSharp/omnisharp-roslyn/pull/2234))
* Do not return nulls when getting documents by path ([#2125](https://github.com/OmniSharp/omnisharp-roslyn/issues/2125) PR: [#2233](https://github.com/OmniSharp/omnisharp-roslyn/pull/2233))
* handle RecordStructName in semantic highlighting classification ([#2228](https://github.com/OmniSharp/omnisharp-roslyn/issues/2228) PR: [#2232](https://github.com/OmniSharp/omnisharp-roslyn/pull/2232))
* Update CodeStructureService with FileScoped Namespace support ([#2225](https://github.com/OmniSharp/omnisharp-roslyn/issues/2225) PR: [#2226](https://github.com/OmniSharp/omnisharp-roslyn/pull/2226))

## [1.37.15] - 2021-08-31
* Update Roslyn to 4.0.0-4.21427.11 (PR: [#2220](https://github.com/OmniSharp/omnisharp-roslyn/pull/2220))
* Update NuGet to 5.10.0 ([#2027](https://github.com/OmniSharp/omnisharp-roslyn/issues/2027), PR: [#2034](https://github.com/OmniSharp/omnisharp-roslyn/pull/2034))
Expand Down
2 changes: 1 addition & 1 deletion build/Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<MicrosoftTestPackageVersion>16.9.4</MicrosoftTestPackageVersion>
<MSBuildPackageVersion>16.10.0</MSBuildPackageVersion>
<NuGetPackageVersion>5.10.0</NuGetPackageVersion>
<RoslynPackageVersion>4.0.0-4.21427.11</RoslynPackageVersion>
<RoslynPackageVersion>4.0.0-5.21480.15</RoslynPackageVersion>
<XunitPackageVersion>2.4.1</XunitPackageVersion>
</PropertyGroup>

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,44 +9,44 @@
<!--
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-rc1/eng/Versions.props
ex. https://github.com/dotnet/installer/blob/release/6.0.1xx/eng/Versions.props
-->

<!-- These packages should match the "MicrosoftNETSdkPackageVersion" property-->
<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" />
<package id="Microsoft.NET.Sdk" version="6.0.100-rtm.21480.28" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are these the ones envisioned for RTM already?!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@filipw Sorry, I don't know how to answer that. I only copied the versions from the release/6.0.1xx branch.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think ideally we would have used the packages from https://github.com/dotnet/sdk/tree/release/6.0.1xx-rc2 since RC2 is about to release. Once we have a new build we can validate against RC2 and see if this is going to be a problem or not.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

right - that was exactly my question here too - I thought that perhaps RC2 was not happening anymore if the RTM versions are there now? I am not privvy to all these plans 😀

<package id="Microsoft.DotNet.MSBuildSdkResolver" version="6.0.100-rtm.21480.28" />

<!-- These packages should match the "MicrosoftNETCoreDotNetHostResolverPackageVersion" property -->
<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" />
<package id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-rtm.21479.7" />
<package id="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-rtm.21479.7" />
<package id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-rtm.21479.7" />
<package id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-rtm.21479.7" />
<package id="runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-rtm.21479.7" />

<!--
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-rc1/eng/Versions.props
ex. https://github.com/dotnet/sdk/blob/release/6.0.1xx/eng/Versions.props
-->

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

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

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

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