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

Jump to bottom

Update Roslyn and .NET SDK versions #2614

Closed
wants to merge 4 commits into from
Closed

Update Roslyn and .NET SDK versions #2614

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
4ae26ed
Update CI runner images
JoeRobich May 24, 2024
07ddad7
Update Roslyn version to 4.11.0-2.24266.3
JoeRobich May 24, 2024
0be2716
Fix unit tests
JoeRobich May 24, 2024
cd5731f
Set OpenSSL version override
JoeRobich Jun 27, 2024
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
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ env:
Artifacts: ${{ github.workspace }}/artifacts/
Coverage: ${{ github.workspace }}/coverage/
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: "true"
CLR_OPENSSL_VERSION_OVERRIDE: "1.1"
defaults:
run:
shell: pwsh
Expand All @@ -27,7 +28,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, windows-2022, macos-11]
os: [ubuntu-22.04, windows-2022, macos-13]
name: 'Build'
steps:
- name: Checkout
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/tests-net6.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ env:
Artifacts: ${{ github.workspace }}/artifacts/
Coverage: ${{ github.workspace }}/coverage/
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: "true"
CLR_OPENSSL_VERSION_OVERRIDE: "1.1"
defaults:
run:
shell: pwsh
Expand All @@ -27,7 +28,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, windows-2022, macos-11]
os: [ubuntu-22.04, windows-2022, macos-13]
testProjects:
- OmniSharp.MSBuild.Tests,OmniSharp.Roslyn.CSharp.Tests,OmniSharp.Cake.Tests,OmniSharp.Script.Tests,OmniSharp.Stdio.Tests,OmniSharp.Http.Tests,OmniSharp.Tests,OmniSharp.Lsp.Tests
- OmniSharp.DotNetTest.Tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, windows-2022, macos-11]
os: [ubuntu-22.04, windows-2022, macos-13]
testProjects:
- OmniSharp.MSBuild.Tests,OmniSharp.Roslyn.CSharp.Tests,OmniSharp.Cake.Tests,OmniSharp.Script.Tests,OmniSharp.Stdio.Tests,OmniSharp.Http.Tests,OmniSharp.Tests,OmniSharp.Lsp.Tests
- OmniSharp.DotNetTest.Tests
Expand Down
2 changes: 1 addition & 1 deletion Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<MicrosoftTestPackageVersion>17.8.0</MicrosoftTestPackageVersion>
<MSBuildPackageVersion>17.3.2</MSBuildPackageVersion>
<NuGetPackageVersion>6.10.0-preview.1.18</NuGetPackageVersion>
<RoslynPackageVersion>4.10.0-2.24112.8</RoslynPackageVersion>
<RoslynPackageVersion>4.11.0-2.24266.3</RoslynPackageVersion>
<XunitPackageVersion>2.6.1</XunitPackageVersion>
</PropertyGroup>

Expand Down
6 changes: 4 additions & 2 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:

- job: macOS
pool:
vmImage: "macOS-11"
vmImage: "macos-13"
dependsOn: GitVersion
steps:
- template: ./.pipelines/init.yml
Expand All @@ -76,7 +76,9 @@ jobs:

- job: Linux
pool:
vmImage: "ubuntu-20.04"
vmImage: "ubuntu-22.04"
variables:
CLR_OPENSSL_VERSION_OVERRIDE: '1.1'
dependsOn: GitVersion
steps:
- template: ./.pipelines/init.yml
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 = "4.10.0.0";
public const string RoslynVersion = "4.11.0.0";
public const string RoslynPublicKeyToken = "31bf3856ad364e35";

public readonly static string RoslynFeatures = GetRoslynAssemblyFullName("Microsoft.CodeAnalysis.Features");
Expand Down
4 changes: 3 additions & 1 deletion tests/OmniSharp.Cake.Tests/BlockStructureFacts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ void M()[|
.ToArray();

var expected = testFile.Content.GetSpans()
.Select(span => testFile.Content.GetRangeFromSpan(span).ToRange()).ToArray();
.Select(span => testFile.Content.GetRangeFromSpan(span).ToRange())
.Reverse()
.ToArray();

Assert.Equal(expected, lineSpans);
}
Expand Down
1 change: 1 addition & 0 deletions tests/OmniSharp.MSBuild.Tests/AbstractMSBuildTestFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public AbstractMSBuildTestFixture(ITestOutputHelper output)
// prerelease version so that our .NET 7 tests will pass.
var configuration = new Dictionary<string, string>
{
["sdk:Version"] = "8.0.201",
["sdk:IncludePrereleases"] = bool.TrueString
}.ToConfiguration();

Expand Down
4 changes: 3 additions & 1 deletion tests/OmniSharp.Roslyn.CSharp.Tests/BlockStructureFacts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ void M()[|
.ToArray();

var expected = testFile.Content.GetSpans()
.Select(span => testFile.Content.GetRangeFromSpan(span).ToRange()).ToArray();
.Select(span => testFile.Content.GetRangeFromSpan(span).ToRange())
.Reverse()
.ToArray();

Assert.Equal(expected, lineSpans);
}
Expand Down
Loading