Skip to content

Commit 91ac46c

Browse files
ThoriumThorium
committed
source link added
1 parent 40921d5 commit 91ac46c

13 files changed

Lines changed: 85 additions & 36 deletions

File tree

‎build.fsx‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,7 @@ Target.initEnvironment()
6868
// Travis.Installer
6969
//]
7070

71-
#if MONO
72-
#else
73-
//#load @"packages/Build/SourceLink.Fake/tools/SourceLink.fsx"
74-
#endif
71+
// SourceLink is now configured via MSBuild properties in the project files
7572

7673
//#r @"packages/tests/Npgsql/lib/net451/Npgsql.dll"
7774
#I @"./packages/build/System.Threading.Tasks.Extensions/lib/netstandard2.0/"
@@ -400,6 +397,7 @@ Target.create "NuGet" (fun _ ->
400397
)
401398

402399
Target.create "PackNuGet" (fun _ ->
400+
// Pack with embedded PDBs (SourceLink enabled, works with Paket)
403401
let _ =
404402
Fake.DotNet.Paket.pack(fun p ->
405403
{ p with
@@ -433,18 +431,8 @@ Target.create "WatchLocalDocs" (fun _ ->
433431

434432
)
435433

436-
#if MONO
437-
Target.create "SourceLink" <| fun _ -> ()
438-
#else
439-
//open SourceLink
440-
Target.create "SourceLink" <| fun _ -> () (*
441-
let baseUrl = sprintf "%s/%s/{0}/%%var2%%" gitRaw project
442-
!! "src/*.fsproj"
443-
|> Seq.iter (fun file ->
444-
let proj = VsProj.LoadRelease file
445-
SourceLink.Index proj.CompilesNotLinked proj.OutputFilePdb __SOURCE_DIRECTORY__ baseUrl
446-
*)
447-
#endif
434+
// SourceLink is now automatically handled by Microsoft.SourceLink.GitHub package
435+
// configured in the project files with MSBuild properties
448436

449437
// --------------------------------------------------------------------------------------
450438
// Release Scripts
@@ -506,10 +494,6 @@ Target.create "BuildDocs" ignore
506494
==> "BuildDocs"
507495

508496
"All"
509-
#if MONO
510-
#else
511-
//=?> ("SourceLink", Pdbstr.tryFind().IsSome )
512-
#endif
513497
=?> ("NuGet", not(Fake.Core.Environment.hasEnvironVar "onlydocs"))
514498
==> "ReleaseDocs"
515499
==> "Release"

‎src/SQLProvider.Common/SQLProvider.Common.fsproj‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@
1515
<PackageReleaseNotes>https://github.com/fsprojects/SQLProvider/blob/master/docs/RELEASE_NOTES.md</PackageReleaseNotes>
1616
<PackageProjectUrl>https://fsprojects.github.io/SQLProvider</PackageProjectUrl>
1717
<RepositoryUrl>https://github.com/fsprojects/SQLProvider</RepositoryUrl>
18-
<IncludeSymbols>true</IncludeSymbols>
19-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
2018
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2119
<TargetFSharpCoreVersion>8.0.0.0</TargetFSharpCoreVersion>
2220
<RepositoryType>git</RepositoryType>
2321
<Authors>pezipink,colinbull,thorium</Authors>
2422
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
23+
<!-- SourceLink settings - Embedded PDBs (recommended for Paket projects) -->
24+
<DebugType>embedded</DebugType>
25+
<DebugSymbols>true</DebugSymbols>
26+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
2527
</PropertyGroup>
2628
<PropertyGroup Condition="'$(Configuration)'=='Release'">
2729
<Optimize>true</Optimize>
@@ -67,7 +69,7 @@
6769
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6870
<PrivateAssets>all</PrivateAssets>
6971
</PackageReference>
70-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
72+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
7173
</ItemGroup>
7274
<Target Name="AfterBuild">
7375
</Target>

‎src/SQLProvider.DuckDb.Runtime/SQLProvider.DuckDb.Runtime.fsproj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Library</OutputType>
@@ -20,6 +20,11 @@
2020
<FsDocsNavbarPosition>fixed-right</FsDocsNavbarPosition>
2121
<FsDocsWarnOnMissingDocs>false</FsDocsWarnOnMissingDocs>
2222
<FsDocsTheme>default</FsDocsTheme>
23+
<!-- SourceLink configuration -->
24+
<DebugType>embedded</DebugType>
25+
<DebugSymbols>true</DebugSymbols>
26+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
27+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2328
</PropertyGroup>
2429
<ItemGroup>
2530
<Compile Include="..\..\paket-files\sourcefiles\Thorium\Linq.Expression.Optimizer\src\Code\ExpressionOptimizer.fs">
@@ -45,6 +50,7 @@
4550
<ItemGroup>
4651
<PackageReference Include="DuckDB.NET.Bindings.Full" Version="1.3.2" />
4752
<PackageReference Include="DuckDB.NET.Data.Full" Version="1.3.2" />
53+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
4854
</ItemGroup>
4955
<ItemGroup>
5056
<ProjectReference Include="..\SQLProvider.Common\SQLProvider.Common.fsproj" />

‎src/SQLProvider.Firebird.Runtime/SQLProvider.Firebird.Runtime.fsproj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Library</OutputType>
@@ -20,6 +20,11 @@
2020
<FsDocsNavbarPosition>fixed-right</FsDocsNavbarPosition>
2121
<FsDocsWarnOnMissingDocs>false</FsDocsWarnOnMissingDocs>
2222
<FsDocsTheme>default</FsDocsTheme>
23+
<!-- SourceLink settings - Embedded PDBs -->
24+
<DebugType>embedded</DebugType>
25+
<DebugSymbols>true</DebugSymbols>
26+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
27+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2328
</PropertyGroup>
2429
<ItemGroup>
2530
<Compile Include="..\..\paket-files\sourcefiles\Thorium\Linq.Expression.Optimizer\src\Code\ExpressionOptimizer.fs">
@@ -34,6 +39,7 @@
3439
</Target>
3540
<ItemGroup>
3641
<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="10.3.2" />
42+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
3743
</ItemGroup>
3844
<ItemGroup>
3945
<ProjectReference Include="..\SQLProvider.Common\SQLProvider.Common.fsproj" />

‎src/SQLProvider.MsAccess.Runtime/SQLProvider.MsAccess.Runtime.fsproj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Library</OutputType>
@@ -20,6 +20,11 @@
2020
<FsDocsNavbarPosition>fixed-right</FsDocsNavbarPosition>
2121
<FsDocsWarnOnMissingDocs>false</FsDocsWarnOnMissingDocs>
2222
<FsDocsTheme>default</FsDocsTheme>
23+
<!-- SourceLink configuration -->
24+
<DebugType>embedded</DebugType>
25+
<DebugSymbols>true</DebugSymbols>
26+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
27+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2328
</PropertyGroup>
2429
<ItemGroup>
2530
<Compile Include="..\..\paket-files\sourcefiles\Thorium\Linq.Expression.Optimizer\src\Code\ExpressionOptimizer.fs">
@@ -34,6 +39,7 @@
3439
</Target>
3540
<ItemGroup>
3641
<PackageReference Include="System.Data.OleDb" Version="6.0.1" />
42+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
3743
</ItemGroup>
3844
<ItemGroup>
3945
<ProjectReference Include="..\SQLProvider.Common\SQLProvider.Common.fsproj" />

‎src/SQLProvider.MsSql.Runtime/SQLProvider.MsSql.Runtime.fsproj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Library</OutputType>
@@ -20,6 +20,11 @@
2020
<FsDocsNavbarPosition>fixed-right</FsDocsNavbarPosition>
2121
<FsDocsWarnOnMissingDocs>false</FsDocsWarnOnMissingDocs>
2222
<FsDocsTheme>default</FsDocsTheme>
23+
<!-- SourceLink settings - Embedded PDBs -->
24+
<DebugType>embedded</DebugType>
25+
<DebugSymbols>true</DebugSymbols>
26+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
27+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2328
</PropertyGroup>
2429
<ItemGroup>
2530
<Compile Include="..\..\paket-files\sourcefiles\Thorium\Linq.Expression.Optimizer\src\Code\ExpressionOptimizer.fs">
@@ -32,6 +37,7 @@
3237
</ItemGroup>
3338
<ItemGroup>
3439
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
40+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
3541
</ItemGroup>
3642
<Target Name="BeforeBuild">
3743
<MSBuild Projects="..\SQLProvider.MsSql.DesignTime\SQLProvider.MsSql.DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=$(TargetFramework)" />

‎src/SQLProvider.MySql.Runtime/SQLProvider.MySql.Runtime.fsproj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Library</OutputType>
@@ -20,6 +20,11 @@
2020
<FsDocsNavbarPosition>fixed-right</FsDocsNavbarPosition>
2121
<FsDocsWarnOnMissingDocs>false</FsDocsWarnOnMissingDocs>
2222
<FsDocsTheme>default</FsDocsTheme>
23+
<!-- SourceLink settings - Embedded PDBs -->
24+
<DebugType>embedded</DebugType>
25+
<DebugSymbols>true</DebugSymbols>
26+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
27+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2328
</PropertyGroup>
2429
<ItemGroup>
2530
<Compile Include="..\..\paket-files\sourcefiles\Thorium\Linq.Expression.Optimizer\src\Code\ExpressionOptimizer.fs">
@@ -35,6 +40,7 @@
3540
<ItemGroup>
3641
<PackageReference Include="MySql.Data" Version="9.3.0" />
3742
<PackageReference Include="System.Runtime.Loader" Version="4.3" />
43+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
3844
<ProjectReference Include="..\SQLProvider.Common\SQLProvider.Common.fsproj" />
3945
</ItemGroup>
4046
<Import Project="..\..\.paket\Paket.Restore.targets" />

‎src/SQLProvider.MySqlConnector.Runtime/SQLProvider.MySqlConnector.Runtime.fsproj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Library</OutputType>
@@ -20,6 +20,11 @@
2020
<FsDocsNavbarPosition>fixed-right</FsDocsNavbarPosition>
2121
<FsDocsWarnOnMissingDocs>false</FsDocsWarnOnMissingDocs>
2222
<FsDocsTheme>default</FsDocsTheme>
23+
<!-- SourceLink settings - Embedded PDBs -->
24+
<DebugType>embedded</DebugType>
25+
<DebugSymbols>true</DebugSymbols>
26+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
27+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2328
</PropertyGroup>
2429
<ItemGroup>
2530
<Compile Include="..\..\paket-files\sourcefiles\Thorium\Linq.Expression.Optimizer\src\Code\ExpressionOptimizer.fs">
@@ -35,6 +40,7 @@
3540
<ItemGroup>
3641
<PackageReference Include="MySqlConnector" Version="2.4.0" />
3742
<PackageReference Include="System.Runtime.Loader" Version="4.3" />
43+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
3844
<ProjectReference Include="..\SQLProvider.Common\SQLProvider.Common.fsproj" />
3945
</ItemGroup>
4046
<Import Project="..\..\.paket\Paket.Restore.targets" />

‎src/SQLProvider.Odbc.Runtime/SQLProvider.Odbc.Runtime.fsproj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Library</OutputType>
@@ -20,6 +20,11 @@
2020
<FsDocsNavbarPosition>fixed-right</FsDocsNavbarPosition>
2121
<FsDocsWarnOnMissingDocs>false</FsDocsWarnOnMissingDocs>
2222
<FsDocsTheme>default</FsDocsTheme>
23+
<!-- SourceLink settings - Embedded PDBs -->
24+
<DebugType>embedded</DebugType>
25+
<DebugSymbols>true</DebugSymbols>
26+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
27+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2328
</PropertyGroup>
2429
<ItemGroup>
2530
<Compile Include="..\..\paket-files\sourcefiles\Thorium\Linq.Expression.Optimizer\src\Code\ExpressionOptimizer.fs">
@@ -34,6 +39,7 @@
3439
</Target>
3540
<ItemGroup>
3641
<PackageReference Include="System.Data.Odbc" Version="6.0.2" />
42+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
3743
</ItemGroup>
3844
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
3945
<Reference Include="System.Configuration" />

‎src/SQLProvider.Oracle.Runtime/SQLProvider.Oracle.Runtime.fsproj‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Library</OutputType>
@@ -20,6 +20,11 @@
2020
<FsDocsNavbarPosition>fixed-right</FsDocsNavbarPosition>
2121
<FsDocsWarnOnMissingDocs>false</FsDocsWarnOnMissingDocs>
2222
<FsDocsTheme>default</FsDocsTheme>
23+
<!-- SourceLink settings - Embedded PDBs -->
24+
<DebugType>embedded</DebugType>
25+
<DebugSymbols>true</DebugSymbols>
26+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
27+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2328
</PropertyGroup>
2429
<ItemGroup>
2530
<Compile Include="..\..\paket-files\sourcefiles\Thorium\Linq.Expression.Optimizer\src\Code\ExpressionOptimizer.fs">
@@ -42,6 +47,9 @@
4247
<PackageReference Include="Oracle.ManagedDataAccess.Core">
4348
<Version>23.8.0</Version>
4449
</PackageReference>
50+
</ItemGroup>
51+
<ItemGroup>
52+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
4553
</ItemGroup>
4654
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
4755
<Reference Include="System.Configuration" />

0 commit comments

Comments
 (0)