From f3cf1bbef7f27208db773b62513970854fb249d0 Mon Sep 17 00:00:00 2001 From: Roland Schmitt Date: Fri, 13 Dec 2019 14:13:54 +0100 Subject: [PATCH 1/3] Upgrade SDK to 2019.3.0 --- .../ReSharper.Structured.Logging.Rider.csproj | 4 ++-- .../ReSharper.Structured.Logging.csproj | 4 ++-- test/src/ReSharper.Structured.Logging.Rider.Tests.csproj | 2 +- test/src/ReSharper.Structured.Logging.Tests.csproj | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ReSharper.Structured.Logging/ReSharper.Structured.Logging.Rider.csproj b/src/ReSharper.Structured.Logging/ReSharper.Structured.Logging.Rider.csproj index 6b21cc7..e23cc37 100644 --- a/src/ReSharper.Structured.Logging/ReSharper.Structured.Logging.Rider.csproj +++ b/src/ReSharper.Structured.Logging/ReSharper.Structured.Logging.Rider.csproj @@ -1,7 +1,7 @@  net461 - 2019.2.0 + 2019.3.0 false @@ -10,7 +10,7 @@ ReSharper.Structured.Logging - + bin\$(MSBuildProjectName)\$(Configuration)\ diff --git a/src/ReSharper.Structured.Logging/ReSharper.Structured.Logging.csproj b/src/ReSharper.Structured.Logging/ReSharper.Structured.Logging.csproj index 0bc525f..effe71d 100644 --- a/src/ReSharper.Structured.Logging/ReSharper.Structured.Logging.csproj +++ b/src/ReSharper.Structured.Logging/ReSharper.Structured.Logging.csproj @@ -1,11 +1,11 @@  net461 - 2019.2.0 + 2019.3.0 false - + bin\$(MSBuildProjectName)\$(Configuration)\ diff --git a/test/src/ReSharper.Structured.Logging.Rider.Tests.csproj b/test/src/ReSharper.Structured.Logging.Rider.Tests.csproj index 9aef324..8d5093a 100644 --- a/test/src/ReSharper.Structured.Logging.Rider.Tests.csproj +++ b/test/src/ReSharper.Structured.Logging.Rider.Tests.csproj @@ -4,7 +4,7 @@ false - + diff --git a/test/src/ReSharper.Structured.Logging.Tests.csproj b/test/src/ReSharper.Structured.Logging.Tests.csproj index 80611e5..1ce2062 100644 --- a/test/src/ReSharper.Structured.Logging.Tests.csproj +++ b/test/src/ReSharper.Structured.Logging.Tests.csproj @@ -4,7 +4,7 @@ false - + From e0e83b9a6c5a397af5b518237772a1c98dc756c9 Mon Sep 17 00:00:00 2001 From: Roland Schmitt Date: Fri, 13 Dec 2019 14:43:37 +0100 Subject: [PATCH 2/3] Fix unit tests, sdk had changed some message outputs --- ...erilogIncorrectExceptionPassingDynamicTemplate.cs.gold | 4 ++-- .../SerilogTemplateWithEscapedSymbols.cs.gold | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/data/Analyzers/CorrectExceptionPassing/SerilogIncorrectExceptionPassingDynamicTemplate.cs.gold b/test/data/Analyzers/CorrectExceptionPassing/SerilogIncorrectExceptionPassingDynamicTemplate.cs.gold index fee9fc9..9ccbe18 100644 --- a/test/data/Analyzers/CorrectExceptionPassing/SerilogIncorrectExceptionPassingDynamicTemplate.cs.gold +++ b/test/data/Analyzers/CorrectExceptionPassing/SerilogIncorrectExceptionPassingDynamicTemplate.cs.gold @@ -13,6 +13,6 @@ namespace ConsoleApp } --------------------------------------------------------- -(0): ReSharper String Escape Character 1: -(1): ReSharper String Escape Character 1: +(0): ReSharper C# Escape Character 1: +(1): ReSharper C# Escape Character 1: (2): ReSharper Warning: Exception should be passed to the exception argument diff --git a/test/data/Analyzers/TemplateFormat/SerilogTemplateWithEscapedSymbols.cs.gold b/test/data/Analyzers/TemplateFormat/SerilogTemplateWithEscapedSymbols.cs.gold index 1347a68..39f86dc 100644 --- a/test/data/Analyzers/TemplateFormat/SerilogTemplateWithEscapedSymbols.cs.gold +++ b/test/data/Analyzers/TemplateFormat/SerilogTemplateWithEscapedSymbols.cs.gold @@ -12,9 +12,9 @@ namespace ConsoleApp } --------------------------------------------------------- -(0): ReSharper String Escape Character 1: -(1): ReSharper String Escape Character 2: +(0): ReSharper C# Escape Character 1: +(1): ReSharper C# Escape Character 2: (2): ReSharper Format String Item: -(3): ReSharper String Escape Character 1: -(4): ReSharper String Escape Character 2: +(3): ReSharper C# Escape Character 1: +(4): ReSharper C# Escape Character 2: (5): ReSharper Format String Item: From 82769f9c26512f44eca6aff82750a1294230dd16 Mon Sep 17 00:00:00 2001 From: Roland Schmitt Date: Fri, 13 Dec 2019 19:18:59 +0100 Subject: [PATCH 3/3] Upgrade wave to 193 to allow installation in resharper 2019.3 --- build.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.cake b/build.cake index e9d0c21..e207507 100644 --- a/build.cake +++ b/build.cake @@ -5,7 +5,7 @@ var target = Argument("target", "Default"); var buildConfiguration = Argument("buildConfig", "Debug"); -var waveVersion = Argument("wave", "[192.0]"); +var waveVersion = Argument("wave", "[193.0]"); var host = Argument("Host", "Resharper"); var solutionName = "ReSharper.Structured.Logging";