Merge pull request #2528 from digma-ai/update-build-profiles

shalom938 · web-flow · commit 14e010be449c · 2024-09-23T09:56:17.000+03:00
update build profiles
diff --git a/common-build-logic/src/main/kotlin/common/BuildProfile.kt b/common-build-logic/src/main/kotlin/common/BuildProfile.kt
@@ -203,8 +203,8 @@ object BuildProfiles {
 
         Profile.p242 to BuildProfile(
             profile = Profile.p242,
-            platformVersion = "2024.2.1",
-            riderVersion = "2024.2.4",
+            platformVersion = "2024.2.2",
+            riderVersion = "2024.2.5",
             pycharmVersion = "2024.2",
             riderTargetFramework = "net8.0",
             riderResharperVersionConstant = "PROFILE_2023_2",
@@ -219,18 +219,12 @@ object BuildProfiles {
         Profile.p243 to BuildProfile(
             isEAP = true,
             profile = Profile.p243,
-            platformVersion = "243.12818-EAP-CANDIDATE-SNAPSHOT",
-            //todo: rdgen fails with 2024.3-SNAPSHOT
-            // see discussion with forever, probably the issue is rdgen, need to wait for better snapshot.
-            // and use new rdgen 2024.3 which is not released yet, rdgen 2024.3-pre1 didn't work too.
-            // so currently building with 2024.2.4 just to keep this profile usable and build idea for 243,
-            // for rider it may not work because we don't have a way to verify it, just need to install the plugin and test it.
-            // see discussion with forever: https://jetbrains.slack.com/archives/CBZ36NH7C/p1726614964174159
-//            riderVersion = "2024.3-SNAPSHOT",
-            riderVersion = "2024.2.4",
-            pycharmVersion = "2024.2",
+            platformVersion = "243.15521-EAP-CANDIDATE-SNAPSHOT",
+            //todo: Digma.Rider.Tests is disabled because it doesn't compile with 2024.3-EAP1-SNAPSHOT, there is mismatch with jetbrains packages try to build it with next snapshots.
+            riderVersion = "2024.3-EAP1-SNAPSHOT",
+            pycharmVersion = "243-EAP-SNAPSHOT",
             riderTargetFramework = "net8.0",
-            riderResharperVersionConstant = "PROFILE_2023_2",
+            riderResharperVersionConstant = "PROFILE_2023_2;PROFILE_2024_3",
             platformVersionCode = "243",
             pluginSinceBuild = "243",
             pluginUntilBuild = "243.*",
diff --git a/common-build-logic/src/main/kotlin/common/rider/RiderCommon.kt b/common-build-logic/src/main/kotlin/common/rider/RiderCommon.kt
@@ -24,8 +24,8 @@ fun rdGenVersionByProfile(profile: BuildProfiles.Profile): String {
         BuildProfiles.Profile.p233 -> "2023.3.2"
         BuildProfiles.Profile.p241 -> "2023.3.2"
         BuildProfiles.Profile.p242 -> "2024.1.1"
-        //todo: for rider 2024.3 need a new rdgen, 2024.3
-        // see comment in 243 profile
-        BuildProfiles.Profile.p243 -> "2024.1.1"
+        //todo: for rider 2024.3 needs a new rdgen, 2024.3
+        // update the version when new one comes out
+        BuildProfiles.Profile.p243 -> "2024.3-pre2"
     }
 }
diff --git a/rider/Digma.Rider.Plugin/Digma.Rider.Plugin.sln b/rider/Digma.Rider.Plugin/Digma.Rider.Plugin.sln
@@ -2,8 +2,9 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Digma.Rider", "Digma.Rider\Digma.Rider.csproj", "{3CF7B92B-8AE6-482B-80CF-30D260710C94}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Digma.Rider.Tests", "Digma.Rider.Tests\Digma.Rider.Tests.csproj", "{A200887A-A5D9-46D0-B8D0-BF0C8996A2AE}"
-EndProject
+## TODO: Digma.Rider.Tests is disabled because it doesn't compile with 2024.3-EAP1-SNAPSHOT, there is mismatch with jetbrains packages try to build it with next snapshots.
+##Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Digma.Rider.Tests", "Digma.Rider.Tests\Digma.Rider.Tests.csproj", "{A200887A-A5D9-46D0-B8D0-BF0C8996A2AE}"
+##EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
diff --git a/rider/Digma.Rider.Plugin/Digma.Rider/Discovery/CodeObjectsCache.cs b/rider/Digma.Rider.Plugin/Digma.Rider/Discovery/CodeObjectsCache.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using Digma.Rider.Protocol;
 using Digma.Rider.Util;
+using JetBrains.Application.Parts;
 using JetBrains.Application.Progress;
 using JetBrains.Application.Threading;
 using JetBrains.Collections;
@@ -32,7 +33,11 @@ namespace Digma.Rider.Discovery
     /// on various events.
     /// 
     /// </summary>
+#if (PROFILE_2024_3)
+    [PsiComponent(Instantiation.ContainerAsyncPrimaryThread)]
+#else
     [PsiComponent]
+#endif
     public class CodeObjectsCache: SimpleICache<RiderDocumentInfo>
     {
         private readonly ILogger _logger;
diff --git a/rider/Digma.Rider.Plugin/Digma.Rider/Highlighting/CodeLensMethodInsightsProvider1.cs b/rider/Digma.Rider.Plugin/Digma.Rider/Highlighting/CodeLensMethodInsightsProvider1.cs
@@ -1,10 +1,16 @@
 using Digma.Rider.Protocol;
+using JetBrains.Application.Parts;
 using JetBrains.ProjectModel;
 using JetBrains.Util;
 
 namespace Digma.Rider.Highlighting
 {
+#if (PROFILE_2024_3)
+    [SolutionComponent(Instantiation.ContainerAsyncPrimaryThread)]
+#else
     [SolutionComponent]
+#endif    
+    
     public class CodeLensMethodInsightsProvider1 : BaseMethodInsightsProvider
     {
         public CodeLensMethodInsightsProvider1(
diff --git a/rider/Digma.Rider.Plugin/Digma.Rider/Highlighting/CodeLensMethodInsightsProvider2.cs b/rider/Digma.Rider.Plugin/Digma.Rider/Highlighting/CodeLensMethodInsightsProvider2.cs
@@ -1,10 +1,16 @@
 using Digma.Rider.Protocol;
+using JetBrains.Application.Parts;
 using JetBrains.ProjectModel;
 using JetBrains.Util;
 
 namespace Digma.Rider.Highlighting
 {
+#if (PROFILE_2024_3)
+    [SolutionComponent(Instantiation.ContainerAsyncPrimaryThread)]
+#else
     [SolutionComponent]
+#endif    
+
     public class CodeLensMethodInsightsProvider2 : BaseMethodInsightsProvider
     {
         public CodeLensMethodInsightsProvider2(
diff --git a/rider/Digma.Rider.Plugin/Digma.Rider/Highlighting/CodeLensMethodInsightsProvider3.cs b/rider/Digma.Rider.Plugin/Digma.Rider/Highlighting/CodeLensMethodInsightsProvider3.cs
@@ -1,10 +1,16 @@
 using Digma.Rider.Protocol;
+using JetBrains.Application.Parts;
 using JetBrains.ProjectModel;
 using JetBrains.Util;
 
 namespace Digma.Rider.Highlighting
 {
+#if (PROFILE_2024_3)
+    [SolutionComponent(Instantiation.ContainerAsyncPrimaryThread)]
+#else
     [SolutionComponent]
+#endif    
+
     public class CodeLensMethodInsightsProvider3 : BaseMethodInsightsProvider
     {
         public CodeLensMethodInsightsProvider3(
diff --git a/rider/Digma.Rider.Plugin/Digma.Rider/Highlighting/CodeLensMethodInsightsProvider4.cs b/rider/Digma.Rider.Plugin/Digma.Rider/Highlighting/CodeLensMethodInsightsProvider4.cs
@@ -1,10 +1,16 @@
 using Digma.Rider.Protocol;
+using JetBrains.Application.Parts;
 using JetBrains.ProjectModel;
 using JetBrains.Util;
 
 namespace Digma.Rider.Highlighting
 {
+#if (PROFILE_2024_3)
+    [SolutionComponent(Instantiation.ContainerAsyncPrimaryThread)]
+#else
     [SolutionComponent]
+#endif    
+
     public class CodeLensMethodInsightsProvider4 : BaseMethodInsightsProvider
     {
         public CodeLensMethodInsightsProvider4(
diff --git a/rider/Digma.Rider.Plugin/Digma.Rider/Highlighting/CodeLensMethodInsightsProvider5.cs b/rider/Digma.Rider.Plugin/Digma.Rider/Highlighting/CodeLensMethodInsightsProvider5.cs
@@ -1,10 +1,16 @@
 using Digma.Rider.Protocol;
+using JetBrains.Application.Parts;
 using JetBrains.ProjectModel;
 using JetBrains.Util;
 
 namespace Digma.Rider.Highlighting
 {
+#if (PROFILE_2024_3)
+    [SolutionComponent(Instantiation.ContainerAsyncPrimaryThread)]
+#else
     [SolutionComponent]
+#endif    
+
     public class CodeLensMethodInsightsProvider5 : BaseMethodInsightsProvider
     {
         public CodeLensMethodInsightsProvider5(
diff --git a/rider/Digma.Rider.Plugin/Digma.Rider/Highlighting/CodeLensProviderFactory.cs b/rider/Digma.Rider.Plugin/Digma.Rider/Highlighting/CodeLensProviderFactory.cs
@@ -1,10 +1,16 @@
 using System.Collections.Generic;
 using System.Linq;
+using JetBrains.Application.Parts;
 using JetBrains.ProjectModel;
 
 namespace Digma.Rider.Highlighting
 {
+#if (PROFILE_2024_3)
+    [SolutionComponent(Instantiation.ContainerAsyncPrimaryThread)]
+#else
     [SolutionComponent]
+#endif    
+
     public class CodeLensProviderFactory
     {
         private readonly LiveMethodInsightsProvider _liveMethodInsightsProvider;
diff --git a/rider/Digma.Rider.Plugin/Digma.Rider/Highlighting/DaemonReanalyze.cs b/rider/Digma.Rider.Plugin/Digma.Rider/Highlighting/DaemonReanalyze.cs
@@ -1,5 +1,6 @@
 using Digma.Rider.Protocol;
 using Digma.Rider.Util;
+using JetBrains.Application.Parts;
 using JetBrains.Lifetimes;
 using JetBrains.Platform.RdFramework.Impl;
 using JetBrains.ProjectModel;
@@ -16,7 +17,12 @@
 
 namespace Digma.Rider.Highlighting
 {
+#if (PROFILE_2024_3)
+    [SolutionComponent(Instantiation.ContainerAsyncPrimaryThread)]
+#else
     [SolutionComponent]
+#endif    
+
     public class DaemonReanalyze
     {
         public DaemonReanalyze(Lifetime lifetime, ISolution solution,
diff --git a/rider/Digma.Rider.Plugin/Digma.Rider/Highlighting/ErrorHotspotMethodInsightsProvider.cs b/rider/Digma.Rider.Plugin/Digma.Rider/Highlighting/ErrorHotspotMethodInsightsProvider.cs
@@ -1,10 +1,16 @@
 using Digma.Rider.Protocol;
+using JetBrains.Application.Parts;
 using JetBrains.ProjectModel;
 using JetBrains.Util;
 
 namespace Digma.Rider.Highlighting
 {
+#if (PROFILE_2024_3)
+    [SolutionComponent(Instantiation.ContainerAsyncPrimaryThread)]
+#else
     [SolutionComponent]
+#endif    
+
     public class ErrorHotspotMethodInsightsProvider : BaseMethodInsightsProvider
     {
         public ErrorHotspotMethodInsightsProvider(ISolution solution,ILogger logger,ShowToolWindowHost showToolWindowHost) 
diff --git a/rider/Digma.Rider.Plugin/Digma.Rider/Highlighting/LiveMethodInsightsProvider.cs b/rider/Digma.Rider.Plugin/Digma.Rider/Highlighting/LiveMethodInsightsProvider.cs
@@ -1,12 +1,18 @@
 using System.Collections.Generic;
 using Digma.Rider.Protocol;
+using JetBrains.Application.Parts;
 using JetBrains.ProjectModel;
 using JetBrains.Rider.Model;
 using JetBrains.Util;
 
 namespace Digma.Rider.Highlighting
 {
+#if (PROFILE_2024_3)
+    [SolutionComponent(Instantiation.ContainerAsyncPrimaryThread)]
+#else
     [SolutionComponent]
+#endif    
+
     public class LiveMethodInsightsProvider : BaseMethodInsightsProvider
     {
         public LiveMethodInsightsProvider(ISolution solution,ILogger logger,ShowToolWindowHost showToolWindowHost) 
diff --git a/rider/Digma.Rider.Plugin/Digma.Rider/Highlighting/ScaleFactorMethodInsightsProvider.cs b/rider/Digma.Rider.Plugin/Digma.Rider/Highlighting/ScaleFactorMethodInsightsProvider.cs
@@ -1,10 +1,16 @@
 using Digma.Rider.Protocol;
+using JetBrains.Application.Parts;
 using JetBrains.ProjectModel;
 using JetBrains.Util;
 
 namespace Digma.Rider.Highlighting
 {
+#if (PROFILE_2024_3)
+    [SolutionComponent(Instantiation.ContainerAsyncPrimaryThread)]
+#else
     [SolutionComponent]
+#endif    
+
     public class ScaleFactorMethodInsightsProvider : BaseMethodInsightsProvider
     {
         public ScaleFactorMethodInsightsProvider(ISolution solution,ILogger logger,ShowToolWindowHost showToolWindowHost) 
diff --git a/rider/Digma.Rider.Plugin/Digma.Rider/Highlighting/SlowEndpointMethodInsightsProvider.cs b/rider/Digma.Rider.Plugin/Digma.Rider/Highlighting/SlowEndpointMethodInsightsProvider.cs
@@ -1,10 +1,16 @@
 using Digma.Rider.Protocol;
+using JetBrains.Application.Parts;
 using JetBrains.ProjectModel;
 using JetBrains.Util;
 
 namespace Digma.Rider.Highlighting
 {
+#if (PROFILE_2024_3)
+    [SolutionComponent(Instantiation.ContainerAsyncPrimaryThread)]
+#else
     [SolutionComponent]
+#endif    
+
     public class SlowEndpointMethodInsightsProvider : BaseMethodInsightsProvider
     {
         public SlowEndpointMethodInsightsProvider(ISolution solution,ILogger logger,ShowToolWindowHost showToolWindowHost) 
diff --git a/rider/Digma.Rider.Plugin/Digma.Rider/Highlighting/UsageMethodInsightsProvider.cs b/rider/Digma.Rider.Plugin/Digma.Rider/Highlighting/UsageMethodInsightsProvider.cs
@@ -1,12 +1,18 @@
 using System.Collections.Generic;
 using Digma.Rider.Protocol;
+using JetBrains.Application.Parts;
 using JetBrains.ProjectModel;
 using JetBrains.Rider.Model;
 using JetBrains.Util;
 
 namespace Digma.Rider.Highlighting
 {
+#if (PROFILE_2024_3)
+    [SolutionComponent(Instantiation.ContainerAsyncPrimaryThread)]
+#else
     [SolutionComponent]
+#endif    
+
     public class UsageMethodInsightsProvider : BaseMethodInsightsProvider
     {
         public UsageMethodInsightsProvider(ISolution solution,ILogger logger,ShowToolWindowHost showToolWindowHost)
diff --git a/rider/Digma.Rider.Plugin/Digma.Rider/Protocol/LanguageServiceHost.cs b/rider/Digma.Rider.Plugin/Digma.Rider/Protocol/LanguageServiceHost.cs
@@ -3,6 +3,7 @@
 using Digma.Rider.Discovery;
 using Digma.Rider.Util;
 using JetBrains.Annotations;
+using JetBrains.Application.Parts;
 using JetBrains.Lifetimes;
 using JetBrains.ProjectModel;
 using JetBrains.Rd.Tasks;
@@ -22,7 +23,12 @@
 
 namespace Digma.Rider.Protocol
 {
+#if (PROFILE_2024_3)
+    [SolutionComponent(Instantiation.ContainerAsyncPrimaryThread)]
+#else
     [SolutionComponent]
+#endif    
+
     public class LanguageServiceHost
     {
         private readonly Lifetime _lifetime;
diff --git a/rider/Digma.Rider.Plugin/Digma.Rider/Protocol/MethodNavigator.cs b/rider/Digma.Rider.Plugin/Digma.Rider/Protocol/MethodNavigator.cs
@@ -1,6 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Digma.Rider.Discovery;
 using JetBrains.Annotations;
+using JetBrains.Application.Parts;
 using JetBrains.DocumentManagers;
 using JetBrains.ProjectModel;
 using JetBrains.ReSharper.Feature.Services.CSharp.CompleteStatement;
@@ -20,7 +21,12 @@
 
 namespace Digma.Rider.Protocol
 {
+#if (PROFILE_2024_3)
+    [SolutionComponent(Instantiation.ContainerAsyncPrimaryThread)]
+#else
     [SolutionComponent]
+#endif    
+
     public class MethodNavigator
     {
         private readonly ITextControlManager _textControlManager;
diff --git a/rider/Digma.Rider.Plugin/Digma.Rider/Protocol/MethodUnderCaretDetector.cs b/rider/Digma.Rider.Plugin/Digma.Rider/Protocol/MethodUnderCaretDetector.cs
@@ -1,6 +1,7 @@
 using Digma.Rider.Discovery;
 using Digma.Rider.Util;
 using JetBrains.Annotations;
+using JetBrains.Application.Parts;
 using JetBrains.DocumentManagers;
 using JetBrains.DocumentManagers.Transactions;
 using JetBrains.Lifetimes;
@@ -18,7 +19,12 @@ namespace Digma.Rider.Protocol
 {
     
     
+#if (PROFILE_2024_3)
+    [SolutionComponent(Instantiation.ContainerAsyncPrimaryThread)]
+#else
     [SolutionComponent]
+#endif    
+
     public class MethodUnderCaretDetector
     {
         private readonly Lifetime _lifetime;
diff --git a/rider/Digma.Rider.Plugin/Digma.Rider/Protocol/ShowToolWindowHost.cs b/rider/Digma.Rider.Plugin/Digma.Rider/Protocol/ShowToolWindowHost.cs
@@ -1,3 +1,4 @@
+using JetBrains.Application.Parts;
 using JetBrains.ProjectModel;
 using JetBrains.Util;
 using static Digma.Rider.Logging.Logger;
@@ -10,7 +11,12 @@
 
 namespace Digma.Rider.Protocol
 {
+#if (PROFILE_2024_3)
+    [SolutionComponent(Instantiation.ContainerAsyncPrimaryThread)]
+#else
     [SolutionComponent]
+#endif    
+
     public class ShowToolWindowHost
     {
         private readonly ILogger _logger;

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ fun rdGenVersionByProfile(profile: BuildProfiles.Profile): String {`
`24`	`24`	`BuildProfiles.Profile.p233 -> "2023.3.2"`
`25`	`25`	`BuildProfiles.Profile.p241 -> "2023.3.2"`
`26`	`26`	`BuildProfiles.Profile.p242 -> "2024.1.1"`
`27`		`- //todo: for rider 2024.3 need a new rdgen, 2024.3`
`28`		`- // see comment in 243 profile`
`29`		`- BuildProfiles.Profile.p243 -> "2024.1.1"`
	`27`	`+ //todo: for rider 2024.3 needs a new rdgen, 2024.3`
	`28`	`+ // update the version when new one comes out`
	`29`	`+ BuildProfiles.Profile.p243 -> "2024.3-pre2"`
`30`	`30`	`}`
`31`	`31`	`}`