Skip to content

Commit 84debb1

Browse files
aaronpowellaaronpowell
committed
getting symbol packages working
1 parent e4077ed commit 84debb1

8 files changed

Lines changed: 46 additions & 53 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
run: dotnet tool restore
2828

2929
- name: Generate packages
30-
run: dotnet fake run ./build.fsx --target Release
30+
run: dotnet fake run ./build.fsx --target CI
3131

3232
- name: Publish release packages
3333
uses: actions/upload-artifact@v1

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
- New CI/CD pipeline
88
- Primitive support for pagination [#23](https://github.com/aaronpowell/FSharp.CosmosDb/issues/23)
99

10-
## Changed
10+
### Changed
1111

1212
- Upgraded a lot of dependencies
1313
- Analyzer attempts to discover connection information from appsettings.json and appsettings.Development.json

‎Directory.Build.props‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<Project>
2+
<PropertyGroup>
3+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
4+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
5+
<IncludeSymbols>true</IncludeSymbols>
6+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
7+
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
8+
</PropertyGroup>
9+
10+
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
11+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
12+
</PropertyGroup>
13+
14+
<!-- NuGet package configuration -->
15+
<PropertyGroup>
16+
<Company>Aaron Powell</Company>
17+
<RepositoryUrl>https://github.com/aaronpowell/FSharp.CosmosDb</RepositoryUrl>
18+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
19+
</PropertyGroup>
20+
21+
<ItemGroup>
22+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
23+
</ItemGroup>
24+
</Project>

‎build.fsx‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ let getVersionNumber (changeLog: Changelog.ChangelogEntry) (targets: Target list
3333
match GitHubActions.Environment.CI false, isRelease targets with
3434
| (true, true) -> changeLog.NuGetVersion
3535
| (true, false) -> sprintf "%s-ci-%s" changeLog.NuGetVersion GitHubActions.Environment.RunId
36-
| (_, _) -> changeLog.NuGetVersion
36+
| (_, _) -> sprintf "%s-local" changeLog.NuGetVersion
3737

3838
Target.create "Clean" (fun _ ->
3939
DotNet.exec id "clean" "" |> ignore
@@ -106,6 +106,7 @@ Target.create "RunAnalyzer" (fun ctx ->
106106

107107
Target.create "Default" ignore
108108
Target.create "Release" ignore
109+
Target.create "CI" ignore
109110

110111
"Clean" ==> "Restore" ==> "Build" ==> "Default"
111112

@@ -116,6 +117,13 @@ Target.create "Release" ignore
116117
==> "Changelog"
117118
==> "Release"
118119

120+
"Default"
121+
==> "Publish"
122+
==> "Test"
123+
==> "Package"
124+
==> "Changelog"
125+
==> "CI"
126+
119127
"Default" ==> "Publish" ==> "RunAnalyzer"
120128

121129
Target.runOrDefault "Default"

‎paket.dependencies‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
version 5.242.2
12
framework: netstandard2.0, netcoreapp3.1, netcoreapp2.0
2-
version: 5.242.2
33

44
source https://www.nuget.org/api/v2
55
source https://api.nuget.org/v3/index.json
@@ -16,7 +16,7 @@ nuget Microsoft.Extensions.Configuration.Json
1616
nuget Expecto 8.13.1
1717
nuget YoloDev.Expecto.TestSdk 0.8.0
1818
nuget Microsoft.NET.Test.Sdk 16.5.0
19-
nuget Microsoft.SourceLink.GitHub prerelease copy_local: true
19+
nuget Microsoft.SourceLink.GitHub copy_local: true
2020
nuget Microsoft.NETFramework.ReferenceAssemblies copy_local: true
2121
nuget FSharp.SystemTextJson 0.10.25
2222

‎paket.lock‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ NUGET
4444
McMaster.NETCore.Plugins (1.3.1) - restriction: || (== netcoreapp2.0) (== netcoreapp3.1) (&& (== netstandard2.0) (>= netcoreapp2.0))
4545
Microsoft.DotNet.PlatformAbstractions (>= 3.1) - restriction: || (== netcoreapp2.0) (== netcoreapp3.1) (&& (== netstandard2.0) (>= netcoreapp2.0))
4646
Microsoft.Extensions.DependencyModel (>= 3.1) - restriction: || (== netcoreapp2.0) (== netcoreapp3.1) (&& (== netstandard2.0) (>= netcoreapp2.0))
47-
System.Text.Json (>= 4.7) - restriction: || (== netcoreapp2.0) (&& (== netcoreapp3.1) (== netstandard2.0)) (&& (== netcoreapp3.1) (< netcoreapp3.0)) (&& (== netstandard2.0) (>= netcoreapp2.0))
47+
System.Text.Json (>= 4.7) - restriction: || (== netcoreapp2.0) (&& (== netcoreapp3.1) (< netcoreapp3.0)) (&& (== netstandard2.0) (>= netcoreapp2.0))
4848
Microsoft.Bcl.AsyncInterfaces (5.0)
4949
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (== netcoreapp2.0) (&& (== netcoreapp3.1) (>= net461)) (&& (== netcoreapp3.1) (< netcoreapp2.1) (< netstandard2.1)) (== netstandard2.0)
50-
Microsoft.Build.Tasks.Git (1.1.0-beta-20204-02) - copy_local: true
50+
Microsoft.Build.Tasks.Git (1.0) - copy_local: true
5151
Microsoft.CodeCoverage (16.5) - restriction: || (&& (== netcoreapp2.0) (>= net45)) (&& (== netcoreapp2.0) (>= netcoreapp2.1)) (== netcoreapp3.1) (&& (== netstandard2.0) (>= net45)) (&& (== netstandard2.0) (>= netcoreapp2.1))
5252
Microsoft.DotNet.PlatformAbstractions (3.1.2) - restriction: || (== netcoreapp2.0) (== netcoreapp3.1) (&& (== netstandard2.0) (>= netcoreapp2.0))
5353
Microsoft.Extensions.Configuration (5.0)
@@ -86,10 +86,10 @@ NUGET
8686
Microsoft.NETCore.Platforms (3.1)
8787
Microsoft.NETCore.Targets (3.1)
8888
Microsoft.NETFramework.ReferenceAssemblies (1.0) - copy_local: true
89-
Microsoft.SourceLink.Common (1.1.0-beta-20204-02) - copy_local: true
90-
Microsoft.SourceLink.GitHub (1.1.0-beta-20204-02) - copy_local: true
91-
Microsoft.Build.Tasks.Git (>= 1.1.0-beta-20204-02)
92-
Microsoft.SourceLink.Common (>= 1.1.0-beta-20204-02)
89+
Microsoft.SourceLink.Common (1.0) - copy_local: true
90+
Microsoft.SourceLink.GitHub (1.0) - copy_local: true
91+
Microsoft.Build.Tasks.Git (>= 1.0)
92+
Microsoft.SourceLink.Common (>= 1.0)
9393
Microsoft.TestPlatform.ObjectModel (16.5) - restriction: || (&& (== netcoreapp2.0) (>= netcoreapp2.1)) (== netcoreapp3.1) (&& (== netstandard2.0) (>= netcoreapp2.1))
9494
NuGet.Frameworks (>= 5.0)
9595
Microsoft.TestPlatform.TestHost (16.5) - restriction: || (&& (== netcoreapp2.0) (>= netcoreapp2.1)) (== netcoreapp3.1) (&& (== netstandard2.0) (>= netcoreapp2.1))
@@ -155,7 +155,7 @@ NUGET
155155
Microsoft.NETCore.Platforms (>= 3.1) - restriction: || (== netcoreapp2.0) (== netcoreapp3.1) (&& (== netstandard2.0) (>= netcoreapp2.0))
156156
System.Security.Principal.Windows (>= 4.7)
157157
System.Security.Cryptography.Cng (4.7)
158-
Microsoft.NETCore.Platforms (>= 3.1) - restriction: || (== netcoreapp2.0) (&& (== netcoreapp3.1) (== netstandard2.0)) (&& (== netcoreapp3.1) (< netcoreapp2.1) (< netstandard2.1)) (&& (== netstandard2.0) (>= netcoreapp2.0))
158+
Microsoft.NETCore.Platforms (>= 3.1) - restriction: || (== netcoreapp2.0) (&& (== netcoreapp3.1) (< netcoreapp2.1) (< netstandard2.1)) (&& (== netstandard2.0) (>= netcoreapp2.0))
159159
System.Security.Cryptography.Pkcs (4.7)
160160
System.Buffers (>= 4.5) - restriction: || (&& (== netcoreapp3.1) (< netcoreapp2.0) (< netstandard2.1)) (== netstandard2.0)
161161
System.Memory (>= 4.5.3) - restriction: || (== netcoreapp2.0) (&& (== netcoreapp3.1) (< netcoreapp2.0) (< netstandard2.1)) (&& (== netcoreapp3.1) (< netcoreapp2.1) (< netstandard2.1)) (&& (== netcoreapp3.1) (>= uap10.1)) (== netstandard2.0)
@@ -169,7 +169,7 @@ NUGET
169169
System.Security.AccessControl (>= 4.7)
170170
System.Windows.Extensions (>= 4.7) - restriction: || (&& (== netcoreapp2.0) (>= netcoreapp3.0)) (== netcoreapp3.1) (&& (== netstandard2.0) (>= netcoreapp3.0))
171171
System.Security.Principal.Windows (4.7)
172-
Microsoft.NETCore.Platforms (>= 3.1) - restriction: || (== netcoreapp2.0) (&& (== netcoreapp3.1) (== netstandard2.0)) (&& (== netcoreapp3.1) (< netcoreapp2.1)) (&& (== netcoreapp3.1) (< netcoreapp3.0)) (&& (== netstandard2.0) (>= netcoreapp2.0)) (&& (== netstandard2.0) (>= netcoreapp2.1))
172+
Microsoft.NETCore.Platforms (>= 3.1) - restriction: || (== netcoreapp2.0) (&& (== netcoreapp3.1) (< netcoreapp2.1)) (&& (== netcoreapp3.1) (< netcoreapp3.0)) (&& (== netstandard2.0) (>= netcoreapp2.0)) (&& (== netstandard2.0) (>= netcoreapp2.1))
173173
System.ServiceModel.Primitives (4.7)
174174
System.Private.ServiceModel (>= 4.7)
175175
System.Text.Encoding (4.3)

‎src/FSharp.CosmosDb.Analyzer/FSharp.CosmosDb.Analyzer.fsproj‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,6 @@
33
<TargetFramework>netcoreapp2.0</TargetFramework>
44
</PropertyGroup>
55

6-
<!-- Source Link support -->
7-
<PropertyGroup>
8-
<!-- Optional: Publish the repository URL in the built .nupkg (in the NuSpec <Repository> element) -->
9-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
10-
11-
<!-- Optional: Embed source files that are not tracked by the source control manager in the PDB -->
12-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
13-
14-
<!-- Optional: Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
15-
<IncludeSymbols>true</IncludeSymbols>
16-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
17-
</PropertyGroup>
18-
19-
<!-- NuGet package configuration -->
20-
<PropertyGroup>
21-
<Company>Aaron Powell</Company>
22-
<RepositoryUrl>https://github.com/aaronpowell/FSharp.CosmosDb</RepositoryUrl>
23-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
24-
</PropertyGroup>
25-
266
<ItemGroup>
277
<Compile Include="Types.fs" />
288
<Compile Include="../shared/AsyncSeqExt.fs" />

‎src/FSharp.CosmosDb/FSharp.CosmosDb.fsproj‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,6 @@
33
<TargetFramework>netstandard2.0</TargetFramework>
44
</PropertyGroup>
55

6-
<!-- Source Link support -->
7-
<PropertyGroup>
8-
<!-- Optional: Publish the repository URL in the built .nupkg (in the NuSpec <Repository> element) -->
9-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
10-
11-
<!-- Optional: Embed source files that are not tracked by the source control manager in the PDB -->
12-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
13-
14-
<!-- Optional: Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
15-
<IncludeSymbols>true</IncludeSymbols>
16-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
17-
</PropertyGroup>
18-
19-
<!-- NuGet package configuration -->
20-
<PropertyGroup>
21-
<Company>Aaron Powell</Company>
22-
<RepositoryUrl>https://github.com/aaronpowell/FSharp.CosmosDb</RepositoryUrl>
23-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
24-
</PropertyGroup>
25-
266
<ItemGroup>
277
<Compile Include="../shared/AsyncSeqExt.fs" />
288
<Compile Include="../shared/MaybeBinder.fs" />
@@ -32,4 +12,5 @@
3212
<Compile Include="Cosmos.fs" />
3313
</ItemGroup>
3414
<Import Project="..\..\.paket\Paket.Restore.targets" />
15+
3516
</Project>

0 commit comments

Comments
 (0)