Merge pull request #42 from ekonbenefits/build-stuff

ekonbenefits · Nov 1, 2024 · 923d365 · 923d365
2 parents 414321a + b3fd6ca
commit 923d365
Show file tree

Hide file tree

Showing 10 changed files with 86 additions and 18 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -0,0 +1,23 @@
+name: Build .net core
+
+on: [push]
+
+jobs:
+  build:
+    name: Test ${{ matrix.os }} for dotnet ${{ matrix.dotnet }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        dotnet: [ '8.0.x' ]
+        os: [ubuntu-latest, macOS-latest]
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: ${{ matrix.dotnet }}
+    - name: Build with dotnet core
+      run: dotnet build --configuration Release
+    - name: Tests
+      run: dotnet test DotNetDBF.Test/DotNetDBF.Test.csproj --configuration Release --no-build --no-restore
diff --git a/.github/workflows/dotnet48.yml b/.github/workflows/dotnet48.yml
@@ -0,0 +1,29 @@
+name: .net framework Windows
+
+on: [push]
+
+jobs:
+  build:
+    name: Test Windows .net Framework Only
+    runs-on: windows-2022
+    steps:
+    - uses: actions/checkout@v4
+    - uses: NuGet/setup-nuget@v2
+    - uses: microsoft/setup-msbuild@v2
+      with:
+        dotnet-version: 4.7.2
+
+    - name: Restore
+      run: nuget restore DotNetDBF.sln
+    - name: Build
+      run: msbuild DotNetDBF.sln -t:rebuild -property:Configuration=Release
+    - name: Test
+      uses: josepho0918/vstest-action@0e887de8dcfab5ce3eecaf4ad6320bb9b3ecf633
+      with:
+        testAssembly: DotNetDBF.Test.dll
+        searchFolder: .\DotNetDBF.Test\bin\Release\*\
+        runInParallel: true
+        platform: x64
+    - name: Publish
+      run:
+        dotnet nuget push '${{ github.workspace }}\publish\*.nupkg' --source https://nuget.pkg.github.com/ekonbenefits/index.json --api-key ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,10 @@
 bin
 obj
 /packages
+/publish
 
 *.suo
 
 *.user
 .idea/*
-.vs/*
+.vs/*
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,6 @@
+<Project>
+  <PropertyGroup>
+    <VersionPrefix>7.0.1</VersionPrefix>
+    <VersionSuffix Condition=" '$(GITHUB_RUN_NUMBER)' != '' ">preview$(GITHUB_RUN_NUMBER)</VersionSuffix>
+  </PropertyGroup>
+</Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -0,0 +1,8 @@
+<Project>
+  <Target Name="CopyPackage" AfterTargets="Pack">
+    <Copy
+      SourceFiles="$(OutputPath)$(PackageId).$(PackageVersion).nupkg"
+      DestinationFolder="$(SolutionDir)\publish"
+    />
+  </Target>
+</Project>
diff --git a/DotNetDBF.Enumerable/DotNetDBF.Enumerable.csproj b/DotNetDBF.Enumerable/DotNetDBF.Enumerable.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
     <PackageId>dotnetdbf.enumerable</PackageId>
@@ -12,21 +12,20 @@
     <PackageTags>clipper xbase dbf linq</PackageTags>
     <PackageLicenseExpression>LGPL-2.1-or-later</PackageLicenseExpression>
     <PackageIconUrl>https://github.com/ekonbenefits/dotnetdbf</PackageIconUrl>
-    <RepositoryUrl>https://github.com/ekonbenefits/dotnetdbf.git</RepositoryUrl>
+    <RepositoryUrl>https://github.com/ekonbenefits/dotnetdbf</RepositoryUrl>
     <RepositoryType>gits</RepositoryType>
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <Version>6.0.0.2</Version>
     <IncludeSymbols>True</IncludeSymbols>
     <IncludeSource>True</IncludeSource>
   </PropertyGroup>
   <ItemGroup>
     <None Include="..\Copying.txt" Pack="true" PackagePath="" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ImpromptuInterface" Version="7.0.1" />
@@ -35,4 +34,4 @@
     <ProjectReference Include="..\DotNetDBF\DotNetDBF.csproj" />
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/DotNetDBF.Test/DotNetDBF.Test.csproj b/DotNetDBF.Test/DotNetDBF.Test.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net462</TargetFrameworks>
-    <OutputType Condition="'$(TargetFramework)'!='netcoreapp2.0'">Exe</OutputType>
+    <TargetFrameworks>net8.0;net472</TargetFrameworks>
+    <OutputType Condition="'$(TargetFramework)'=='net472'">Exe</OutputType>
     <Copyright>Copyright ©  2017</Copyright>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.7.1" />
+    <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.*" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.*" />
   </ItemGroup>
@@ -40,4 +40,4 @@
     <EmbeddedResource Include="dbfs\dbase_8b_summary.txt" />
     <EmbeddedResource Include="dbfs\dbase_f5_summary.txt" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/DotNetDBF.Test/Program.cs b/DotNetDBF.Test/Program.cs
@@ -4,7 +4,7 @@
 
 namespace DotNetDBF.Test
 {
-#if !NETCOREAPP2_0
+#if NET472
     public class Program
     {
         public static void Main()

diff --git a/DotNetDBF.Test/Test.cs b/DotNetDBF.Test/Test.cs
@@ -480,14 +480,17 @@ public void ShowPaths()
         [Test]
         public void Test()
         {
+            string test_dir = @"f:\st\dev\testdata";
+            if (!System.IO.Directory.Exists(test_dir))
+                Assert.Ignore();
             using (
                 Stream fis =
-                    File.Open(@"f:\st\dev\testdata\p.dbf",
+                    File.Open($@"{test_dir}\p.dbf" ,
                         FileMode.OpenOrCreate,
                         FileAccess.ReadWrite))
             using (var reader = new DBFReader(fis)
                                 {
-                                    DataMemoLoc = Path.ChangeExtension(@"f:\st\dev\testdata\p.dbf", "DBT")
+                                    DataMemoLoc = Path.ChangeExtension($@"{test_dir}\p.dbf", "DBT")
                                 })
             {
                 var readValues = reader.NextRecord();
@@ -541,4 +544,4 @@ public void ReadSample([CallerMemberName] string name = null)
             }
         }
     }
-}
+}
diff --git a/DotNetDBF/DotNetDBF.csproj b/DotNetDBF/DotNetDBF.csproj
@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net35;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
-    <Version>7.0.0.0</Version>
     <Company>Ekon Benefits</Company>
     <Copyright>Copyright 2009-2017</Copyright>
     <Description>This is a basic file parser for reading and writing xBase DBF files particularlly Clipper. Code originally derived from javadbf.</Description>
@@ -12,7 +11,7 @@
     <Authors>Anil Kumar, Jay Tuley</Authors>
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <RepositoryUrl>https://github.com/ekonbenefits/dotnetdbf.git</RepositoryUrl>
+    <RepositoryUrl>https://github.com/ekonbenefits/dotnetdbf</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <IncludeSymbols>True</IncludeSymbols>
     <IncludeSource>True</IncludeSource>
@@ -24,7 +23,7 @@
     <None Include="..\Copying.txt" Pack="true" PackagePath=""/>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
   </ItemGroup>
 
   <ItemGroup>