Skip to content

Commit 844f147

Browse files
pimbrouwerspimbrouwers
committed
1.0.3, build script, test updated to net9.0
1 parent 1aa82f8 commit 844f147

11 files changed

Lines changed: 183 additions & 268 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: build
2+
3+
on:
4+
push:
5+
branches: [master]
6+
pull_request:
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v4
13+
14+
- name: Setup .NET Core SDK
15+
uses: actions/setup-dotnet@v4
16+
with:
17+
dotnet-version: 9.0.x
18+
19+
- name: Install dependencies
20+
run: dotnet restore src/Jay
21+
22+
- name: Build
23+
run: dotnet build src/Jay -c Release
24+
25+
- name: Test
26+
run: dotnet test test/Jay.Tests -c Release

‎.travis.yml‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎Build.ps1‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
[CmdletBinding()]
2+
param (
3+
[Parameter(HelpMessage="The action to execute.")]
4+
[ValidateSet("Build", "Test", "Pack")]
5+
[string] $Action = "Build",
6+
7+
[Parameter(HelpMessage="The msbuild configuration to use.")]
8+
[ValidateSet("Debug", "Release")]
9+
[string] $Configuration = "Debug",
10+
11+
[switch] $SkipClean
12+
)
13+
14+
function RunCommand {
15+
param ([string] $CommandExpr)
16+
Write-Verbose " $CommandExpr"
17+
Invoke-Expression $CommandExpr
18+
}
19+
20+
$rootDir = $PSScriptRoot
21+
$srcDir = Join-Path -Path $rootDir -ChildPath 'src'
22+
$testDir = Join-Path -Path $rootDir -ChildPath 'test'
23+
$projectDir = Join-Path -Path $srcDir -ChildPath 'Jay'
24+
25+
if ($Action -eq "Test")
26+
{
27+
$projectdir = Join-Path -Path $testDir -ChildPath 'Jay.Tests'
28+
}
29+
30+
if (!$SkipClean)
31+
{
32+
RunCommand "dotnet restore $projectDir --force --force-evaluate --nologo --verbosity quiet"
33+
RunCommand "dotnet clean $projectDir -c $Configuration --nologo --verbosity quiet"
34+
}
35+
36+
switch ($Action) {
37+
"Test" { RunCommand "dotnet test `"$projectDir`"" }
38+
"Pack" { RunCommand "dotnet pack `"$projectDir`" -c $Configuration --include-symbols --include-source" }
39+
Default { RunCommand "dotnet build `"$projectDir`" -c $Configuration" }
40+
}

‎CHANGELOG.md‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Changelog
2+
3+
All notable changes to this project will be documented in this file.
4+
5+
## [1.0.3] - 6/6/2025
6+
7+
### Added
8+
9+
- Support for JSON with comments. See [this](http://github.com/pimbrouwers/jay/issues/4) issue. Thanks to @numpsy.
10+
11+
## [1.0.2] - 7/10/2020
12+
13+
* Replacement commit for 1.0.1
14+
15+
### Added
16+
17+
- `AsPropertyArray` extension method.
18+
19+
### Changed
20+
21+
- Static extensions, replacing implicit extensions, for primitive type conversions.
22+
23+
### Fixed
24+
25+
- Improved `Json.tryParseStream` error handling
26+
27+
## [1.0.1] - 7/10/2020
28+
29+
* Committed with only partially saved files, immediately proceeded by 1.0.2.
30+
31+
## [1.0.0] - 4/18/2020
32+
33+
Hello world!

‎Jay.sln‎

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26124.0
5-
MinimumVisualStudioVersion = 15.0.26124.0
6-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2B0BC292-A457-4B4F-8745-BD01882904C6}"
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.31903.59
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
77
EndProject
8-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Jay", "src\Jay\Jay.fsproj", "{05A518DB-8EEC-415C-99E2-45B6969951FF}"
8+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Jay", "src\Jay\Jay.fsproj", "{AD07114B-6AE9-46B1-90D9-555C91051FCA}"
99
EndProject
10-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Jay.Tests", "src\Jay.Tests\Jay.Tests.fsproj", "{4FA1E5EB-A158-453A-B3F5-934C0E293FD9}"
10+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0C88DD14-F956-CE84-757C-A364CCF449FC}"
11+
EndProject
12+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Jay.Tests", "test\Jay.Tests\Jay.Tests.fsproj", "{018588CC-3A4D-4E40-BDCA-F8F83DCFF743}"
1113
EndProject
1214
Global
1315
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -18,37 +20,37 @@ Global
1820
Release|x64 = Release|x64
1921
Release|x86 = Release|x86
2022
EndGlobalSection
23+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
24+
{AD07114B-6AE9-46B1-90D9-555C91051FCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
25+
{AD07114B-6AE9-46B1-90D9-555C91051FCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
26+
{AD07114B-6AE9-46B1-90D9-555C91051FCA}.Debug|x64.ActiveCfg = Debug|Any CPU
27+
{AD07114B-6AE9-46B1-90D9-555C91051FCA}.Debug|x64.Build.0 = Debug|Any CPU
28+
{AD07114B-6AE9-46B1-90D9-555C91051FCA}.Debug|x86.ActiveCfg = Debug|Any CPU
29+
{AD07114B-6AE9-46B1-90D9-555C91051FCA}.Debug|x86.Build.0 = Debug|Any CPU
30+
{AD07114B-6AE9-46B1-90D9-555C91051FCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
31+
{AD07114B-6AE9-46B1-90D9-555C91051FCA}.Release|Any CPU.Build.0 = Release|Any CPU
32+
{AD07114B-6AE9-46B1-90D9-555C91051FCA}.Release|x64.ActiveCfg = Release|Any CPU
33+
{AD07114B-6AE9-46B1-90D9-555C91051FCA}.Release|x64.Build.0 = Release|Any CPU
34+
{AD07114B-6AE9-46B1-90D9-555C91051FCA}.Release|x86.ActiveCfg = Release|Any CPU
35+
{AD07114B-6AE9-46B1-90D9-555C91051FCA}.Release|x86.Build.0 = Release|Any CPU
36+
{018588CC-3A4D-4E40-BDCA-F8F83DCFF743}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
37+
{018588CC-3A4D-4E40-BDCA-F8F83DCFF743}.Debug|Any CPU.Build.0 = Debug|Any CPU
38+
{018588CC-3A4D-4E40-BDCA-F8F83DCFF743}.Debug|x64.ActiveCfg = Debug|Any CPU
39+
{018588CC-3A4D-4E40-BDCA-F8F83DCFF743}.Debug|x64.Build.0 = Debug|Any CPU
40+
{018588CC-3A4D-4E40-BDCA-F8F83DCFF743}.Debug|x86.ActiveCfg = Debug|Any CPU
41+
{018588CC-3A4D-4E40-BDCA-F8F83DCFF743}.Debug|x86.Build.0 = Debug|Any CPU
42+
{018588CC-3A4D-4E40-BDCA-F8F83DCFF743}.Release|Any CPU.ActiveCfg = Release|Any CPU
43+
{018588CC-3A4D-4E40-BDCA-F8F83DCFF743}.Release|Any CPU.Build.0 = Release|Any CPU
44+
{018588CC-3A4D-4E40-BDCA-F8F83DCFF743}.Release|x64.ActiveCfg = Release|Any CPU
45+
{018588CC-3A4D-4E40-BDCA-F8F83DCFF743}.Release|x64.Build.0 = Release|Any CPU
46+
{018588CC-3A4D-4E40-BDCA-F8F83DCFF743}.Release|x86.ActiveCfg = Release|Any CPU
47+
{018588CC-3A4D-4E40-BDCA-F8F83DCFF743}.Release|x86.Build.0 = Release|Any CPU
48+
EndGlobalSection
2149
GlobalSection(SolutionProperties) = preSolution
2250
HideSolutionNode = FALSE
2351
EndGlobalSection
24-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
25-
{05A518DB-8EEC-415C-99E2-45B6969951FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
26-
{05A518DB-8EEC-415C-99E2-45B6969951FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
27-
{05A518DB-8EEC-415C-99E2-45B6969951FF}.Debug|x64.ActiveCfg = Debug|Any CPU
28-
{05A518DB-8EEC-415C-99E2-45B6969951FF}.Debug|x64.Build.0 = Debug|Any CPU
29-
{05A518DB-8EEC-415C-99E2-45B6969951FF}.Debug|x86.ActiveCfg = Debug|Any CPU
30-
{05A518DB-8EEC-415C-99E2-45B6969951FF}.Debug|x86.Build.0 = Debug|Any CPU
31-
{05A518DB-8EEC-415C-99E2-45B6969951FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
32-
{05A518DB-8EEC-415C-99E2-45B6969951FF}.Release|Any CPU.Build.0 = Release|Any CPU
33-
{05A518DB-8EEC-415C-99E2-45B6969951FF}.Release|x64.ActiveCfg = Release|Any CPU
34-
{05A518DB-8EEC-415C-99E2-45B6969951FF}.Release|x64.Build.0 = Release|Any CPU
35-
{05A518DB-8EEC-415C-99E2-45B6969951FF}.Release|x86.ActiveCfg = Release|Any CPU
36-
{05A518DB-8EEC-415C-99E2-45B6969951FF}.Release|x86.Build.0 = Release|Any CPU
37-
{4FA1E5EB-A158-453A-B3F5-934C0E293FD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38-
{4FA1E5EB-A158-453A-B3F5-934C0E293FD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
39-
{4FA1E5EB-A158-453A-B3F5-934C0E293FD9}.Debug|x64.ActiveCfg = Debug|Any CPU
40-
{4FA1E5EB-A158-453A-B3F5-934C0E293FD9}.Debug|x64.Build.0 = Debug|Any CPU
41-
{4FA1E5EB-A158-453A-B3F5-934C0E293FD9}.Debug|x86.ActiveCfg = Debug|Any CPU
42-
{4FA1E5EB-A158-453A-B3F5-934C0E293FD9}.Debug|x86.Build.0 = Debug|Any CPU
43-
{4FA1E5EB-A158-453A-B3F5-934C0E293FD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
44-
{4FA1E5EB-A158-453A-B3F5-934C0E293FD9}.Release|Any CPU.Build.0 = Release|Any CPU
45-
{4FA1E5EB-A158-453A-B3F5-934C0E293FD9}.Release|x64.ActiveCfg = Release|Any CPU
46-
{4FA1E5EB-A158-453A-B3F5-934C0E293FD9}.Release|x64.Build.0 = Release|Any CPU
47-
{4FA1E5EB-A158-453A-B3F5-934C0E293FD9}.Release|x86.ActiveCfg = Release|Any CPU
48-
{4FA1E5EB-A158-453A-B3F5-934C0E293FD9}.Release|x86.Build.0 = Release|Any CPU
49-
EndGlobalSection
5052
GlobalSection(NestedProjects) = preSolution
51-
{05A518DB-8EEC-415C-99E2-45B6969951FF} = {2B0BC292-A457-4B4F-8745-BD01882904C6}
52-
{4FA1E5EB-A158-453A-B3F5-934C0E293FD9} = {2B0BC292-A457-4B4F-8745-BD01882904C6}
53+
{AD07114B-6AE9-46B1-90D9-555C91051FCA} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
54+
{018588CC-3A4D-4E40-BDCA-F8F83DCFF743} = {0C88DD14-F956-CE84-757C-A364CCF449FC}
5355
EndGlobalSection
5456
EndGlobal

0 commit comments

Comments
 (0)