Skip to content

Commit 3a7a604

Browse files
committed
Remove runtime identifier and use conditional packages
1 parent 98a00b5 commit 3a7a604

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

PSReadLine.build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ task LayoutModule BuildPolyfiller, BuildMainModule, {
125125
Copy-Item "Polyfill/bin/$Configuration/netstandard2.0/Microsoft.PowerShell.PSReadLine.Polyfiller.dll" "$targetDir/netstd" -Force
126126
Copy-Item "Polyfill/bin/$Configuration/net6.0/Microsoft.PowerShell.PSReadLine.Polyfiller.dll" "$targetDir/net6plus" -Force
127127

128-
$binPath = "PSReadLine/bin/$Configuration/netstandard2.0/win-x64/publish"
128+
$binPath = "PSReadLine/bin/$Configuration/netstandard2.0/publish"
129129
Copy-Item $binPath/Microsoft.PowerShell.PSReadLine.dll $targetDir
130130
Copy-Item $binPath/Microsoft.PowerShell.Pager.dll $targetDir
131131

PSReadLine/PSReadLine.csproj

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,20 @@
1414
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
1515
<LangVersion>9.0</LangVersion>
1616
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
17-
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
1817
</PropertyGroup>
1918

2019
<ItemGroup>
2120
<PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.4" />
2221
<PackageReference Include="PowerShellStandard.Library" Version="5.1.0" />
2322
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
2423
<PackageReference Include="Microsoft.PowerShell.Pager" Version="1.0.0" />
25-
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.11" />
24+
25+
<!-- Platform-specific SQLite bundles -->
26+
<!-- Use Windows system SQLite on Windows -->
27+
<PackageReference Include="SQLitePCLRaw.bundle_winsqlite3" Version="2.1.11" Condition="$([MSBuild]::IsOSPlatform('Windows'))" />
28+
<!-- Use embedded SQLite with all native libraries for Linux/macOS -->
29+
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.11" Condition="!$([MSBuild]::IsOSPlatform('Windows'))" />
30+
2631
<ProjectReference Include="..\Polyfill\Polyfill.csproj" />
2732
</ItemGroup>
2833

0 commit comments

Comments
 (0)