update to net8

ellizio · Mar 15, 2024 · 1a780ca · 1a780ca
1 parent 742a573
commit 1a780ca
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 139 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   Build:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
         with:
@@ -24,7 +24,7 @@ jobs:
           name: ${{ github.event.repository.name }}.CI.${{ github.ref_name }}
           path: output
   Test:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
         with:

diff --git a/.idea/.idea.ReSharperPlugin.ODataCliUi/.idea/.name b/.idea/.idea.ReSharperPlugin.ODataCliUi/.idea/.name
diff --git a/.idea/.idea.ReSharperPlugin.ODataCliUi/.idea/runConfigurations/VisualStudio.xml b/.idea/.idea.ReSharperPlugin.ODataCliUi/.idea/runConfigurations/VisualStudio.xml
diff --git a/.idea/.name b/.idea/.name
diff --git a/ReSharperPlugin.ODataCliUi.sln b/ReSharperPlugin.ODataCliUi.sln
@@ -1,7 +1,5 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReSharperPlugin.ODataCliUi", "src\dotnet\ReSharperPlugin.ODataCliUi\ReSharperPlugin.ODataCliUi.csproj", "{05608FE6-4FD1-4E9D-9BE2-B13A0E370BA2}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReSharperPlugin.ODataCliUi.Rider", "src\dotnet\ReSharperPlugin.ODataCliUi\ReSharperPlugin.ODataCliUi.Rider.csproj", "{084172D1-A9C6-46D0-96AD-05C5B09A5E5D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReSharperPlugin.ODataCliUi.Tests", "src\dotnet\ReSharperPlugin.ODataCliUi.Tests\ReSharperPlugin.ODataCliUi.Tests.csproj", "{01C3DEF5-50B2-47CB-9467-19BC6DDF9D3D}"
@@ -21,10 +19,6 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{05608FE6-4FD1-4E9D-9BE2-B13A0E370BA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{05608FE6-4FD1-4E9D-9BE2-B13A0E370BA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{05608FE6-4FD1-4E9D-9BE2-B13A0E370BA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{05608FE6-4FD1-4E9D-9BE2-B13A0E370BA2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{084172D1-A9C6-46D0-96AD-05C5B09A5E5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{084172D1-A9C6-46D0-96AD-05C5B09A5E5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{084172D1-A9C6-46D0-96AD-05C5B09A5E5D}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id 'java'
     id 'org.jetbrains.kotlin.jvm' version '1.8.10'
     id 'org.jetbrains.intellij' version '1.13.3'     // See https://github.com/JetBrains/gradle-intellij-plugin/releases
-    id 'com.jetbrains.rdgen' version '2023.1.2'      // See https://github.com/JetBrains/rd/releases
+    id 'com.jetbrains.rdgen' version '2023.1.0'      // See https://github.com/JetBrains/rd/releases
     id 'me.filippov.gradle.jvm.wrapper' version '0.14.0'
 }
 

diff --git a/dependencies.json b/dependencies.json
diff --git a/runVisualStudio.ps1 b/runVisualStudio.ps1
diff --git a/src/dotnet/ReSharperPlugin.ODataCliUi.Tests/ReSharperPlugin.ODataCliUi.Tests.csproj b/src/dotnet/ReSharperPlugin.ODataCliUi.Tests/ReSharperPlugin.ODataCliUi.Tests.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ReSharperPlugin.ODataCliUi\ReSharperPlugin.ODataCliUi.csproj" />
+    <ProjectReference Include="..\ReSharperPlugin.ODataCliUi\ReSharperPlugin.ODataCliUi.Rider.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/dotnet/ReSharperPlugin.ODataCliUi/ReSharperPlugin.ODataCliUi.Rider.csproj b/src/dotnet/ReSharperPlugin.ODataCliUi/ReSharperPlugin.ODataCliUi.Rider.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>ReSharperPlugin.ODataCliUi</AssemblyName>
     <RootNamespace>$(AssemblyName)</RootNamespace>
     <IsPackable>false</IsPackable>
@@ -10,6 +10,10 @@
 
   <ItemGroup>
     <PackageReference Include="JetBrains.Rider.SDK" Version="$(SdkVersion)" />
+    <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
+    <PackageReference Include="System.Reflection" Version="4.3.0" />
+    <PackageReference Include="Microsoft.NETCore.Platforms" Version="5.0.0" />
+    <PackageReference Include="Microsoft.NETCore.Targets" Version="1.1.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/dotnet/ReSharperPlugin.ODataCliUi/ReSharperPlugin.ODataCliUi.csproj b/src/dotnet/ReSharperPlugin.ODataCliUi/ReSharperPlugin.ODataCliUi.csproj