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 .NET SDK and Roslyn #2458

Merged
merged 4 commits into from
Oct 14, 2022
Merged

Update .NET SDK and Roslyn #2458

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
57a79b9
Update .NET 7 to RC1
bjorkstromm Oct 6, 2022
4571a7d
Update Roslyn to 4.4.0-3.22429.3
bjorkstromm Oct 6, 2022
041a67d
Update NuGet versions
bjorkstromm Oct 6, 2022
547015b
Merge branch 'master' into feature/update-net-sdk
bjorkstromm Oct 14, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

name: 'Build'
env:
DotNetVersion: "7.0.100-preview.7.22377.5"
DotNetVersion: "7.0.100-rc.1.22431.12"
DotNetVersion2: "3.1.422"
NuGetVersion: "5.7.0"
MonoVersion: "6.12.0"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests-net6.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

name: 'Tests net6.0'
env:
DotNetVersion: "7.0.100-preview.7.22377.5"
DotNetVersion: "7.0.100-rc.1.22431.12"
DotNetVersion2: "3.1.422"
NuGetVersion: "5.7.0"
MonoVersion: "6.12.0"
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
@@ -1,7 +1,7 @@

name: 'Tests'
env:
DotNetVersion: "7.0.100-preview.7.22377.5"
DotNetVersion: "7.0.100-rc.1.22431.12"
DotNetVersion2: "3.1.422"
NuGetVersion: "5.7.0"
MonoVersion: "6.12.0"
Expand Down
2 changes: 1 addition & 1 deletion .pipelines/init.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
parameters:
# Configuration: Release
Verbosity: Normal
DotNetVersion: "7.0.100-preview.7.22377.5"
DotNetVersion: "7.0.100-rc.1.22431.12"
DotNetVersion2: "3.1.422"
CakeVersion: "1.1.0"
NuGetVersion: "5.7.0"
Expand Down
2 changes: 1 addition & 1 deletion build.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"DotNetVersions": [
"3.1.422",
"6.0.400",
"7.0.100-preview.7.22377.5"
"7.0.100-rc.1.22431.12"
],
"RequiredMonoVersion": "6.6.0",
"DownloadURL": "https://roslynomnisharp.blob.core.windows.net/ext",
Expand Down
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 @@ -5,8 +5,8 @@
<MicrosoftExtensionPackageVersion>6.0.0</MicrosoftExtensionPackageVersion>
<MicrosoftTestPackageVersion>17.3.0</MicrosoftTestPackageVersion>
<MSBuildPackageVersion>17.3.1</MSBuildPackageVersion>
<NuGetPackageVersion>6.3.0-rc.128</NuGetPackageVersion>
<RoslynPackageVersion>4.4.0-1.22369.1</RoslynPackageVersion>
<NuGetPackageVersion>6.4.0-preview.1.53</NuGetPackageVersion>
<RoslynPackageVersion>4.4.0-3.22429.3</RoslynPackageVersion>
<XunitPackageVersion>2.4.1</XunitPackageVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "7.0.100-preview.7.22377.5",
"version": "7.0.100-rc.1.22431.12",
"rollForward": "patch"
}
}
2 changes: 1 addition & 1 deletion test-assets/test-projects/Net70Project/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "7.0.100-preview.7.22377.5"
"version": "7.0.100-rc.1.22431.12"
}
}
2 changes: 1 addition & 1 deletion tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ public async Task The_correct_sdk_version_is_emitted_NET7()
using var testProject = await TestAssets.Instance.GetTestProjectAsync("Net70Project");
using var host = CreateMSBuildTestHost(testProject.Directory, emitter.AsExportDescriptionProvider(LoggerFactory));
Assert.Single(emitter.ReceivedMessages);
Assert.Equal(GetHashedFileExtension("7.0.100-preview.7.22377.5"), emitter.ReceivedMessages[0].SdkVersion);
Assert.Equal(GetHashedFileExtension("7.0.100-rc.1.22431.12"), emitter.ReceivedMessages[0].SdkVersion);
}

private string GetHashedFileExtension(string fileExtension)
Expand Down
2 changes: 1 addition & 1 deletion tests/OmniSharp.Tests/DotNetCliServiceFacts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace OmniSharp.Tests
{
public class DotNetCliServiceFacts : AbstractTestFixture
{
private const string DotNetVersion = "7.0.100-preview.7.22377.5";
private const string DotNetVersion = "7.0.100-rc.1.22431.12";
private int Major { get; }
private int Minor { get; }
private int Patch { get; }
Expand Down
2 changes: 1 addition & 1 deletion tests/OmniSharp.Tests/DotNetVersionFacts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public void ParseErrorMessage()
"6.0.105 [/usr/local/share/dotnet/sdk]",
"6.0.202 [/usr/local/share/dotnet/sdk]",
"6.0.400 [/usr/local/share/dotnet/sdk]",
"7.0.100-preview.7.22377.5 [/usr/local/share/dotnet/sdk]",
"7.0.100-rc.1.22431.12 [/usr/local/share/dotnet/sdk]",
"",
$"Install the [{RequestedSdkVersion}] .NET SDK or update [{GlobalJsonFile}] to match an installed SDK.",
"",
Expand Down