Update projects and add CI build

mattjohnsonpint · Oct 31, 2022 · 63a9a2e · 63a9a2e
1 parent 589eeb7
commit 63a9a2e
Show file tree

Hide file tree

Showing 8 changed files with 104 additions and 8 deletions.
diff --git a/src/TimeZoneNames/mj1856_oss.snk → .assets/mattjohnsonpint.snk b/src/TimeZoneNames/mj1856_oss.snk → .assets/mattjohnsonpint.snk
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -0,0 +1,32 @@
+name: build
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+env:
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+  DOTNET_NOLOGO: 1
+
+jobs:
+  build:
+    name: Build
+    runs-on: windows-latest
+
+    steps:
+        - name: Checkout
+          uses: actions/checkout@v3
+
+        - name: Restore
+          run: dotnet restore --nologo
+
+        - name: Run Data Builder
+          run: dotnet run --project src/TimeZoneNames.DataBuilder -c Release --nologo --no-restore
+
+        - name: Build Solution
+          run: dotnet build -c Release --nologo --no-restore
+
+        - name: Test
+          run: dotnet test -c Release --nologo --no-build -l GitHubActions -l "trx;LogFileName=testresults.trx"
diff --git a/.github/workflows/pack-for-release.yaml b/.github/workflows/pack-for-release.yaml
@@ -0,0 +1,38 @@
+name: pack-for-release
+
+on:
+  workflow_dispatch:
+
+env:
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+  DOTNET_NOLOGO: 1
+
+jobs:
+  build-and-pack:
+    runs-on: ubuntu-latest
+
+    steps:
+        - name: Checkout
+          uses: actions/checkout@v3
+
+        - name: Restore
+          run: dotnet restore --nologo
+
+        - name: Run Data Builder
+          run: dotnet run --project src/TimeZoneNames.DataBuilder -c Release --nologo --no-restore
+
+        - name: Build Solution
+          run: dotnet build -c Release --nologo --no-restore
+
+        - name: Test
+          run: dotnet test -c Release --nologo --no-build -l GitHubActions -l "trx;LogFileName=testresults.trx"
+
+        - name: Pack
+          run: dotnet pack -c Release --nologo --no-build
+
+        - name: Archive Artifacts
+          uses: actions/upload-artifact@v3
+          with:
+            name: nuget-packages
+            path: src/**/Release/*.*nupkg
+            if-no-files-found: error
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,18 @@
+<Project>
+
+  <PropertyGroup>
+    <LangVersion>10</LangVersion>
+    <ImplicitUsings>true</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Roslynator.Analyzers" Version="4.1.1" PrivateAssets="All" />
+    <PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="All" />
+  </ItemGroup>
+
+</Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -0,0 +1,5 @@
+<Project>
+  <ItemGroup>
+    <Using Remove="System.Net.Http" />
+  </ItemGroup>
+</Project>
diff --git a/src/TimeZoneNames.DataBuilder/TimeZoneNames.DataBuilder.csproj b/src/TimeZoneNames.DataBuilder/TimeZoneNames.DataBuilder.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
-    <LangVersion>10</LangVersion>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/TimeZoneNames/TimeZoneNames.csproj b/src/TimeZoneNames/TimeZoneNames.csproj
@@ -4,19 +4,22 @@
     <Description>Provides localized time zone names.</Description>
     <Authors>Matt Johnson-Pint</Authors>
     <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0;net462</TargetFrameworks>
-    <LangVersion>10</LangVersion>
     <PackageId>TimeZoneNames</PackageId>
     <PackageTags>timezone;time;zone;time zone;iana;tzdb;olson;timezoneinfo;globalization;international;localization</PackageTags>
     <PackageProjectUrl>https://github.com/mattjohnsonpint/TimeZoneNames</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Version>6.0.0</Version>
+    <Trimmable>true</Trimmable>
   </PropertyGroup>
 
   <PropertyGroup>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <AssemblyOriginatorKeyFile>mj1856_oss.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\..\.assets\mattjohnsonpint.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
-    <Trimmable>true</Trimmable>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
 
   <ItemGroup>
@@ -25,6 +28,7 @@
 
   <ItemGroup>
     <PackageReference Include="TimeZoneConverter" Version="6.0.1" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' != 'net6.0'">

diff --git a/test/TimeZoneNames.Tests/TimeZoneNames.Tests.csproj b/test/TimeZoneNames.Tests/TimeZoneNames.Tests.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFrameworks>net6.0;netcoreapp3.1;net48</TargetFrameworks>
-    <LangVersion>10</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -25,8 +24,8 @@
     <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net48'">
-    <PackageReference Include="System.Collections.Immutable" Version="6.0.0" />
+  <ItemGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
+    <PackageReference Include="GitHubActionsTestLogger" Version="2.0.1" />
   </ItemGroup>
 
 </Project>