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.
olsh · Jan 19, 2024 · 493571b · 493571b
1 parent 5ff8a40
commit 493571b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -9,5 +9,5 @@ dotnet_separate_import_directive_groups = true
 dotnet_sort_system_directives_first = true
 indent_size = 4
 
-[{*.csproj,*.json,*.yml,*.xml,*.props,*.nuspec}]
+[{*.csproj,*.json,*.yml,*.xml,*.props,*.nuspec,*.config}]
 indent_size = 2
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
 
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <SdkVersion>2023.2.0</SdkVersion>
+    <SdkVersion>2023.3.2</SdkVersion>
   </PropertyGroup>
   <!-- https://jetbrains.slack.com/archives/CBZ36NH7C/p1628090127002200 -->
   <PropertyGroup>

diff --git a/src/ReSharper.Structured.Logging/Caching/TemplateParameterNameAttributeProvider.cs b/src/ReSharper.Structured.Logging/Caching/TemplateParameterNameAttributeProvider.cs
@@ -10,6 +10,8 @@ namespace ReSharper.Structured.Logging.Caching
     [CodeAnnotationProvider]
     public class TemplateParameterNameAttributeProvider : CodeAnnotationInfoProvider<ITypeMember, string>
     {
+        private const string MessageTemplateFormatMethodAttribute = "MessageTemplateFormatMethodAttribute";
+
         public TemplateParameterNameAttributeProvider(
             AttributeInstancesProvider attributeInstancesProvider,
             CodeAnnotationsConfiguration codeAnnotationsConfiguration)
@@ -20,7 +22,7 @@ public TemplateParameterNameAttributeProvider(
         protected override string CalculateInfo(ITypeMember attributesOwner, IEnumerable<IAttributeInstance> attributeInstances)
         {
             var templateFormatAttribute = attributeInstances
-                .FirstOrDefault(a => string.Equals(a.GetAttributeShortName(), "MessageTemplateFormatMethodAttribute", StringComparison.Ordinal));
+                .FirstOrDefault(a => string.Equals(a.GetAttributeShortName(), MessageTemplateFormatMethodAttribute, StringComparison.Ordinal));
 
             if (templateFormatAttribute != null)
             {
@@ -47,5 +49,7 @@ protected override string GetDefaultInfo(ITypeMember attributesOwner)
         {
             return null;
         }
+
+        public override string[] AttributeShortNames { get; } = { MessageTemplateFormatMethodAttribute };
     }
 }
diff --git a/test/src/app.config b/test/src/app.config
@@ -38,6 +38,10 @@
         <assemblyIdentity name="Microsoft.VisualStudio.TestPlatform.ObjectModel" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="6.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+</configuration>