Skip to content

Commit 18f4f6b

Browse files
MaceWinduMaceWindu
authored
Resolve dependency issues in 5.2.0 release (#109)
* resolve dependency issues in LINQPad 5 version * update release notes
1 parent 4ae27cd commit 18f4f6b

File tree

9 files changed

+48
-31
lines changed

9 files changed

+48
-31
lines changed

‎.editorconfig‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,13 @@ dotnet_diagnostic.MA0041.severity = none
261261
dotnet_diagnostic.MA0048.severity = none
262262
# MA0051: Method is too long
263263
dotnet_diagnostic.MA0051.severity = none
264+
# MA0053: Make class sealed
265+
dotnet_diagnostic.MA0053.severity = none
266+
# MA0101: String contains an implicit end of line character
267+
dotnet_diagnostic.MA0101.severity = none
264268
# MA0111: Use string.Create instead of FormattableString
265269
dotnet_diagnostic.MA0111.severity = none
266270
# MA0144: Use System.OperatingSystem to check the current OS
267271
dotnet_diagnostic.MA0144.severity = none
272+
# MA0154: Use langword in XML comment
273+
dotnet_diagnostic.MA0154.severity = none

‎Build/Pack.bat‎ renamed to ‎Build/Pack.cmd‎

File renamed without changes.

‎Build/azure-pipelines.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
variables:
22
solution: 'linq2db.LINQPad.sln'
33
build_configuration: 'Release'
4-
assemblyVersion: 5.2.0.0
5-
nugetVersion: 5.2.0
6-
nugetDevVersion: 5.2.1
7-
nugetPRVersion: 5.2.1
4+
assemblyVersion: 5.2.1.0
5+
nugetVersion: 5.2.1
6+
nugetDevVersion: 5.2.2
7+
nugetPRVersion: 5.2.2
88
artifact_lpx: 'lpx'
99
artifact_lpx6: 'lpx6'
1010
artifact_nuget: 'nuget'

‎Directory.Packages.props‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<PackageVersion Include="PolySharp" Version="1.14.1" />
99

10-
<PackageVersion Include="Meziantou.Analyzer" Version="2.0.139" />
10+
<PackageVersion Include="Meziantou.Analyzer" Version="2.0.145" />
1111
<PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.11.0-beta1.23525.2" />
1212
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" />
1313

@@ -18,8 +18,9 @@
1818
<PackageVersion Include="System.Memory" Version="4.5.5" />
1919
<PackageVersion Include="System.Buffers" Version="4.5.1" />
2020
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
21-
<PackageVersion Include="System.Text.Json" Version="8.0.2" />
22-
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
21+
<!--don't update those two to 8+ till linq2db reference Microsoft.Bcl.AsyncInterfaces v7 in netfx build-->
22+
<PackageVersion Include="System.Text.Json" Version="7.0.4" />
23+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
2324

2425
<PackageVersion Include="System.Data.SQLite.Core" Version="1.0.118" />
2526
<PackageVersion Include="System.Data.Odbc" Version="8.0.0" />

‎Source/Compat/StringBuilderExtensions.cs‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
11
#if NETFRAMEWORK
2-
namespace System.Text
2+
namespace System.Text;
3+
4+
internal static class StringBuilderExtensions
35
{
4-
internal static class StringBuilderExtensions
6+
public static StringBuilder Append(
7+
this StringBuilder sb,
8+
IFormatProvider? provider,
9+
FormattableString formattableString)
510
{
6-
public static StringBuilder Append(
7-
this StringBuilder sb,
8-
IFormatProvider? provider,
9-
FormattableString formattableString)
10-
{
11-
sb.Append(formattableString.ToString(provider));
12-
return sb;
13-
}
11+
sb.Append(formattableString.ToString(provider));
12+
return sb;
13+
}
1414

15-
public static StringBuilder AppendLine(
16-
this StringBuilder sb,
17-
IFormatProvider? provider,
18-
FormattableString formattableString)
19-
{
20-
sb.AppendLine(formattableString.ToString(provider));
21-
return sb;
22-
}
15+
public static StringBuilder AppendLine(
16+
this StringBuilder sb,
17+
IFormatProvider? provider,
18+
FormattableString formattableString)
19+
{
20+
sb.AppendLine(formattableString.ToString(provider));
21+
return sb;
2322
}
2423
}
2524
#endif

‎Source/Drivers/DynamicSchemaGenerator.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,3 +185,4 @@ public static (List<ExplorerItem> items, string sourceCode, string providerAssem
185185
return (interceptor.GetTree(), sourceCode, providerAssemblyLocation);
186186
}
187187
}
188+

‎Source/linq2db.LINQPad.csproj‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Company>linq2db</Company>
77
<Product>linq2db.LINQPad</Product>
88
<AssemblyTitle>$(Product)</AssemblyTitle>
9-
<Version>5.2.0.0</Version>
9+
<Version>5.2.1.0</Version>
1010
<AssemblyVersion>$(Version)</AssemblyVersion>
1111
<FileVersion>$(Version)</FileVersion>
1212
<Copyright>Copyright © 2016-2024 Linq To DB Team</Copyright>
@@ -42,6 +42,10 @@
4242
<GenerateDocumentationFile>true</GenerateDocumentationFile>
4343
</PropertyGroup>
4444

45+
<PropertyGroup Label="NETFX DLL HELL workaround" Condition=" '$(TargetFramework)' == 'net48' ">
46+
<MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);MSB3277</MSBuildWarningsAsMessages>
47+
</PropertyGroup>
48+
4549
<ItemGroup>
4650
<Using Include="System.Reflection" />
4751

@@ -76,8 +80,8 @@
7680
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
7781
<PackageReference Include="System.Memory" />
7882
<PackageReference Include="System.Buffers" />
79-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
80-
<PackageReference Include="System.Text.Json" />
83+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" NoWarn="NU1605" />
84+
<PackageReference Include="System.Text.Json" NoWarn="NU1605" />
8185
<PackageReference Include="Oracle.ManagedDataAccess" />
8286
<PackageReference Include="IBM.Data.DB.Provider" GeneratePathProperty="true" />
8387

@@ -134,11 +138,11 @@
134138
</ItemGroup>
135139

136140
<Target Name="PostBuild1" AfterTargets="PostBuildEvent" Condition="'$(TargetFramework)' != 'net48'">
137-
<Exec Command="$(ProjectDir)..\Build\Pack.bat $(TargetDir) lpx6" />
141+
<Exec Command="$(ProjectDir)..\Build\Pack.cmd $(TargetDir) lpx6" />
138142
</Target>
139143

140144
<Target Name="PostBuild2" AfterTargets="CopySQLiteInteropFiles" Condition="'$(TargetFramework)' == 'net48'">
141-
<Exec Command="$(ProjectDir)..\Build\Pack.bat $(TargetDir) lpx" />
145+
<Exec Command="$(ProjectDir)..\Build\Pack.cmd $(TargetDir) lpx" />
142146
</Target>
143147

144148
<ItemGroup>

‎linq2db.LINQPad.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{A26F7937
2626
Build\icon64.png = Build\icon64.png
2727
Build\linq2db.LINQPad.nuspec = Build\linq2db.LINQPad.nuspec
2828
Build\nuget-vars.yml = Build\nuget-vars.yml
29-
Build\Pack.bat = Build\Pack.bat
3029
Build\README.md = Build\README.md
30+
Build\Pack.cmd = Build\Pack.cmd
3131
Build\SetVersion.ps1 = Build\SetVersion.ps1
3232
EndProjectSection
3333
EndProject

‎release-notes.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# Release 5.2.1
2+
3+
Issues fixed:
4+
5+
- [#109](https://github.com/linq2db/linq2db.LINQPad/pull/109): fix dependency issues in 5.2.0 release
6+
17
# Release 5.2.0
28

39
Issues fixed:

0 commit comments

Comments
 (0)