Resolve dependency issues in 5.2.0 release (#109)

* resolve dependency issues in LINQPad 5 version * update release notes
linq2db · Mar 10, 2024 · 18f4f6b · 18f4f6b
1 parent 4ae27cd
commit 18f4f6b
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 31 deletions.
diff --git 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 → Build/Pack.cmd b/Build/Pack.bat → Build/Pack.cmd
diff --git 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
@@ -7,7 +7,7 @@
 
 		<PackageVersion Include="PolySharp"                                 Version="1.14.1"                                  />
 
-		<PackageVersion Include="Meziantou.Analyzer"                        Version="2.0.139"                                 />
+		<PackageVersion Include="Meziantou.Analyzer"                        Version="2.0.145"                                 />
 		<PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.11.0-beta1.23525.2"                    />
 		<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers"       Version="8.0.0"                                   />
 
@@ -18,8 +18,9 @@
 		<PackageVersion Include="System.Memory"                             Version="4.5.5"                                   />
 		<PackageVersion Include="System.Buffers"                            Version="4.5.1"                                   />
 		<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.0"                                   />
-		<PackageVersion Include="System.Text.Json"                          Version="8.0.2"                                   />
-		<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces"             Version="8.0.0"                                   />
+		<!--don't update those two to 8+ till linq2db reference Microsoft.Bcl.AsyncInterfaces v7 in netfx build-->
+		<PackageVersion Include="System.Text.Json"                          Version="7.0.4"                                   />
+		<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces"             Version="7.0.0"                                   />
 
 		<PackageVersion Include="System.Data.SQLite.Core"                   Version="1.0.118"                                 />
 		<PackageVersion Include="System.Data.Odbc"                          Version="8.0.0"                                   />

diff --git 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
@@ -185,3 +185,4 @@ public static (List<ExplorerItem> items, string sourceCode, string providerAssem
 		return (interceptor.GetTree(), sourceCode, providerAssemblyLocation);
 	}
 }
+
diff --git a/Source/linq2db.LINQPad.csproj b/Source/linq2db.LINQPad.csproj
@@ -6,7 +6,7 @@
 		<Company>linq2db</Company>
 		<Product>linq2db.LINQPad</Product>
 		<AssemblyTitle>$(Product)</AssemblyTitle>
-		<Version>5.2.0.0</Version>
+		<Version>5.2.1.0</Version>
 		<AssemblyVersion>$(Version)</AssemblyVersion>
 		<FileVersion>$(Version)</FileVersion>
 		<Copyright>Copyright © 2016-2024 Linq To DB Team</Copyright>
@@ -42,6 +42,10 @@
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
 
+	<PropertyGroup Label="NETFX DLL HELL workaround" Condition=" '$(TargetFramework)' == 'net48' ">
+		<MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);MSB3277</MSBuildWarningsAsMessages>
+	</PropertyGroup>
+
 	<ItemGroup>
 		<Using Include="System.Reflection" />
 
@@ -76,8 +80,8 @@
 		<PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
 		<PackageReference Include="System.Memory" />
 		<PackageReference Include="System.Buffers" />
-		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
-		<PackageReference Include="System.Text.Json" />
+		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" NoWarn="NU1605" />
+		<PackageReference Include="System.Text.Json" NoWarn="NU1605" />
 		<PackageReference Include="Oracle.ManagedDataAccess" />
 		<PackageReference Include="IBM.Data.DB.Provider" GeneratePathProperty="true" />
 
@@ -134,11 +138,11 @@
 	</ItemGroup>
 
 	<Target Name="PostBuild1" AfterTargets="PostBuildEvent" Condition="'$(TargetFramework)' != 'net48'">
-		<Exec Command="$(ProjectDir)..\Build\Pack.bat $(TargetDir) lpx6" />
+		<Exec Command="$(ProjectDir)..\Build\Pack.cmd $(TargetDir) lpx6" />
 	</Target>
 
 	<Target Name="PostBuild2" AfterTargets="CopySQLiteInteropFiles" Condition="'$(TargetFramework)' == 'net48'">
-		<Exec Command="$(ProjectDir)..\Build\Pack.bat $(TargetDir) lpx" />
+		<Exec Command="$(ProjectDir)..\Build\Pack.cmd $(TargetDir) lpx" />
 	</Target>
 
 	<ItemGroup>

diff --git 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
@@ -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:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -185,3 +185,4 @@ public static (List<ExplorerItem> items, string sourceCode, string providerAssem
		return (interceptor.GetTree(), sourceCode, providerAssemblyLocation);
		}
		}