Skip to content

Commit 63a9a2e

Browse files
mattjohnsonpintmattjohnsonpint
committed
Update projects and add CI build
1 parent 589eeb7 commit 63a9a2e

File tree

8 files changed

+104
-8
lines changed

8 files changed

+104
-8
lines changed

‎src/TimeZoneNames/mj1856_oss.snk‎ renamed to ‎.assets/mattjohnsonpint.snk‎

File renamed without changes.

‎.github/workflows/build.yaml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: build
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
9+
env:
10+
DOTNET_CLI_TELEMETRY_OPTOUT: 1
11+
DOTNET_NOLOGO: 1
12+
13+
jobs:
14+
build:
15+
name: Build
16+
runs-on: windows-latest
17+
18+
steps:
19+
- name: Checkout
20+
uses: actions/checkout@v3
21+
22+
- name: Restore
23+
run: dotnet restore --nologo
24+
25+
- name: Run Data Builder
26+
run: dotnet run --project src/TimeZoneNames.DataBuilder -c Release --nologo --no-restore
27+
28+
- name: Build Solution
29+
run: dotnet build -c Release --nologo --no-restore
30+
31+
- name: Test
32+
run: dotnet test -c Release --nologo --no-build -l GitHubActions -l "trx;LogFileName=testresults.trx"

‎.github/workflows/pack-for-release.yaml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: pack-for-release
2+
3+
on:
4+
workflow_dispatch:
5+
6+
env:
7+
DOTNET_CLI_TELEMETRY_OPTOUT: 1
8+
DOTNET_NOLOGO: 1
9+
10+
jobs:
11+
build-and-pack:
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v3
17+
18+
- name: Restore
19+
run: dotnet restore --nologo
20+
21+
- name: Run Data Builder
22+
run: dotnet run --project src/TimeZoneNames.DataBuilder -c Release --nologo --no-restore
23+
24+
- name: Build Solution
25+
run: dotnet build -c Release --nologo --no-restore
26+
27+
- name: Test
28+
run: dotnet test -c Release --nologo --no-build -l GitHubActions -l "trx;LogFileName=testresults.trx"
29+
30+
- name: Pack
31+
run: dotnet pack -c Release --nologo --no-build
32+
33+
- name: Archive Artifacts
34+
uses: actions/upload-artifact@v3
35+
with:
36+
name: nuget-packages
37+
path: src/**/Release/*.*nupkg
38+
if-no-files-found: error

‎Directory.Build.props‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<LangVersion>10</LangVersion>
5+
<ImplicitUsings>true</ImplicitUsings>
6+
<Nullable>enable</Nullable>
7+
</PropertyGroup>
8+
9+
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
10+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
11+
</PropertyGroup>
12+
13+
<ItemGroup>
14+
<PackageReference Include="Roslynator.Analyzers" Version="4.1.1" PrivateAssets="All" />
15+
<PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="All" />
16+
</ItemGroup>
17+
18+
</Project>

‎Directory.Build.targets‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<Project>
2+
<ItemGroup>
3+
<Using Remove="System.Net.Http" />
4+
</ItemGroup>
5+
</Project>

‎src/TimeZoneNames.DataBuilder/TimeZoneNames.DataBuilder.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
55
<OutputType>Exe</OutputType>
6-
<LangVersion>10</LangVersion>
6+
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>

‎src/TimeZoneNames/TimeZoneNames.csproj‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,22 @@
44
<Description>Provides localized time zone names.</Description>
55
<Authors>Matt Johnson-Pint</Authors>
66
<TargetFrameworks>net6.0;netstandard2.1;netstandard2.0;net462</TargetFrameworks>
7-
<LangVersion>10</LangVersion>
87
<PackageId>TimeZoneNames</PackageId>
98
<PackageTags>timezone;time;zone;time zone;iana;tzdb;olson;timezoneinfo;globalization;international;localization</PackageTags>
109
<PackageProjectUrl>https://github.com/mattjohnsonpint/TimeZoneNames</PackageProjectUrl>
1110
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1211
<Version>6.0.0</Version>
12+
<Trimmable>true</Trimmable>
1313
</PropertyGroup>
1414

1515
<PropertyGroup>
16-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
17-
<AssemblyOriginatorKeyFile>mj1856_oss.snk</AssemblyOriginatorKeyFile>
16+
<AssemblyOriginatorKeyFile>..\..\.assets\mattjohnsonpint.snk</AssemblyOriginatorKeyFile>
1817
<SignAssembly>true</SignAssembly>
19-
<Trimmable>true</Trimmable>
18+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
19+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
20+
<IncludeSymbols>true</IncludeSymbols>
21+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
22+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2023
</PropertyGroup>
2124

2225
<ItemGroup>
@@ -25,6 +28,7 @@
2528

2629
<ItemGroup>
2730
<PackageReference Include="TimeZoneConverter" Version="6.0.1" />
31+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
2832
</ItemGroup>
2933

3034
<ItemGroup Condition="'$(TargetFramework)' != 'net6.0'">

‎test/TimeZoneNames.Tests/TimeZoneNames.Tests.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>net6.0;netcoreapp3.1;net48</TargetFrameworks>
5-
<LangVersion>10</LangVersion>
65
</PropertyGroup>
76

87
<ItemGroup>
@@ -25,8 +24,8 @@
2524
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
2625
</ItemGroup>
2726

28-
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
29-
<PackageReference Include="System.Collections.Immutable" Version="6.0.0" />
27+
<ItemGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
28+
<PackageReference Include="GitHubActionsTestLogger" Version="2.0.1" />
3029
</ItemGroup>
3130

3231
</Project>

0 commit comments

Comments
 (0)