Skip to content

Commit debfbd0

Browse files
authored
Update SDK to 2024.3 (#114)
* Update attribute attributes and SDK version Added conditional compilation attributes for thread safety in TemplateParameterNameAttributeProvider and MessageTemplateParser. Updated the SDK version in Directory.Build.props to 2024.3.0-eap01 for compatibility. * Change instantiation to DemandAnyThreadUnsafe Updated the CodeAnnotationProvider attribute to use DemandAnyThreadUnsafe instead of DemandAnyThreadSafe. This alteration ensures that thread safety demands are accurately represented in the provider. * Update SDK to EAP-02 * Upgrade SDK to 2024.3.0
1 parent d31d5dc commit debfbd0

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
44
<PropertyGroup>
5-
<SdkVersion>2024.2.0</SdkVersion>
5+
<SdkVersion>2024.3.0</SdkVersion>
66
</PropertyGroup>
77
<!-- https://jetbrains.slack.com/archives/CBZ36NH7C/p1628090127002200 -->
88
<PropertyGroup>

src/ReSharper.Structured.Logging/Caching/TemplateParameterNameAttributeProvider.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,17 @@
22
using System.Collections.Generic;
33
using System.Linq;
44

5+
using JetBrains.Application.Parts;
56
using JetBrains.ReSharper.Psi;
67
using JetBrains.ReSharper.Psi.CodeAnnotations;
78

89
namespace ReSharper.Structured.Logging.Caching;
910

11+
#if RIDER
1012
[CodeAnnotationProvider]
13+
#else
14+
[CodeAnnotationProvider(Instantiation.DemandAnyThreadUnsafe)]
15+
#endif
1116
public class TemplateParameterNameAttributeProvider(
1217
AttributeInstancesProvider attributeInstancesProvider,
1318
CodeAnnotationsConfiguration codeAnnotationsConfiguration)

src/ReSharper.Structured.Logging/Serilog/Parsing/MessageTemplateParser.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
using System.Collections.Generic;
1717
using System.Text;
1818

19+
using JetBrains.Application.Parts;
1920
using JetBrains.ProjectModel;
2021

2122
using ReSharper.Structured.Logging.Serilog.Core;
@@ -27,7 +28,11 @@ namespace ReSharper.Structured.Logging.Serilog.Parsing
2728
/// Parses message template strings into sequences of text or property
2829
/// tokens.
2930
/// </summary>
31+
#if RIDER
3032
[SolutionComponent]
33+
#else
34+
[SolutionComponent(Instantiation.DemandAnyThreadSafe)]
35+
#endif
3136
public class MessageTemplateParser : IMessageTemplateParser
3237
{
3338
/// <summary>

0 commit comments

Comments
 (0)