From 18f4f6bd3e2236e0abfe3f83b8df5c61357ccac4 Mon Sep 17 00:00:00 2001 From: MaceWindu Date: Sun, 10 Mar 2024 16:46:59 +0100 Subject: [PATCH] Resolve dependency issues in 5.2.0 release (#109) * resolve dependency issues in LINQPad 5 version * update release notes --- .editorconfig | 6 ++++ Build/{Pack.bat => Pack.cmd} | 0 Build/azure-pipelines.yml | 8 +++--- Directory.Packages.props | 7 +++-- Source/Compat/StringBuilderExtensions.cs | 35 ++++++++++++------------ Source/Drivers/DynamicSchemaGenerator.cs | 1 + Source/linq2db.LINQPad.csproj | 14 ++++++---- linq2db.LINQPad.sln | 2 +- release-notes.md | 6 ++++ 9 files changed, 48 insertions(+), 31 deletions(-) rename Build/{Pack.bat => Pack.cmd} (100%) diff --git a/.editorconfig b/.editorconfig index 8c30844..532ff05 100644 --- a/.editorconfig +++ b/.editorconfig @@ -261,7 +261,13 @@ dotnet_diagnostic.MA0041.severity = none dotnet_diagnostic.MA0048.severity = none # MA0051: Method is too long dotnet_diagnostic.MA0051.severity = none +# MA0053: Make class sealed +dotnet_diagnostic.MA0053.severity = none +# MA0101: String contains an implicit end of line character +dotnet_diagnostic.MA0101.severity = none # MA0111: Use string.Create instead of FormattableString dotnet_diagnostic.MA0111.severity = none # MA0144: Use System.OperatingSystem to check the current OS dotnet_diagnostic.MA0144.severity = none +# MA0154: Use langword in XML comment +dotnet_diagnostic.MA0154.severity = none diff --git a/Build/Pack.bat b/Build/Pack.cmd similarity index 100% rename from Build/Pack.bat rename to Build/Pack.cmd diff --git a/Build/azure-pipelines.yml b/Build/azure-pipelines.yml index ac51edc..9e6fe1f 100644 --- a/Build/azure-pipelines.yml +++ b/Build/azure-pipelines.yml @@ -1,10 +1,10 @@ variables: solution: 'linq2db.LINQPad.sln' build_configuration: 'Release' - assemblyVersion: 5.2.0.0 - nugetVersion: 5.2.0 - nugetDevVersion: 5.2.1 - nugetPRVersion: 5.2.1 + assemblyVersion: 5.2.1.0 + nugetVersion: 5.2.1 + nugetDevVersion: 5.2.2 + nugetPRVersion: 5.2.2 artifact_lpx: 'lpx' artifact_lpx6: 'lpx6' artifact_nuget: 'nuget' diff --git a/Directory.Packages.props b/Directory.Packages.props index ba9076b..14c245a 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -7,7 +7,7 @@ - + @@ -18,8 +18,9 @@ - - + + + diff --git a/Source/Compat/StringBuilderExtensions.cs b/Source/Compat/StringBuilderExtensions.cs index 892af54..9bd4583 100644 --- a/Source/Compat/StringBuilderExtensions.cs +++ b/Source/Compat/StringBuilderExtensions.cs @@ -1,25 +1,24 @@ #if NETFRAMEWORK -namespace System.Text +namespace System.Text; + +internal static class StringBuilderExtensions { - internal static class StringBuilderExtensions + public static StringBuilder Append( + this StringBuilder sb, + IFormatProvider? provider, + FormattableString formattableString) { - public static StringBuilder Append( - this StringBuilder sb, - IFormatProvider? provider, - FormattableString formattableString) - { - sb.Append(formattableString.ToString(provider)); - return sb; - } + sb.Append(formattableString.ToString(provider)); + return sb; + } - public static StringBuilder AppendLine( - this StringBuilder sb, - IFormatProvider? provider, - FormattableString formattableString) - { - sb.AppendLine(formattableString.ToString(provider)); - return sb; - } + public static StringBuilder AppendLine( + this StringBuilder sb, + IFormatProvider? provider, + FormattableString formattableString) + { + sb.AppendLine(formattableString.ToString(provider)); + return sb; } } #endif diff --git a/Source/Drivers/DynamicSchemaGenerator.cs b/Source/Drivers/DynamicSchemaGenerator.cs index 61342d8..6345f96 100644 --- a/Source/Drivers/DynamicSchemaGenerator.cs +++ b/Source/Drivers/DynamicSchemaGenerator.cs @@ -185,3 +185,4 @@ public static (List items, string sourceCode, string providerAssem return (interceptor.GetTree(), sourceCode, providerAssemblyLocation); } } + diff --git a/Source/linq2db.LINQPad.csproj b/Source/linq2db.LINQPad.csproj index 4700fd9..3519bdb 100644 --- a/Source/linq2db.LINQPad.csproj +++ b/Source/linq2db.LINQPad.csproj @@ -6,7 +6,7 @@ linq2db linq2db.LINQPad $(Product) - 5.2.0.0 + 5.2.1.0 $(Version) $(Version) Copyright © 2016-2024 Linq To DB Team @@ -42,6 +42,10 @@ true + + $(MSBuildWarningsAsMessages);MSB3277 + + @@ -76,8 +80,8 @@ - - + + @@ -134,11 +138,11 @@ - + - + diff --git a/linq2db.LINQPad.sln b/linq2db.LINQPad.sln index 66ee495..96725e1 100644 --- a/linq2db.LINQPad.sln +++ b/linq2db.LINQPad.sln @@ -26,8 +26,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{A26F7937 Build\icon64.png = Build\icon64.png Build\linq2db.LINQPad.nuspec = Build\linq2db.LINQPad.nuspec Build\nuget-vars.yml = Build\nuget-vars.yml - Build\Pack.bat = Build\Pack.bat Build\README.md = Build\README.md + Build\Pack.cmd = Build\Pack.cmd Build\SetVersion.ps1 = Build\SetVersion.ps1 EndProjectSection EndProject diff --git a/release-notes.md b/release-notes.md index 5fb748b..60b0675 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,3 +1,9 @@ +# Release 5.2.1 + +Issues fixed: + +- [#109](https://github.com/linq2db/linq2db.LINQPad/pull/109): fix dependency issues in 5.2.0 release + # Release 5.2.0 Issues fixed: