From 2f15a682cbb3b0246b9d929563a7379cbb1309a9 Mon Sep 17 00:00:00 2001 From: Dave Lim Date: Wed, 30 Oct 2024 11:00:22 -0500 Subject: [PATCH 01/17] Build system: get stuff to build (and run tests) Mostly updates to target newer framework, and to use newer versions of (deprecated) libraries. - update test to target net8.0 and net472 - leave libraries at older frameworks (because they are 'forward' compatible) - use newer libraries - NUnint - Microsoft.SourceLink.GitHub - Directory.Build.props file to sync nuget package versions for dotnetdbf and dotnetdbf.enumerable - Directory.Build.target file to specify directory to which to publish nuget packages --- .gitignore | 3 ++- Directory.Build.props | 5 +++++ Directory.Build.targets | 8 ++++++++ DotNetDBF.Enumerable/DotNetDBF.Enumerable.csproj | 5 ++--- DotNetDBF.Test/DotNetDBF.Test.csproj | 8 ++++---- DotNetDBF.Test/Program.cs | 2 +- DotNetDBF/DotNetDBF.csproj | 3 +-- 7 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 Directory.Build.props create mode 100644 Directory.Build.targets diff --git a/.gitignore b/.gitignore index bb8f42b..348bf02 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,10 @@ bin obj /packages +/publish *.suo *.user .idea/* -.vs/* \ No newline at end of file +.vs/* diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..8596ae5 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,5 @@ + + + 7.0.1 + + diff --git a/Directory.Build.targets b/Directory.Build.targets new file mode 100644 index 0000000..3b17dd0 --- /dev/null +++ b/Directory.Build.targets @@ -0,0 +1,8 @@ + + + + + diff --git a/DotNetDBF.Enumerable/DotNetDBF.Enumerable.csproj b/DotNetDBF.Enumerable/DotNetDBF.Enumerable.csproj index eadefb1..c2449ae 100644 --- a/DotNetDBF.Enumerable/DotNetDBF.Enumerable.csproj +++ b/DotNetDBF.Enumerable/DotNetDBF.Enumerable.csproj @@ -18,7 +18,6 @@ True snupkg true - 6.0.0.2 True True @@ -26,7 +25,7 @@ - + @@ -35,4 +34,4 @@ - \ No newline at end of file + diff --git a/DotNetDBF.Test/DotNetDBF.Test.csproj b/DotNetDBF.Test/DotNetDBF.Test.csproj index 74974dd..4d04024 100644 --- a/DotNetDBF.Test/DotNetDBF.Test.csproj +++ b/DotNetDBF.Test/DotNetDBF.Test.csproj @@ -1,11 +1,11 @@  - netcoreapp2.0;net462 - Exe + net8.0;net472 + Exe Copyright © 2017 - + @@ -40,4 +40,4 @@ - \ No newline at end of file + diff --git a/DotNetDBF.Test/Program.cs b/DotNetDBF.Test/Program.cs index d68d107..7aff764 100644 --- 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/DotNetDBF.csproj b/DotNetDBF/DotNetDBF.csproj index 2abbf5b..07537bc 100644 --- a/DotNetDBF/DotNetDBF.csproj +++ b/DotNetDBF/DotNetDBF.csproj @@ -3,7 +3,6 @@ net35;netstandard2.0 True sn.snk - 7.0.0.0 Ekon Benefits Copyright 2009-2017 This is a basic file parser for reading and writing xBase DBF files particularlly Clipper. Code originally derived from javadbf. @@ -24,7 +23,7 @@ - + From ccfdc7776331682cb4ba16d9ac5e64394ae2d3c7 Mon Sep 17 00:00:00 2001 From: Dave Lim Date: Wed, 30 Oct 2024 11:39:28 -0500 Subject: [PATCH 02/17] CI: github actions to build project --- .github/workflows/dotnet.yml | 23 ++++++++++++++++++++++ .github/workflows/dotnet48.yml | 36 ++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 .github/workflows/dotnet.yml create mode 100644 .github/workflows/dotnet48.yml diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml new file mode 100644 index 0000000..d2c8b73 --- /dev/null +++ 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, windows-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 new file mode 100644 index 0000000..a0b5666 --- /dev/null +++ b/.github/workflows/dotnet48.yml @@ -0,0 +1,36 @@ +name: Build CrossComple .net core/.net framework Windows + +on: [push] + +jobs: + build: + name: Test Windows .net Framework Only + runs-on: windows-2019 + steps: + - uses: actions/checkout@v4 + + - name: Setup NuGet + uses: NuGet/setup-nuget@v2 + + - name: Setup MSBuild + uses: microsoft/setup-msbuild@v2 + with: + dotnet-version: 4.7.2 + + # - name: Restore Packages + # run: nuget restore DotNetDBF.sln + # - name: Build solution + # run: msbuild DotNetDBF.sln -t:rebuild -property:Configuration=Release + # - name: Run vstests + # uses: microsoft/vstest-action@v1.0.0 + # with: + # testAssembly: Tests.dll + # searchFolder: .\Tests\bin\Release\*\ + # runInParallel: true + # platform: x64 + - name: Restore + run: dotnet restore -p:TargetFramework=net472 + - name: Build + run: dotnet build -f net472 -t:rebuild -property:Configuration=Release + - name: Test + run: dotnet test --configuration Release --no-build --no-restore From 33808ea5add1acdef9744d54b82f289b6271db6c Mon Sep 17 00:00:00 2001 From: davelim Date: Wed, 30 Oct 2024 15:30:43 -0500 Subject: [PATCH 03/17] Build system/CI: attempt to address CI error Sync target framework to net472 to try to address CI error. See: https://github.com/ekonbenefits/dotnetdbf/actions/runs/11601033268/job/32302835750 --- .github/workflows/dotnet48.yml | 2 +- DotNetDBF.Enumerable/DotNetDBF.Enumerable.csproj | 2 +- DotNetDBF/DotNetDBF.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet48.yml b/.github/workflows/dotnet48.yml index a0b5666..2b5b05d 100644 --- a/.github/workflows/dotnet48.yml +++ b/.github/workflows/dotnet48.yml @@ -31,6 +31,6 @@ jobs: - name: Restore run: dotnet restore -p:TargetFramework=net472 - name: Build - run: dotnet build -f net472 -t:rebuild -property:Configuration=Release + run: dotnet build -f net472 --no-restore -t:rebuild -property:Configuration=Release - name: Test run: dotnet test --configuration Release --no-build --no-restore diff --git a/DotNetDBF.Enumerable/DotNetDBF.Enumerable.csproj b/DotNetDBF.Enumerable/DotNetDBF.Enumerable.csproj index c2449ae..34e3655 100644 --- a/DotNetDBF.Enumerable/DotNetDBF.Enumerable.csproj +++ b/DotNetDBF.Enumerable/DotNetDBF.Enumerable.csproj @@ -1,6 +1,6 @@  - net40;netstandard2.0 + net472;netstandard2.0 True sn.snk dotnetdbf.enumerable diff --git a/DotNetDBF/DotNetDBF.csproj b/DotNetDBF/DotNetDBF.csproj index 07537bc..acf18ed 100644 --- a/DotNetDBF/DotNetDBF.csproj +++ b/DotNetDBF/DotNetDBF.csproj @@ -1,6 +1,6 @@  - net35;netstandard2.0 + net472;netstandard2.0 True sn.snk Ekon Benefits From 8f394c4757210b75f51575afa776f0a64e38ace3 Mon Sep 17 00:00:00 2001 From: davelim Date: Wed, 30 Oct 2024 15:37:20 -0500 Subject: [PATCH 04/17] CI: minor cleanup --- .github/workflows/dotnet48.yml | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/.github/workflows/dotnet48.yml b/.github/workflows/dotnet48.yml index 2b5b05d..cdb3de6 100644 --- a/.github/workflows/dotnet48.yml +++ b/.github/workflows/dotnet48.yml @@ -8,26 +8,11 @@ jobs: runs-on: windows-2019 steps: - uses: actions/checkout@v4 - - - name: Setup NuGet - uses: NuGet/setup-nuget@v2 - - - name: Setup MSBuild - uses: microsoft/setup-msbuild@v2 + - uses: NuGet/setup-nuget@v2 + - uses: microsoft/setup-msbuild@v2 with: dotnet-version: 4.7.2 - # - name: Restore Packages - # run: nuget restore DotNetDBF.sln - # - name: Build solution - # run: msbuild DotNetDBF.sln -t:rebuild -property:Configuration=Release - # - name: Run vstests - # uses: microsoft/vstest-action@v1.0.0 - # with: - # testAssembly: Tests.dll - # searchFolder: .\Tests\bin\Release\*\ - # runInParallel: true - # platform: x64 - name: Restore run: dotnet restore -p:TargetFramework=net472 - name: Build From fefcaf3bead3ab80c9fd3636cd35b73d42647730 Mon Sep 17 00:00:00 2001 From: davelim Date: Wed, 30 Oct 2024 16:26:17 -0500 Subject: [PATCH 05/17] Test/CI: conditionally run test Only run test if test directory/file exists. --- DotNetDBF.Test/Test.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/DotNetDBF.Test/Test.cs b/DotNetDBF.Test/Test.cs index 6d1a775..91d77fb 100644 --- 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) } } } -} \ No newline at end of file +} From 50bf8f1db25331bf98ead8dce8f9999ad04477d0 Mon Sep 17 00:00:00 2001 From: davelim Date: Thu, 31 Oct 2024 15:04:40 -0500 Subject: [PATCH 06/17] Build: add build number --- Directory.Build.props | 1 + 1 file changed, 1 insertion(+) diff --git a/Directory.Build.props b/Directory.Build.props index 8596ae5..421b7eb 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,5 +1,6 @@ 7.0.1 + preview$(GITHUB_RUN_NUMBER) From 219edb143fc10c1c66fd4de6cfb0104d3a1993fb Mon Sep 17 00:00:00 2001 From: davelim Date: Thu, 31 Oct 2024 15:20:09 -0500 Subject: [PATCH 07/17] CI: publish NuGet packages --- .github/workflows/dotnet.yml | 7 ++++++- .github/workflows/dotnet48.yml | 2 +- DotNetDBF.Enumerable/DotNetDBF.Enumerable.csproj | 2 +- DotNetDBF/DotNetDBF.csproj | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index d2c8b73..1aa6242 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -20,4 +20,9 @@ jobs: - 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 + run: dotnet test DotNetDBF.Test/DotNetDBF.Test.cspr"oj --configuration Release --no-build --no-restore + - name: Publish + run: dotnet nuget push publish/* --source https://nuget.pkg.github.com/ekonbenefits/index.json --api-key ${GITHUB_TOKEN} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + if: matrix.os == 'windows-latest' diff --git a/.github/workflows/dotnet48.yml b/.github/workflows/dotnet48.yml index cdb3de6..da4c322 100644 --- a/.github/workflows/dotnet48.yml +++ b/.github/workflows/dotnet48.yml @@ -12,7 +12,7 @@ jobs: - uses: microsoft/setup-msbuild@v2 with: dotnet-version: 4.7.2 - + - name: Restore run: dotnet restore -p:TargetFramework=net472 - name: Build diff --git a/DotNetDBF.Enumerable/DotNetDBF.Enumerable.csproj b/DotNetDBF.Enumerable/DotNetDBF.Enumerable.csproj index 34e3655..ce74734 100644 --- a/DotNetDBF.Enumerable/DotNetDBF.Enumerable.csproj +++ b/DotNetDBF.Enumerable/DotNetDBF.Enumerable.csproj @@ -12,7 +12,7 @@ clipper xbase dbf linq LGPL-2.1-or-later https://github.com/ekonbenefits/dotnetdbf - https://github.com/ekonbenefits/dotnetdbf.git + https://github.com/ekonbenefits/dotnetdbf gits True True diff --git a/DotNetDBF/DotNetDBF.csproj b/DotNetDBF/DotNetDBF.csproj index acf18ed..9ee656c 100644 --- a/DotNetDBF/DotNetDBF.csproj +++ b/DotNetDBF/DotNetDBF.csproj @@ -11,7 +11,7 @@ Anil Kumar, Jay Tuley True True - https://github.com/ekonbenefits/dotnetdbf.git + https://github.com/ekonbenefits/dotnetdbf git True True From 60f1b048cfacb348f058a80341fdb2fc9b978dbe Mon Sep 17 00:00:00 2001 From: davelim Date: Thu, 31 Oct 2024 15:27:29 -0500 Subject: [PATCH 08/17] CI: fix typo --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 1aa6242..a52c05e 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -20,7 +20,7 @@ jobs: - name: Build with dotnet core run: dotnet build --configuration Release - name: Tests - run: dotnet test DotNetDBF.Test/DotNetDBF.Test.cspr"oj --configuration Release --no-build --no-restore + run: dotnet test DotNetDBF.Test/DotNetDBF.Test.csproj --configuration Release --no-build --no-restore - name: Publish run: dotnet nuget push publish/* --source https://nuget.pkg.github.com/ekonbenefits/index.json --api-key ${GITHUB_TOKEN} env: From 25ad012e4197a874cddc83cede1003ac1ea9e11e Mon Sep 17 00:00:00 2001 From: davelim Date: Thu, 31 Oct 2024 15:40:49 -0500 Subject: [PATCH 09/17] CI: fix glob --- .github/workflows/dotnet.yml | 5 ++--- .github/workflows/dotnet48.yml | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index a52c05e..04537f1 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -22,7 +22,6 @@ jobs: - name: Tests run: dotnet test DotNetDBF.Test/DotNetDBF.Test.csproj --configuration Release --no-build --no-restore - name: Publish - run: dotnet nuget push publish/* --source https://nuget.pkg.github.com/ekonbenefits/index.json --api-key ${GITHUB_TOKEN} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: + dotnet nuget push "publish/*.nupkg" --source https://nuget.pkg.github.com/ekonbenefits/index.json --api-key ${{ secrets.GITHUB_TOKEN }} if: matrix.os == 'windows-latest' diff --git a/.github/workflows/dotnet48.yml b/.github/workflows/dotnet48.yml index da4c322..ded2023 100644 --- a/.github/workflows/dotnet48.yml +++ b/.github/workflows/dotnet48.yml @@ -1,4 +1,4 @@ -name: Build CrossComple .net core/.net framework Windows +name: .net framework Windows on: [push] From 1ee0ee6a0485b0069df5caf7d5d4ab10b7cdc8e3 Mon Sep 17 00:00:00 2001 From: davelim Date: Thu, 31 Oct 2024 15:53:43 -0500 Subject: [PATCH 10/17] CI: More CI fixes --- .github/workflows/dotnet.yml | 6 +----- .github/workflows/dotnet48.yml | 14 +++++++++++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 04537f1..bf6f3b3 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: dotnet: [ '8.0.x' ] - os: [ubuntu-latest, windows-latest, macOS-latest] + os: [ubuntu-latest, macOS-latest] steps: - uses: actions/checkout@v1 @@ -21,7 +21,3 @@ jobs: run: dotnet build --configuration Release - name: Tests run: dotnet test DotNetDBF.Test/DotNetDBF.Test.csproj --configuration Release --no-build --no-restore - - name: Publish - run: - dotnet nuget push "publish/*.nupkg" --source https://nuget.pkg.github.com/ekonbenefits/index.json --api-key ${{ secrets.GITHUB_TOKEN }} - if: matrix.os == 'windows-latest' diff --git a/.github/workflows/dotnet48.yml b/.github/workflows/dotnet48.yml index ded2023..6b37d0b 100644 --- a/.github/workflows/dotnet48.yml +++ b/.github/workflows/dotnet48.yml @@ -14,8 +14,16 @@ jobs: dotnet-version: 4.7.2 - name: Restore - run: dotnet restore -p:TargetFramework=net472 + run: nuget restore DotNetDBF.sln - name: Build - run: dotnet build -f net472 --no-restore -t:rebuild -property:Configuration=Release + run: msbuild DotNetDBF.sln --no-restore -t:rebuild -property:Configuration=Release - name: Test - run: dotnet test --configuration Release --no-build --no-restore + uses: microsoft/vstest-action@v1.0.0 + with: + testAssembly: DotNetDBF.Test.dll + searchFolder: .\DotNetDBF.Test\bin\Release\*\ + runInParallel: true + platform: x64 + - name: Publish + run: + dotnet nuget push "publish/*.nupkg" --source https://nuget.pkg.github.com/ekonbenefits/index.json --api-key ${{ secrets.GITHUB_TOKEN }} From 09736f1319dd03b2d334654cca0ccc93edf34e5f Mon Sep 17 00:00:00 2001 From: davelim Date: Thu, 31 Oct 2024 15:57:09 -0500 Subject: [PATCH 11/17] CI: more fixes Try newer OS to get newer framework. --- .github/workflows/dotnet48.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet48.yml b/.github/workflows/dotnet48.yml index 6b37d0b..e4b9dd4 100644 --- a/.github/workflows/dotnet48.yml +++ b/.github/workflows/dotnet48.yml @@ -5,7 +5,7 @@ on: [push] jobs: build: name: Test Windows .net Framework Only - runs-on: windows-2019 + runs-on: windows-2022 steps: - uses: actions/checkout@v4 - uses: NuGet/setup-nuget@v2 From 8033e8d150aac033f5fe613d9a35750034c4dec2 Mon Sep 17 00:00:00 2001 From: davelim Date: Thu, 31 Oct 2024 16:05:16 -0500 Subject: [PATCH 12/17] CI: fix MSBuild does not support --no-restore. --- .github/workflows/dotnet48.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet48.yml b/.github/workflows/dotnet48.yml index e4b9dd4..8374101 100644 --- a/.github/workflows/dotnet48.yml +++ b/.github/workflows/dotnet48.yml @@ -16,7 +16,7 @@ jobs: - name: Restore run: nuget restore DotNetDBF.sln - name: Build - run: msbuild DotNetDBF.sln --no-restore -t:rebuild -property:Configuration=Release + run: msbuild DotNetDBF.sln -t:rebuild -property:Configuration=Release - name: Test uses: microsoft/vstest-action@v1.0.0 with: From 2b7505f0beb7feb90a099a984795aaf8da64bcc4 Mon Sep 17 00:00:00 2001 From: davelim Date: Thu, 31 Oct 2024 16:18:33 -0500 Subject: [PATCH 13/17] CI: use updated vstest image --- .github/workflows/dotnet48.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet48.yml b/.github/workflows/dotnet48.yml index 8374101..893cfa2 100644 --- a/.github/workflows/dotnet48.yml +++ b/.github/workflows/dotnet48.yml @@ -18,7 +18,7 @@ jobs: - name: Build run: msbuild DotNetDBF.sln -t:rebuild -property:Configuration=Release - name: Test - uses: microsoft/vstest-action@v1.0.0 + uses: josepho0918/vstest-action@v1.0.0 with: testAssembly: DotNetDBF.Test.dll searchFolder: .\DotNetDBF.Test\bin\Release\*\ From 6560ccff70450ab40f7a9957d547e466ba4b569a Mon Sep 17 00:00:00 2001 From: davelim Date: Thu, 31 Oct 2024 16:25:29 -0500 Subject: [PATCH 14/17] CI: fix No version tags yet, use (git)hash instead. --- .github/workflows/dotnet48.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet48.yml b/.github/workflows/dotnet48.yml index 893cfa2..875966a 100644 --- a/.github/workflows/dotnet48.yml +++ b/.github/workflows/dotnet48.yml @@ -18,7 +18,7 @@ jobs: - name: Build run: msbuild DotNetDBF.sln -t:rebuild -property:Configuration=Release - name: Test - uses: josepho0918/vstest-action@v1.0.0 + uses: josepho0918/vstest-action@0e887de with: testAssembly: DotNetDBF.Test.dll searchFolder: .\DotNetDBF.Test\bin\Release\*\ From dd28407cac607f91fbef761e458750a0e5127d43 Mon Sep 17 00:00:00 2001 From: davelim Date: Thu, 31 Oct 2024 16:28:07 -0500 Subject: [PATCH 15/17] CI: fix Shortened hash not supported, use full commmit SHA instead. --- .github/workflows/dotnet48.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet48.yml b/.github/workflows/dotnet48.yml index 875966a..ec130a8 100644 --- a/.github/workflows/dotnet48.yml +++ b/.github/workflows/dotnet48.yml @@ -18,7 +18,7 @@ jobs: - name: Build run: msbuild DotNetDBF.sln -t:rebuild -property:Configuration=Release - name: Test - uses: josepho0918/vstest-action@0e887de + uses: josepho0918/vstest-action@0e887de8dcfab5ce3eecaf4ad6320bb9b3ecf633 with: testAssembly: DotNetDBF.Test.dll searchFolder: .\DotNetDBF.Test\bin\Release\*\ From 9a746cc8d8022f2ee2bfd51fc6fe20540b2b7bc1 Mon Sep 17 00:00:00 2001 From: davelim Date: Thu, 31 Oct 2024 16:58:10 -0500 Subject: [PATCH 16/17] CI: fix Fix glob expression. --- .github/workflows/dotnet48.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet48.yml b/.github/workflows/dotnet48.yml index ec130a8..ae86181 100644 --- a/.github/workflows/dotnet48.yml +++ b/.github/workflows/dotnet48.yml @@ -26,4 +26,4 @@ jobs: platform: x64 - name: Publish run: - dotnet nuget push "publish/*.nupkg" --source https://nuget.pkg.github.com/ekonbenefits/index.json --api-key ${{ secrets.GITHUB_TOKEN }} + dotnet nuget push '${{ github.workspace }}/publish/*.nupkg' --source https://nuget.pkg.github.com/ekonbenefits/index.json --api-key ${{ secrets.GITHUB_TOKEN }} From b3fd6ca6c0ff99f76d3b3b83feb82737f0758d11 Mon Sep 17 00:00:00 2001 From: davelim Date: Thu, 31 Oct 2024 17:10:36 -0500 Subject: [PATCH 17/17] CI: fix Another attempt to fix glob expression. --- .github/workflows/dotnet48.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet48.yml b/.github/workflows/dotnet48.yml index ae86181..78fbccd 100644 --- a/.github/workflows/dotnet48.yml +++ b/.github/workflows/dotnet48.yml @@ -26,4 +26,4 @@ jobs: 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 }} + dotnet nuget push '${{ github.workspace }}\publish\*.nupkg' --source https://nuget.pkg.github.com/ekonbenefits/index.json --api-key ${{ secrets.GITHUB_TOKEN }}