Skip to content

Commit 3027cdf

Browse files
committed
Build/packaging updates
Uses embedded symbols to help debugging over a symbols package Uses Build Versioning for versioning
1 parent 2f4b68a commit 3027cdf

File tree

2 files changed

+30
-35
lines changed

2 files changed

+30
-35
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,26 +28,21 @@ jobs:
2828
steps:
2929
- name: Checkout
3030
uses: actions/checkout@v2
31-
- name: Setup dotnet 2.1
31+
- name: Setup dotnet 3.1 5.0 6.0
3232
uses: actions/setup-dotnet@v1
3333
with:
34-
dotnet-version: '2.1.x'
35-
- name: Setup dotnet 3.1
36-
uses: actions/setup-dotnet@v1
37-
with:
38-
dotnet-version: '3.1.x'
39-
- name: Setup dotnet 5.0
40-
uses: actions/setup-dotnet@v1
41-
with:
42-
dotnet-version: '5.0.x'
34+
dotnet-version: |
35+
3.1.x
36+
5.0.x
37+
6.0.x
4338
- name: Install dependencies
4439
run: dotnet restore
4540
- name: Build
46-
run: dotnet build --no-restore -c Release
41+
run: dotnet build --no-restore -c Release /p:ContinuousIntegrationBuild=true
4742
- name: Test with Coverage
4843
run: dotnet test --no-restore --logger trx --results-directory ${{env.BUILD_ARTIFACT_PATH}}/coverage --collect "XPlat Code Coverage" --settings CodeCoverage.runsettings /p:SkipBuildVersioning=true
4944
- name: Pack
50-
run: dotnet pack --no-build -c Release /p:PackageOutputPath=${{env.BUILD_ARTIFACT_PATH}}
45+
run: dotnet pack --no-build -c Release /p:PackageOutputPath=${{env.BUILD_ARTIFACT_PATH}} /p:ContinuousIntegrationBuild=true
5146
- name: Publish artifacts
5247
uses: actions/upload-artifact@v2
5348
with:
@@ -96,7 +91,7 @@ jobs:
9691
- name: 'Add NuGet source'
9792
run: dotnet nuget add source https://nuget.pkg.github.com/TurnerSoftware/index.json --name GitHub --username Turnerj --password ${{secrets.GITHUB_TOKEN}} --store-password-in-clear-text
9893
- name: 'Upload NuGet package'
99-
run: dotnet nuget push *.nupkg --api-key ${{secrets.GH_PACKAGE_REGISTRY_API_KEY}} --source GitHub --skip-duplicate --no-symbols true
94+
run: dotnet nuget push *.nupkg --api-key ${{secrets.GH_PACKAGE_REGISTRY_API_KEY}} --source GitHub --skip-duplicate
10095

10196
push-to-nuget:
10297
name: 'Push NuGet Packages'

src/Directory.Build.props

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
<Project>
22

3-
<PropertyGroup>
4-
<RootNamespace>InfinityCrawler</RootNamespace>
3+
<PropertyGroup>
4+
<RootNamespace>InfinityCrawler</RootNamespace>
55

6-
<Company>Turner Software</Company>
6+
<Company>Turner Software</Company>
77

8-
<PackageId>$(AssemblyName)</PackageId>
9-
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
10-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
11-
<PackageIcon>icon.png</PackageIcon>
12-
<PackageProjectUrl>https://github.com/TurnerSoftware/InfinityCrawler</PackageProjectUrl>
13-
<PackageBaseTags>crawler;robot;spider</PackageBaseTags>
8+
<PackageId>$(AssemblyName)</PackageId>
9+
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
10+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
11+
<PackageIcon>icon.png</PackageIcon>
12+
<PackageProjectUrl>https://github.com/TurnerSoftware/InfinityCrawler</PackageProjectUrl>
13+
<PackageBaseTags>crawler;robot;spider</PackageBaseTags>
1414

15-
<!-- SourceLink Support -->
16-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
17-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
18-
<IncludeSymbols>true</IncludeSymbols>
19-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
15+
<!-- SourceLink Support -->
16+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
17+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
18+
<DebugType>embedded</DebugType>
2019

21-
<LangVersion>Latest</LangVersion>
22-
</PropertyGroup>
23-
<ItemGroup>
24-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
25-
</ItemGroup>
20+
<LangVersion>Latest</LangVersion>
21+
</PropertyGroup>
22+
<ItemGroup>
23+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
24+
<PackageReference Include="TurnerSoftware.BuildVersioning" Version="0.4.0" PrivateAssets="All" />
25+
</ItemGroup>
2626

27-
<ItemGroup>
28-
<None Include="..\..\images\$(PackageIcon)" Pack="true" PackagePath="/" />
29-
</ItemGroup>
27+
<ItemGroup>
28+
<None Include="..\..\images\$(PackageIcon)" Pack="true" PackagePath="/" />
29+
</ItemGroup>
3030

3131
</Project>

0 commit comments

Comments
 (0)