Skip to content

Update to .NET 10 #56

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

Merged
ellizio merged 1 commit into from
Mar 31, 2026
Merged

Update to .NET 10 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/prepare-build-environment/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ runs:
- name: Setup .NET SDK
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
dotnet-version: '10.0.x'
dotnet-quality: 'ga'
2 changes: 1 addition & 1 deletion src/dotnet/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>Latest</LangVersion>
<NoWarn>MSB3277</NoWarn>
<NoPackageAnalysis>true</NoPackageAnalysis>
Expand Down
17 changes: 8 additions & 9 deletions src/dotnet/ReSharperPlugin.ODataCliUi.Tests/TestEnvironment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@

[assembly: Apartment(ApartmentState.STA)]

namespace ReSharperPlugin.ODataCliUi.Tests
{
[ZoneDefinition]
public class ODataCliUiTestEnvironmentZone : ITestsEnvZone, IRequire<PsiFeatureTestZone>, IRequire<IODataCliUiZone> { }
namespace ReSharperPlugin.ODataCliUi.Tests;

[ZoneMarker]
public class ZoneMarker : IRequire<ICodeEditingZone>, IRequire<ILanguageCSharpZone>, IRequire<ODataCliUiTestEnvironmentZone> { }
[ZoneDefinition]
public class ODataCliUiTestEnvironmentZone : ITestsEnvZone, IRequire<PsiFeatureTestZone>, IRequire<IODataCliUiZone>;

[SetUpFixture]
public class ODataCliUiTestsAssembly : ExtensionTestEnvironmentAssembly<ODataCliUiTestEnvironmentZone> { }
}
[ZoneMarker]
public class ZoneMarker : IRequire<ICodeEditingZone>, IRequire<ILanguageCSharpZone>, IRequire<ODataCliUiTestEnvironmentZone>;

[SetUpFixture]
public class ODataCliUiTestsAssembly : ExtensionTestEnvironmentAssembly<ODataCliUiTestEnvironmentZone>;
11 changes: 4 additions & 7 deletions src/dotnet/ReSharperPlugin.ODataCliUi/IODataCliUiZone.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
using JetBrains.ProjectModel;
using JetBrains.ProjectModel.NuGet;

namespace ReSharperPlugin.ODataCliUi
{
[ZoneDefinition]
public interface IODataCliUiZone : IZone,
IRequire<IProjectModelZone>,
IRequire<INuGetZone>;
}
namespace ReSharperPlugin.ODataCliUi;

[ZoneDefinition]
public interface IODataCliUiZone : IZone, IRequire<IProjectModelZone>, IRequire<INuGetZone>;
14 changes: 5 additions & 9 deletions src/dotnet/ReSharperPlugin.ODataCliUi/PluginHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ public PluginHost(ISolution solution, DotnetToolsTracker dotnetToolsTracker)
dotnetToolsTracker.DotnetToolsCacheChanged += OnDotnetToolsCacheChanged;
dotnetToolsTracker.Start();
}


private DotnetToolDefinition GetODataCliTool(Lifetime lifetime, Unit unit) => _odataCliTool;

private Task AddEmbeddedResourceAsync(Lifetime lifetime, EmbeddedResourceDefinition definition)
{
IProject project;
Expand All @@ -41,15 +43,13 @@ private Task AddEmbeddedResourceAsync(Lifetime lifetime, EmbeddedResourceDefinit

if (project is null)
return Task.CompletedTask;

var modifier = new ProjectModifier(project);
modifier.AddEmbeddedResource(definition.Include);

return Task.CompletedTask;
}

private DotnetToolDefinition GetODataCliTool(Lifetime lifetime, Unit unit) => _odataCliTool;

private void OnDotnetToolsCacheChanged(DotNetToolCache cache)
{
var tool = cache.ToolGlobalCache.GetGlobalTool(Constants.MicrosoftODataCliPackageId)?.FirstOrDefault();
Expand All @@ -58,9 +58,5 @@ private void OnDotnetToolsCacheChanged(DotNetToolCache cache)
: new DotnetToolDefinition(true, new DotnetToolVersionDefinition(tool.Version.Major, tool.Version.Minor, tool.Version.Patch));
}

public void Dispose()
{
if (_dotnetToolsTracker is not null)
_dotnetToolsTracker.DotnetToolsCacheChanged -= OnDotnetToolsCacheChanged;
}
public void Dispose() => _dotnetToolsTracker?.DotnetToolsCacheChanged -= OnDotnetToolsCacheChanged;
}
Loading