Skip to content

Commit 493571b

Browse files
authored
Upgrade SDK to 2023.3 (#104)
* Update SDK to 2023.3.0-eap04 * Drop using binding redirects * Revert "Drop using binding redirects" This reverts commit 6fb29bb. * Fix build * Update SdkVersion in Directory.Build.props The SdkVersion has been updated from 2023.3.0-eap04 to 2023.3.2 in Directory.Build.props file. This change will ensure the project uses the latest SDK for building.
1 parent 5ff8a40 commit 493571b

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ dotnet_separate_import_directive_groups = true
99
dotnet_sort_system_directives_first = true
1010
indent_size = 4
1111

12-
[{*.csproj,*.json,*.yml,*.xml,*.props,*.nuspec}]
12+
[{*.csproj,*.json,*.yml,*.xml,*.props,*.nuspec,*.config}]
1313
indent_size = 2

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>2023.2.0</SdkVersion>
5+
<SdkVersion>2023.3.2</SdkVersion>
66
</PropertyGroup>
77
<!-- https://jetbrains.slack.com/archives/CBZ36NH7C/p1628090127002200 -->
88
<PropertyGroup>

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ namespace ReSharper.Structured.Logging.Caching
1010
[CodeAnnotationProvider]
1111
public class TemplateParameterNameAttributeProvider : CodeAnnotationInfoProvider<ITypeMember, string>
1212
{
13+
private const string MessageTemplateFormatMethodAttribute = "MessageTemplateFormatMethodAttribute";
14+
1315
public TemplateParameterNameAttributeProvider(
1416
AttributeInstancesProvider attributeInstancesProvider,
1517
CodeAnnotationsConfiguration codeAnnotationsConfiguration)
@@ -20,7 +22,7 @@ public TemplateParameterNameAttributeProvider(
2022
protected override string CalculateInfo(ITypeMember attributesOwner, IEnumerable<IAttributeInstance> attributeInstances)
2123
{
2224
var templateFormatAttribute = attributeInstances
23-
.FirstOrDefault(a => string.Equals(a.GetAttributeShortName(), "MessageTemplateFormatMethodAttribute", StringComparison.Ordinal));
25+
.FirstOrDefault(a => string.Equals(a.GetAttributeShortName(), MessageTemplateFormatMethodAttribute, StringComparison.Ordinal));
2426

2527
if (templateFormatAttribute != null)
2628
{
@@ -47,5 +49,7 @@ protected override string GetDefaultInfo(ITypeMember attributesOwner)
4749
{
4850
return null;
4951
}
52+
53+
public override string[] AttributeShortNames { get; } = { MessageTemplateFormatMethodAttribute };
5054
}
5155
}

test/src/app.config

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@
3838
<assemblyIdentity name="Microsoft.VisualStudio.TestPlatform.ObjectModel" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
3939
<bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
4040
</dependentAssembly>
41+
<dependentAssembly>
42+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
43+
<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="6.0.0.0" />
44+
</dependentAssembly>
4145
</assemblyBinding>
4246
</runtime>
43-
</configuration>
47+
</configuration>

0 commit comments

Comments
 (0)