Skip to content

Commit 0dcdde8

Browse files
wafwaf
authored
Merge pull request #386 from waf/net-9-upgrade
Upgrade to .NET 9
2 parents 1edc6ca + dbffe47 commit 0dcdde8

File tree

9 files changed

+40
-35
lines changed

9 files changed

+40
-35
lines changed

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Install Dotnet
2121
uses: actions/setup-dotnet@607fce577a46308457984d59e4954e075820f10a
2222
with:
23-
dotnet-version: '8.0.x'
23+
dotnet-version: '9.0.x'
2424

2525
- name: Dotnet Installation Info
2626
run: dotnet --info

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Install Dotnet
1919
uses: actions/setup-dotnet@607fce577a46308457984d59e4954e075820f10a
2020
with:
21-
dotnet-version: '8.0.x'
21+
dotnet-version: '9.0.x'
2222

2323
- name: Dotnet Installation Info
2424
run: dotnet --info

‎CSharpRepl.Services/CSharpRepl.Services.csproj‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
</PropertyGroup>
77

88
<ItemGroup>
99
<PackageReference Include="Ben.Demystifier" Version="0.4.1" />
1010
<PackageReference Include="ICSharpCode.Decompiler" Version="8.2.0.7535" />
11-
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4">
11+
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0">
1212
<PrivateAssets>all</PrivateAssets>
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1414
</PackageReference>
15-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.10.0" />
16-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.10.0" />
17-
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.10.0" />
15+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.11.0" />
16+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.11.0" />
17+
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.11.0" />
1818
<PackageReference Include="Microsoft.Build.Locator" Version="1.7.8" />
19-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
20-
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
21-
<PackageReference Include="Microsoft.SymbolStore" Version="1.0.528101" />
19+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
20+
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="9.0.0" />
21+
<PackageReference Include="Microsoft.SymbolStore" Version="1.0.555801" />
2222
<PackageReference Include="PrettyPrompt" Version="4.1.1" />
2323
<PackageReference Include="Spectre.Console.Cli" Version="0.49.1" />
24-
<PackageReference Include="System.IO.Abstractions" Version="21.0.2" />
25-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
24+
<PackageReference Include="System.IO.Abstractions" Version="21.1.3" />
25+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
2626
</ItemGroup>
2727

2828
<!--
@@ -32,19 +32,19 @@
3232
https://github.com/OmniSharp/omnisharp-roslyn/commit/efeafeca33abe1d19659ed8c7ebab1d7c3481188
3333
-->
3434
<ItemGroup>
35-
<PackageReference Include="NuGet.PackageManagement" Version="6.10.0" />
36-
<PackageReference Include="NuGet.Common" Version="6.10.0" PrivateAssets="all" />
37-
<PackageReference Include="NuGet.Commands" Version="6.10.0" PrivateAssets="all" />
38-
<PackageReference Include="NuGet.Credentials" Version="6.10.0" PrivateAssets="all" />
39-
<PackageReference Include="NuGet.Configuration" Version="6.10.0" PrivateAssets="all" />
40-
<PackageReference Include="NuGet.DependencyResolver.Core" Version="6.10.0" PrivateAssets="all" />
41-
<PackageReference Include="NuGet.Frameworks" Version="6.10.0" PrivateAssets="all" />
42-
<PackageReference Include="NuGet.LibraryModel" Version="6.10.0" PrivateAssets="all" />
35+
<PackageReference Include="NuGet.PackageManagement" Version="6.12.1" />
36+
<PackageReference Include="NuGet.Common" Version="6.12.1" PrivateAssets="all" />
37+
<PackageReference Include="NuGet.Commands" Version="6.12.1" PrivateAssets="all" />
38+
<PackageReference Include="NuGet.Credentials" Version="6.12.1" PrivateAssets="all" />
39+
<PackageReference Include="NuGet.Configuration" Version="6.12.1" PrivateAssets="all" />
40+
<PackageReference Include="NuGet.DependencyResolver.Core" Version="6.12.1" PrivateAssets="all" />
41+
<PackageReference Include="NuGet.Frameworks" Version="6.12.1" PrivateAssets="all" />
42+
<PackageReference Include="NuGet.LibraryModel" Version="6.12.1" PrivateAssets="all" />
4343
<PackageReference Include="NuGet.Packaging.Core" Version="6.9.1" PrivateAssets="all" />
44-
<PackageReference Include="NuGet.Packaging" Version="6.10.0" PrivateAssets="all" />
45-
<PackageReference Include="NuGet.ProjectModel" Version="6.10.0" PrivateAssets="all" />
46-
<PackageReference Include="NuGet.Protocol" Version="6.10.0" PrivateAssets="all" />
47-
<PackageReference Include="NuGet.Versioning" Version="6.10.0" PrivateAssets="all" />
44+
<PackageReference Include="NuGet.Packaging" Version="6.12.1" PrivateAssets="all" />
45+
<PackageReference Include="NuGet.ProjectModel" Version="6.12.1" PrivateAssets="all" />
46+
<PackageReference Include="NuGet.Protocol" Version="6.12.1" PrivateAssets="all" />
47+
<PackageReference Include="NuGet.Versioning" Version="6.12.1" PrivateAssets="all" />
4848
</ItemGroup>
4949

5050

‎CSharpRepl.Services/Configuration.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public sealed class Configuration
4040
public static readonly IReadOnlyCollection<string> SymbolServers =
4141
[
4242
"https://symbols.nuget.org/download/symbols/",
43-
"http://msdl.microsoft.com/download/symbols/"
43+
"https://msdl.microsoft.com/download/symbols/"
4444
];
4545

4646
public HashSet<string> References { get; }

‎CSharpRepl.Services/SymbolExploration/DebugSymbolLoader.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ private CacheSymbolStore BuildSymbolStore()
5252

5353
foreach (var server in Configuration.SymbolServers)
5454
{
55-
store = new HttpSymbolStore(logger, store, new Uri(server), null);
55+
store = new HttpSymbolStore(logger, store, new Uri(server), accessToken: null);
5656
}
5757

5858
var cacheDirectory = Path.Combine(Configuration.ApplicationDirectory, "symbols");

‎CSharpRepl.Services/SymbolExploration/SymbolExplorer.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,11 @@ public async Task<SymbolResult> LookupSymbolAtPosition(string text, int position
8484

8585
foreach (var key in debugSymbolLoader.GetSymbolFileNames()) // we'll choose the first pdb we can successfully load. This will skip over e.g. Windows pdb files.
8686
{
87+
if (key.FullPathName.Contains(".ni.pdb"))
88+
{
89+
continue;
90+
}
91+
8792
using SymbolStoreFile symbolFile = await debugSymbolLoader.DownloadSymbolFile(key, CancellationToken.None);
8893

8994
var symbolReader = debugSymbolLoader.ReadPortablePdb(symbolFile);

‎CSharpRepl.Tests/CSharpRepl.Tests.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

@@ -14,13 +14,13 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
18-
<PackageReference Include="NSubstitute" Version="5.1.0" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
18+
<PackageReference Include="NSubstitute" Version="5.3.0" />
1919
<PackageReference Include="PrettyPrompt" Version="4.1.1" />
2020
<PackageReference Include="Spectre.Console.Testing" Version="0.49.1" />
21-
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="21.0.2" />
22-
<PackageReference Include="xunit" Version="2.8.1" />
23-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
21+
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="21.1.3" />
22+
<PackageReference Include="xunit" Version="2.9.2" />
23+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
2424
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2525
<PrivateAssets>all</PrivateAssets>
2626
</PackageReference>

‎CSharpRepl/CSharpRepl.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Version>0.6.7</Version>
55
<OutputType>Exe</OutputType>
6-
<TargetFramework>net8.0</TargetFramework>
6+
<TargetFramework>net9.0</TargetFramework>
77
<RollForward>LatestMajor</RollForward>
88
<LangVersion>latest</LangVersion>
99
<Nullable>enable</Nullable>
@@ -27,7 +27,7 @@
2727
<ItemGroup>
2828
<PackageReference Include="PrettyPrompt" Version="4.1.1" />
2929
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
30-
<PackageReference Include="System.Reflection.MetadataLoadContext" Version="8.0.0" />
30+
<PackageReference Include="System.Reflection.MetadataLoadContext" Version="9.0.0" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ C# REPL provides the following features:
2626

2727
## Installation
2828

29-
C# REPL is a .NET 8 global tool, and runs on Windows, Mac OS, and Linux. It can be installed [from NuGet](https://www.nuget.org/packages/CSharpRepl) via:
29+
C# REPL is a .NET 9 global tool, and runs on Windows, Mac OS, and Linux. It can be installed [from NuGet](https://www.nuget.org/packages/CSharpRepl) via:
3030

3131
```console
3232
dotnet tool install -g csharprepl

0 commit comments

Comments
 (0)