Skip to content

Commit

Permalink
Merge pull request #81 from linq2db/master
Browse files Browse the repository at this point in the history 
Merge pull request #81 from linq2db/master
  • Loading branch information
@viceroypenguin
viceroypenguin authored Sep 6, 2022
2 parents a952c06 + 426207d commit 1c0b5d9
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
8 changes: 4 additions & 4 deletions Build/azure-pipelines.yml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
variables:
solution: 'linq2db.LINQPad.sln'
build_configuration: 'Release'
assemblyVersion: 4.1.1.0
nugetVersion: 4.1.1
nugetDevVersion: 4.1.2
nugetPRVersion: 4.1.2
assemblyVersion: 4.2.0.0
nugetVersion: 4.2.0
nugetDevVersion: 4.2.1
nugetPRVersion: 4.2.1
artifact_lpx: 'lpx'
artifact_lpx6: 'lpx6'
artifact_nuget: 'nuget'
Expand Down
12 changes: 6 additions & 6 deletions Build/linq2db.LINQPad.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,24 @@
<dependencies>
<group targetFramework=".NETCoreApp3.1">
<dependency id="LINQPad.Reference" version="1.3.0" />
<dependency id="linq2db" version="4.1.0" />
<dependency id="linq2db" version="4.2.0" />

<dependency id="Humanizer.Core" version="2.14.1" />
<dependency id="CodeJam" version="4.1.0" />
<dependency id="System.Configuration.ConfigurationManager" version="6.0.0" />
<dependency id="Microsoft.CodeAnalysis.CSharp" version="4.2.0" />
<dependency id="Microsoft.CodeAnalysis.CSharp" version="4.3.0" />
<dependency id="System.Text.Json" version="6.0.5" />
<dependency id="dotMorten.Microsoft.SqlServer.Types" version="1.5.0" />

<dependency id="FirebirdSql.Data.FirebirdClient" version="9.0.1" />
<dependency id="MySqlConnector" version="2.1.10" />
<dependency id="FirebirdSql.Data.FirebirdClient" version="9.0.2" />
<dependency id="MySqlConnector" version="2.1.13" />
<dependency id="AdoNetCore.AseClient" version="0.19.2" />
<dependency id="System.Data.SQLite.Core" version="1.0.116" />
<dependency id="System.Data.SqlClient" version="4.8.3" />
<dependency id="System.Data.Odbc" version="5.0.0" />
<dependency id="System.Data.OleDb" version="5.0.0" />
<dependency id="Npgsql" version="6.0.5" />
<dependency id="Oracle.ManagedDataAccess.Core" version="3.21.61" />
<dependency id="Npgsql" version="6.0.6" />
<dependency id="Oracle.ManagedDataAccess.Core" version="3.21.70" />
<dependency id="IBM.Data.DB2.Core" version="3.1.0.600" />
</group>
</dependencies>
Expand Down
12 changes: 6 additions & 6 deletions Directory.Packages.props
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<ItemGroup>
<PackageVersion Include="linq2db" Version="4.1.0" />
<PackageVersion Include="linq2db" Version="4.2.0" />

<PackageVersion Include="LINQPad.Reference" Version="1.3.0" />

Expand All @@ -12,13 +12,13 @@
<PackageVersion Include="System.Memory" Version="4.5.5" />
<PackageVersion Include="System.Buffers" Version="4.5.1" />
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
<PackageVersion Include="MySqlConnector" Version="2.1.10" />
<PackageVersion Include="MySqlConnector" Version="2.1.13" />
<PackageVersion Include="AdoNetCore.AseClient" Version="0.19.2" />
<PackageVersion Include="IBM.Data.DB.Provider" Version="11.5.5010.4" GeneratePathProperty="true" />
<PackageVersion Include="System.Data.SQLite.Core" Version="1.0.116" />
<PackageVersion Include="System.Data.SqlClient" Version="4.8.3" />
<PackageVersion Include="Oracle.ManagedDataAccess" Version="19.14.0" />
<PackageVersion Include="Oracle.ManagedDataAccess.Core" Version="3.21.61" />
<PackageVersion Include="Oracle.ManagedDataAccess.Core" Version="3.21.70" />
<PackageVersion Include="System.Data.Odbc" Version="6.0.0" />
<PackageVersion Include="System.Data.OleDb" Version="6.0.0" />
<PackageVersion Include="IBM.Data.DB2.Core" Version="3.1.0.600" />
Expand All @@ -34,9 +34,9 @@
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' != 'net461' ">
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0" />
<PackageVersion Include="Npgsql" Version="6.0.5" />
<PackageVersion Include="FirebirdSql.Data.FirebirdClient" Version="9.0.1" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0" />
<PackageVersion Include="Npgsql" Version="6.0.6" />
<PackageVersion Include="FirebirdSql.Data.FirebirdClient" Version="9.0.2" />
<PackageVersion Include="System.Text.Json" Version="6.0.5" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Source/linq2db.LINQPad.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<Company>linq2db</Company>
<Product>linq2db.LINQPad</Product>
<AssemblyTitle>$(Product)</AssemblyTitle>
<Version>4.1.1.0</Version>
<Version>4.2.0.0</Version>
<AssemblyVersion>$(Version)</AssemblyVersion>
<FileVersion>$(Version)</FileVersion>
<Copyright>Copyright © 2016-2022 Linq To DB Team</Copyright>
Expand Down

0 comments on commit 1c0b5d9

Please sign in to comment.