Skip to content

Commit 7b0bebb

Browse files
committed
Trying to fix more build errors
1 parent 983b466 commit 7b0bebb

4 files changed

Lines changed: 4 additions & 10 deletions

File tree

.paket/Paket.Restore.targets

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -235,15 +235,14 @@
235235
<Splits>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',').Length)</Splits>
236236
<PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
237237
<PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
238-
<Reference>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[2])</Reference>
239238
<AllPrivateAssets>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])</AllPrivateAssets>
240239
<CopyLocal Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 6">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5])</CopyLocal>
241240
<OmitContent Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 7">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[6])</OmitContent>
242241
<ImportTargets Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 8">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[7])</ImportTargets>
243242
<Aliases Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 9">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[8])</Aliases>
244243
</PaketReferencesFileLinesInfo>
245-
<PackageReference Condition=" '$(ManagePackageVersionsCentrally)' != 'true' Or '%(PaketReferencesFileLinesInfo.Reference)' == 'Direct' " Include="%(PaketReferencesFileLinesInfo.PackageName)">
246-
<Version Condition=" '$(ManagePackageVersionsCentrally)' != 'true' ">%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
244+
<PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
245+
<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
247246
<PrivateAssets Condition=" ('%(PaketReferencesFileLinesInfo.AllPrivateAssets)' == 'true') Or ('$(PackAsTool)' == 'true') ">All</PrivateAssets>
248247
<ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.CopyLocal) == 'false' or %(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
249248
<ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.OmitContent) == 'true'">$(ExcludeAssets);contentFiles</ExcludeAssets>
@@ -253,10 +252,6 @@
253252
<AllowExplicitVersion>true</AllowExplicitVersion>
254253

255254
</PackageReference>
256-
257-
<PackageVersion Include="%(PaketReferencesFileLinesInfo.PackageName)">
258-
<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
259-
</PackageVersion>
260255
</ItemGroup>
261256

262257
<PropertyGroup>

build.fsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ open System.Data.SqlClient
3535
#r "nuget: Microsoft.Data.SqlClient"
3636
#r "nuget: MSBuild.StructuredLogger, 2.2.337"
3737

38-
#r "nuget: nuget Fake.Core.Trace"
39-
#r "nuget: nuget Fake.Core.Target"
4038
// Boilerplate
4139
System.Environment.GetCommandLineArgs()
4240
|> Array.skip 2 // skip fsi.exe; build.fsx

tests/SqlProvider.Core.Tests/Benchmarks/global.json renamed to global.json

File renamed without changes.

paket.dependencies

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ nuget System.Runtime.Loader 4.3
2222
nuget System.Text.Encodings.Web 9.0.4
2323
nuget System.Threading.Tasks.Extensions 4.6.3
2424
nuget Microsoft.Extensions.Logging.Abstractions 8.0.3
25+
nuget Microsoft.NETCore.App.Ref 9.0.8
2526

2627
group Build
2728

@@ -102,4 +103,4 @@ group Tests
102103
nuget Microsoft.Data.Sqlite.Core 9.0.4
103104
nuget DuckDB.NET.Bindings.Full 1.3.2
104105
nuget DuckDB.NET.Data.Full 1.3.2
105-
// nuget Microsoft.Data.Sqlite.Core.Backport // Needed if we want currently Core support on Linux.
106+
// nuget Microsoft.Data.Sqlite.Core.Backport // Needed if we want currently Core support on Linux.`

0 commit comments

Comments
 (0)