diff --git a/Directory.Build.props b/Directory.Build.props index 70230267..2caaf32a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,29 +2,28 @@ $(MSBuildThisFileDirectory) net7.0 - net6.0 + net7.0 true $(LtsTargetFramework)-windows $(DefaultTargetFramework) strict True True - 4.7.0-1.final - 18.0.0 + 4.7.0 + 19.0.0 latest Enable false Eli Arbel https://roslynpad.net https://github.com/roslynpad/roslynpad - Apache-2.0 + MIT Roslyn;RoslynPad RoslynPad.png true true snupkg true - true true true diff --git a/Directory.Packages.props b/Directory.Packages.props index 89759383..6749ac79 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,20 +5,20 @@ 7.0.0 - 4.7.0-2.final - 4.7.0-2.23280.4 - 11.0.0 + 4.7.0 + 4.7.0-3.23416.9 + 11.0.4 6.0.0 6.6.1 - + - + - + @@ -50,4 +50,4 @@ - \ No newline at end of file + diff --git a/global.json b/global.json index 2778740d..073273b7 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.306" + "version": "7.0.400" }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.4.0" diff --git a/src/RestoreHelper/RestoreHelper.csproj b/src/RestoreHelper/RestoreHelper.csproj index da907cca..c47711f6 100644 --- a/src/RestoreHelper/RestoreHelper.csproj +++ b/src/RestoreHelper/RestoreHelper.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/RoslynPad.Roslyn/BraceMatching/AbstractDirectiveTriviaBraceMatcher.cs b/src/RoslynPad.Roslyn/BraceMatching/AbstractDirectiveTriviaBraceMatcher.cs index 776616ab..6c80fb1d 100644 --- a/src/RoslynPad.Roslyn/BraceMatching/AbstractDirectiveTriviaBraceMatcher.cs +++ b/src/RoslynPad.Roslyn/BraceMatching/AbstractDirectiveTriviaBraceMatcher.cs @@ -18,7 +18,7 @@ internal abstract class AbstractDirectiveTriviaBraceMatcher GetMatchingConditionalDirectives(TDirectiveTriviaSyntax directive, CancellationToken cancellationToken); - internal abstract TDirectiveTriviaSyntax GetMatchingDirective(TDirectiveTriviaSyntax directive, CancellationToken cancellationToken); + internal abstract TDirectiveTriviaSyntax? GetMatchingDirective(TDirectiveTriviaSyntax directive, CancellationToken cancellationToken); internal abstract TextSpan GetSpanForTagging(TDirectiveTriviaSyntax directive); public async Task FindBracesAsync(Document document, int position, CancellationToken cancellationToken) diff --git a/src/RoslynPad.Roslyn/BraceMatching/CSharpDirectiveTriviaBraceMatcher.cs b/src/RoslynPad.Roslyn/BraceMatching/CSharpDirectiveTriviaBraceMatcher.cs index 32c0bbdc..621d5bf0 100644 --- a/src/RoslynPad.Roslyn/BraceMatching/CSharpDirectiveTriviaBraceMatcher.cs +++ b/src/RoslynPad.Roslyn/BraceMatching/CSharpDirectiveTriviaBraceMatcher.cs @@ -14,9 +14,9 @@ namespace RoslynPad.Roslyn.BraceMatching; internal class CSharpDirectiveTriviaBraceMatcher : AbstractDirectiveTriviaBraceMatcher { internal override List GetMatchingConditionalDirectives(DirectiveTriviaSyntax directive, CancellationToken cancellationToken) - => directive.GetMatchingConditionalDirectives(cancellationToken)?.ToList()!; + => directive.GetMatchingConditionalDirectives(cancellationToken).ToList(); - internal override DirectiveTriviaSyntax GetMatchingDirective(DirectiveTriviaSyntax directive, CancellationToken cancellationToken) + internal override DirectiveTriviaSyntax? GetMatchingDirective(DirectiveTriviaSyntax directive, CancellationToken cancellationToken) => directive.GetMatchingDirective(cancellationToken); internal override TextSpan GetSpanForTagging(DirectiveTriviaSyntax directive) diff --git a/src/RoslynPad.Roslyn/Diagnostics/NullDiagnosticsRefresher.cs b/src/RoslynPad.Roslyn/Diagnostics/NullDiagnosticsRefresher.cs new file mode 100644 index 00000000..76b9bedc --- /dev/null +++ b/src/RoslynPad.Roslyn/Diagnostics/NullDiagnosticsRefresher.cs @@ -0,0 +1,14 @@ +using System.Composition; +using Microsoft.CodeAnalysis.Diagnostics; + +namespace RoslynPad.Roslyn.Diagnostics; + +[Export(typeof(IDiagnosticsRefresher))] +internal class NullDiagnosticsRefresher : IDiagnosticsRefresher +{ + public int GlobalStateVersion { get; } + + public void RequestWorkspaceRefresh() + { + } +} diff --git a/src/RoslynPad.Runtime/RoslynPad.Runtime.csproj b/src/RoslynPad.Runtime/RoslynPad.Runtime.csproj index 764a75d8..89ad7569 100644 --- a/src/RoslynPad.Runtime/RoslynPad.Runtime.csproj +++ b/src/RoslynPad.Runtime/RoslynPad.Runtime.csproj @@ -1,6 +1,7 @@  - $(LtsTargetFramework);$(DefaultTargetFramework);netstandard2.0 + $(DefaultTargetFramework);netstandard2.0 + $(LtsTargetFramework);$(DefaultTargetFramework);netstandard2.0 true $(NoWarn);1591