Skip to content

Commit 58496f7

Browse files
florenzenflorenzen
committed
Merge branch 'FundOurselves-netstandard2-and-visual-studio-support'
2 parents bd25785 + 43bcca6 commit 58496f7

File tree

10 files changed

+188
-144
lines changed

10 files changed

+188
-144
lines changed

‎JsonSchemaProvider.Development.slnf‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"solution": {
3+
"path": "JsonSchemaProvider.sln",
4+
"projects": [
5+
"build\\build.fsproj",
6+
"src\\JsonSchemaProvider.DesignTime\\JsonSchemaProvider.DesignTime.fsproj",
7+
"src\\JsonSchemaProvider.Runtime\\JsonSchemaProvider.fsproj"
8+
]
9+
}
10+
}

‎JsonSchemaProvider.sln‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,49 @@
1-
2-
Microsoft Visual Studio Solution File, Format Version 12.00
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", "{3074F79D-3FEE-4DEB-A2CA-213CFA5D22E6}"
7-
EndProject
8-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "JsonSchemaProvider.Runtime", "src\JsonSchemaProvider.Runtime\JsonSchemaProvider.Runtime.fsproj", "{B8200652-9891-4846-BDC7-579735475AED}"
9-
EndProject
10-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{354C1F78-6C4E-46CA-92FA-232550DAE85D}"
11-
EndProject
12-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "JsonSchemaProvider.Tests", "tests\JsonSchemaProvider.Tests\JsonSchemaProvider.Tests.fsproj", "{B2E00AAF-5EC5-434B-A36C-F27C5ABA1046}"
13-
EndProject
14-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "JsonSchemaProvider.DesignTime", "src\JsonSchemaProvider.DesignTime\JsonSchemaProvider.DesignTime.fsproj", "{36A489D0-B65A-4CB7-B3E0-0790D304FDFE}"
15-
EndProject
16-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "build", "build\build.fsproj", "{B10F1C4B-8EAD-4B45-9A66-DDA376393DA5}"
17-
EndProject
18-
Global
19-
GlobalSection(SolutionConfigurationPlatforms) = preSolution
20-
Debug|Any CPU = Debug|Any CPU
21-
Release|Any CPU = Release|Any CPU
22-
EndGlobalSection
23-
GlobalSection(SolutionProperties) = preSolution
24-
HideSolutionNode = FALSE
25-
EndGlobalSection
26-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
27-
{B8200652-9891-4846-BDC7-579735475AED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
28-
{B8200652-9891-4846-BDC7-579735475AED}.Debug|Any CPU.Build.0 = Debug|Any CPU
29-
{B8200652-9891-4846-BDC7-579735475AED}.Release|Any CPU.ActiveCfg = Release|Any CPU
30-
{B8200652-9891-4846-BDC7-579735475AED}.Release|Any CPU.Build.0 = Release|Any CPU
31-
{B2E00AAF-5EC5-434B-A36C-F27C5ABA1046}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
32-
{B2E00AAF-5EC5-434B-A36C-F27C5ABA1046}.Debug|Any CPU.Build.0 = Debug|Any CPU
33-
{B2E00AAF-5EC5-434B-A36C-F27C5ABA1046}.Release|Any CPU.ActiveCfg = Release|Any CPU
34-
{B2E00AAF-5EC5-434B-A36C-F27C5ABA1046}.Release|Any CPU.Build.0 = Release|Any CPU
35-
{36A489D0-B65A-4CB7-B3E0-0790D304FDFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
36-
{36A489D0-B65A-4CB7-B3E0-0790D304FDFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
37-
{36A489D0-B65A-4CB7-B3E0-0790D304FDFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
38-
{36A489D0-B65A-4CB7-B3E0-0790D304FDFE}.Release|Any CPU.Build.0 = Release|Any CPU
39-
{B10F1C4B-8EAD-4B45-9A66-DDA376393DA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
40-
{B10F1C4B-8EAD-4B45-9A66-DDA376393DA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
41-
{B10F1C4B-8EAD-4B45-9A66-DDA376393DA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
42-
{B10F1C4B-8EAD-4B45-9A66-DDA376393DA5}.Release|Any CPU.Build.0 = Release|Any CPU
43-
EndGlobalSection
44-
GlobalSection(NestedProjects) = preSolution
45-
{B8200652-9891-4846-BDC7-579735475AED} = {3074F79D-3FEE-4DEB-A2CA-213CFA5D22E6}
46-
{B2E00AAF-5EC5-434B-A36C-F27C5ABA1046} = {354C1F78-6C4E-46CA-92FA-232550DAE85D}
47-
{36A489D0-B65A-4CB7-B3E0-0790D304FDFE} = {3074F79D-3FEE-4DEB-A2CA-213CFA5D22E6}
48-
EndGlobalSection
49-
EndGlobal
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
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", "{3074F79D-3FEE-4DEB-A2CA-213CFA5D22E6}"
7+
EndProject
8+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "JsonSchemaProvider", "src\JsonSchemaProvider.Runtime\JsonSchemaProvider.fsproj", "{B8200652-9891-4846-BDC7-579735475AED}"
9+
EndProject
10+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{354C1F78-6C4E-46CA-92FA-232550DAE85D}"
11+
EndProject
12+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "JsonSchemaProvider.Tests", "tests\JsonSchemaProvider.Tests\JsonSchemaProvider.Tests.fsproj", "{B2E00AAF-5EC5-434B-A36C-F27C5ABA1046}"
13+
EndProject
14+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "JsonSchemaProvider.DesignTime", "src\JsonSchemaProvider.DesignTime\JsonSchemaProvider.DesignTime.fsproj", "{36A489D0-B65A-4CB7-B3E0-0790D304FDFE}"
15+
EndProject
16+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "build", "build\build.fsproj", "{B10F1C4B-8EAD-4B45-9A66-DDA376393DA5}"
17+
EndProject
18+
Global
19+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
20+
Debug|Any CPU = Debug|Any CPU
21+
Release|Any CPU = Release|Any CPU
22+
EndGlobalSection
23+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
24+
{B8200652-9891-4846-BDC7-579735475AED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
25+
{B8200652-9891-4846-BDC7-579735475AED}.Debug|Any CPU.Build.0 = Debug|Any CPU
26+
{B8200652-9891-4846-BDC7-579735475AED}.Release|Any CPU.ActiveCfg = Release|Any CPU
27+
{B8200652-9891-4846-BDC7-579735475AED}.Release|Any CPU.Build.0 = Release|Any CPU
28+
{B2E00AAF-5EC5-434B-A36C-F27C5ABA1046}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
29+
{B2E00AAF-5EC5-434B-A36C-F27C5ABA1046}.Debug|Any CPU.Build.0 = Debug|Any CPU
30+
{B2E00AAF-5EC5-434B-A36C-F27C5ABA1046}.Release|Any CPU.ActiveCfg = Release|Any CPU
31+
{B2E00AAF-5EC5-434B-A36C-F27C5ABA1046}.Release|Any CPU.Build.0 = Release|Any CPU
32+
{36A489D0-B65A-4CB7-B3E0-0790D304FDFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33+
{36A489D0-B65A-4CB7-B3E0-0790D304FDFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
34+
{36A489D0-B65A-4CB7-B3E0-0790D304FDFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
35+
{36A489D0-B65A-4CB7-B3E0-0790D304FDFE}.Release|Any CPU.Build.0 = Release|Any CPU
36+
{B10F1C4B-8EAD-4B45-9A66-DDA376393DA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
37+
{B10F1C4B-8EAD-4B45-9A66-DDA376393DA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
38+
{B10F1C4B-8EAD-4B45-9A66-DDA376393DA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
39+
{B10F1C4B-8EAD-4B45-9A66-DDA376393DA5}.Release|Any CPU.Build.0 = Release|Any CPU
40+
EndGlobalSection
41+
GlobalSection(SolutionProperties) = preSolution
42+
HideSolutionNode = FALSE
43+
EndGlobalSection
44+
GlobalSection(NestedProjects) = preSolution
45+
{B8200652-9891-4846-BDC7-579735475AED} = {3074F79D-3FEE-4DEB-A2CA-213CFA5D22E6}
46+
{B2E00AAF-5EC5-434B-A36C-F27C5ABA1046} = {354C1F78-6C4E-46CA-92FA-232550DAE85D}
47+
{36A489D0-B65A-4CB7-B3E0-0790D304FDFE} = {3074F79D-3FEE-4DEB-A2CA-213CFA5D22E6}
48+
EndGlobalSection
49+
EndGlobal

‎build/Build.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ let dotnetPack ctx =
432432
DotNet.pack
433433
(fun c ->
434434
{ c with
435-
MSBuildParams = disableBinLog c.MSBuildParams
435+
MSBuildParams = { (disableBinLog c.MSBuildParams) with Properties = [ ("IsNuGet", "true") ]}
436436
Configuration = configuration (ctx.Context.AllExecutingTargets)
437437
OutputPath = Some distDir
438438
Common = c.Common |> DotNet.Options.withAdditionalArgs args })

‎build/build.fsproj‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
6-
</PropertyGroup>
7-
8-
<ItemGroup>
9-
<Compile Include="Changelog.fs" />
10-
<Compile Include="FsDocs.fs" />
11-
<Compile Include="Build.fs" />
12-
</ItemGroup>
13-
14-
<ItemGroup>
15-
<PackageReference Include="Argu" Version="6.2.3" />
16-
<PackageReference Include="Fake.Api.GitHub" Version="6.0.0" />
17-
<PackageReference Include="Fake.BuildServer.GitHubActions" Version="6.0.0" />
18-
<PackageReference Include="Fake.Core" Version="5.16.0" />
19-
<PackageReference Include="Fake.Core.ReleaseNotes" Version="6.0.0" />
20-
<PackageReference Include="Fake.Core.Target" Version="6.0.0" />
21-
<PackageReference Include="Fake.DotNet.AssemblyInfoFile" Version="6.0.0" />
22-
<PackageReference Include="Fake.DotNet.Cli" Version="6.0.0" />
23-
<PackageReference Include="Fake.DotNet.NuGet" Version="6.0.0" />
24-
<PackageReference Include="Fake.Tools.Git" Version="6.0.0" />
25-
</ItemGroup>
26-
27-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net8.0</TargetFramework>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<Compile Include="Changelog.fs" />
10+
<Compile Include="FsDocs.fs" />
11+
<Compile Include="Build.fs" />
12+
</ItemGroup>
13+
14+
<ItemGroup>
15+
<PackageReference Include="Argu" Version="6.2.4" />
16+
<PackageReference Include="Fake.Api.GitHub" Version="6.1.3" />
17+
<PackageReference Include="Fake.BuildServer.GitHubActions" Version="6.1.3" />
18+
<PackageReference Include="Fake.Core" Version="5.16.0" />
19+
<PackageReference Include="Fake.Core.ReleaseNotes" Version="6.1.3" />
20+
<PackageReference Include="Fake.Core.Target" Version="6.1.3" />
21+
<PackageReference Include="Fake.DotNet.AssemblyInfoFile" Version="6.1.3" />
22+
<PackageReference Include="Fake.DotNet.Cli" Version="6.1.3" />
23+
<PackageReference Include="Fake.DotNet.NuGet" Version="6.1.3" />
24+
<PackageReference Include="Fake.Tools.Git" Version="6.1.3" />
25+
</ItemGroup>
26+
27+
</Project>

‎global.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"sdk": { "allowPrerelease": false }
3+
}

‎src/JsonSchemaProvider.DesignTime/JsonSchemaProvider.DesignTime.fsproj‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netstandard2.1</TargetFramework>
3+
<TargetFramework>netstandard2.0</TargetFramework>
44
<GenerateDocumentationFile>false</GenerateDocumentationFile>
5-
<DefineConstants>IS_DESIGNTIME</DefineConstants>
5+
<DefineConstants>IS_DESIGNTIME;$(DefineConstants)</DefineConstants>
66
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
7+
<BaseOutputPath Condition="$(IsNuGet) == ''">..\JsonSchemaProvider.Runtime\bin</BaseOutputPath>
78
</PropertyGroup>
89
<ItemGroup>
910
<PackageReference Include="FSharp.Data.Json.Core" Version="6.4.0" />
1011
<PackageReference Include="FSharp.TypeProviders.SDK" Version="8.0.2">
1112
<PrivateAssets>all</PrivateAssets>
1213
</PackageReference>
13-
<PackageReference Include="NJsonSchema" Version="11.0.0" />
1414
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
15+
<PackageReference Include="NJsonSchema" Version="11.0.2" />
16+
<PackageReference Include="System.Text.Encodings.Web" Version="6.0.0" />
1517
<PackageReference Update="FSharp.Core" Version="8.*">
1618
<!-- This excludes FSharp.Core.xml and FSharp.Core.resources.dll while referencing the right FSharp.Core.dll version -->
1719
<ExcludeAssets>runtime;contentFiles</ExcludeAssets>

‎src/JsonSchemaProvider.DesignTime/JsonSchemaProviderImpl.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ type JsonSchemaProviderImpl(config: TypeProviderConfig) as this =
3434
inherit
3535
TypeProviderForNamespaces(
3636
config,
37-
assemblyReplacementMap = [ ("JsonSchemaProvider.DesignTime", "JsonSchemaProvider.Runtime") ],
37+
assemblyReplacementMap = [ ("JsonSchemaProvider.DesignTime", "JsonSchemaProvider") ],
3838
addDefaultProbingLocation = true
3939
)
4040

src/JsonSchemaProvider.Runtime/JsonSchemaProvider.Runtime.fsproj renamed to src/JsonSchemaProvider.Runtime/JsonSchemaProvider.fsproj

Lines changed: 61 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,61 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFramework>netstandard2.1</TargetFramework>
4-
<GenerateDocumentationFile>false</GenerateDocumentationFile>
5-
<FSharpToolsDirectory>typeproviders</FSharpToolsDirectory>
6-
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
7-
</PropertyGroup>
8-
9-
<PropertyGroup>
10-
<PackageId>JsonSchemaProvider</PackageId>
11-
<Title>JsonSchemaProvider: F# type provider for JSON schema</Title>
12-
<Copyright>Copyright (c) 2024 Florian Lorenzen</Copyright>
13-
<Description>The JsonSchemaProvider provides F# types from JSON schemas. It can be used to build
14-
JSON values in a strongly typed way that conform to the schema or to parse JSON values into an F# value that
15-
can be queried in a stringly types way. Specifications like numeric ranges or string patterns that cannot be
16-
validated at compile time are checked at runtime.
17-
18-
The JSON schema can either be given as an inline string literal or by a local file.
19-
20-
The type provider is built around NJsonSchema for the schema parsing and validation
21-
and uses the JsonValue data type from FSharp.Data.</Description>
22-
<Version>0.1.0</Version>
23-
<Authors>Florian Lorenzen</Authors>
24-
<PackageReadmeFile>README.md</PackageReadmeFile>
25-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
26-
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
27-
<PackageProjectUrl>https://github.com/florenzen/JsonSchemaProvider</PackageProjectUrl>
28-
<RepositoryUrl>https://github.com/florenzen/JsonSchemaProvider</RepositoryUrl>
29-
<RepositoryBranch>main</RepositoryBranch>
30-
<PackageReleaseNotes>https://github.com/florenzen/JsonSchemaProvider/blob/main/CHANGELOG.md</PackageReleaseNotes>
31-
<PackageTags>f#; fsharp; data; json; jsonschema</PackageTags>
32-
<NoWarn>NU5100</NoWarn>
33-
<!-- NU5100 is irrelevant since the respective DLLs must be in the typeproviders
34-
directory. -->
35-
</PropertyGroup>
36-
37-
<ItemGroup>
38-
<Compile Include="JsonSchemaProvider.Runtime.fs" />
39-
</ItemGroup>
40-
41-
<ItemGroup>
42-
<None Include="../../README.md" Pack="true" PackagePath="/" />
43-
<None Include="../../LICENSE" Pack="true" PackagePath="/" />
44-
</ItemGroup>
45-
46-
<ItemGroup>
47-
<ProjectReference Include="..\JsonSchemaProvider.DesignTime\JsonSchemaProvider.DesignTime.fsproj">
48-
<IsFSharpDesignTimeProvider>true</IsFSharpDesignTimeProvider>
49-
<PrivateAssets>all</PrivateAssets>
50-
</ProjectReference>
51-
<PackageReference Include="FSharp.Data.Json.Core" Version="6.4.0" />
52-
<PackageReference Include="NJsonSchema" Version="11.0.0" />
53-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
54-
</ItemGroup>
55-
56-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFramework>netstandard2.0</TargetFramework>
4+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
5+
<FSharpToolsDirectory>typeproviders</FSharpToolsDirectory>
6+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
7+
</PropertyGroup>
8+
9+
<PropertyGroup>
10+
<PackageId>JsonSchemaProvider</PackageId>
11+
<Title>JsonSchemaProvider: F# type provider for JSON schema</Title>
12+
<Copyright>Copyright (c) 2024 Florian Lorenzen</Copyright>
13+
<Description>The JsonSchemaProvider provides F# types from JSON schemas. It can be used to build
14+
JSON values in a strongly typed way that conform to the schema or to parse JSON values into an F# value that
15+
can be queried in a stringly types way. Specifications like numeric ranges or string patterns that cannot be
16+
validated at compile time are checked at runtime.
17+
18+
The JSON schema can either be given as an inline string literal or by a local file.
19+
20+
The type provider is built around NJsonSchema for the schema parsing and validation
21+
and uses the JsonValue data type from FSharp.Data.</Description>
22+
<Version>0.1.0</Version>
23+
<Authors>Florian Lorenzen</Authors>
24+
<PackageReadmeFile>README.md</PackageReadmeFile>
25+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
26+
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
27+
<PackageProjectUrl>https://github.com/florenzen/JsonSchemaProvider</PackageProjectUrl>
28+
<RepositoryUrl>https://github.com/florenzen/JsonSchemaProvider</RepositoryUrl>
29+
<RepositoryBranch>main</RepositoryBranch>
30+
<PackageReleaseNotes>https://github.com/florenzen/JsonSchemaProvider/blob/main/CHANGELOG.md</PackageReleaseNotes>
31+
<PackageTags>f#; fsharp; data; json; jsonschema</PackageTags>
32+
<NoWarn>NU5100</NoWarn>
33+
<!-- NU5100 is irrelevant since the respective DLLs must be in the typeproviders
34+
directory. -->
35+
</PropertyGroup>
36+
37+
<ItemGroup>
38+
<Compile Include="JsonSchemaProvider.Runtime.fs" />
39+
</ItemGroup>
40+
41+
<ItemGroup>
42+
<None Include="../../README.md" Pack="true" PackagePath="/" />
43+
<None Include="../../LICENSE" Pack="true" PackagePath="/" />
44+
</ItemGroup>
45+
46+
<ItemGroup>
47+
<ProjectReference Condition="$(IsNuGet) != ''" Include="..\JsonSchemaProvider.DesignTime\JsonSchemaProvider.DesignTime.fsproj">
48+
<IsFSharpDesignTimeProvider>true</IsFSharpDesignTimeProvider>
49+
<PrivateAssets>all</PrivateAssets>
50+
</ProjectReference>
51+
<PackageReference Include="FSharp.Data.Json.Core" Version="6.4.0" />
52+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
53+
<PrivateAssets>all</PrivateAssets>
54+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
55+
</PackageReference>
56+
<PackageReference Include="NJsonSchema" Version="11.0.2" />
57+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
58+
<PackageReference Include="System.Text.Encodings.Web" Version="6.0.0" />
59+
</ItemGroup>
60+
61+
</Project>

‎tests/JsonSchemaProvider.Tests/Debug.fsx‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#r "../../src/JsonSchemaProvider.Runtime/bin/Debug/netstandard2.0/JsonSchemaProvider.dll"
2+
#r "nuget: System.Private.Uri"
3+
#r "nuget: System.Text.Encodings.Web"
4+
#r "nuget: FSharp.Data.Json.Core"
5+
#r "nuget: NJsonSchema"
6+
#r "nuget: Expecto"
7+
#load "JsonSchemaProviderTests.fs"
8+
9+
open JsonSchemaProvider.Tests
10+
11+
JsonSchemaProviderTests.flatSchema
12+
13+
// devenv.exe /debugexe fsc.exe -r:"..\..\src\JsonSchemaProvider.Runtime\bin\Debug\netstandard2.0\JsonSchemaProvider.dll" Debug.fsx

‎tests/JsonSchemaProvider.Tests/JsonSchemaProvider.Tests.fsproj‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,34 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
44
<TargetFramework>net8.0</TargetFramework>
55
<GenerateProgramFile>false</GenerateProgramFile>
66
</PropertyGroup>
77
<ItemGroup>
8+
<None Include="Debug.fsx" />
89
<Compile Include="SchemaConversionTests.fs" />
910
<Compile Include="JsonSchemaProviderTests.fs" />
1011
<Compile Include="Main.fs" />
1112
</ItemGroup>
1213
<ItemGroup>
13-
<PackageReference Include="altcover" Version="8.8.53" />
14+
<PackageReference Update="FSharp.Core" Version="8.*" />
15+
</ItemGroup>
16+
<ItemGroup>
17+
<PackageReference Include="altcover" Version="8.9.3" />
1418
<PackageReference Include="Expecto" Version="10.*" />
15-
<PackageReference Include="YoloDev.Expecto.TestSdk" Version="0.*" />
1619
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*" />
17-
<PackageReference Update="FSharp.Core" Version="8.*" />
20+
<PackageReference Include="YoloDev.Expecto.TestSdk" Version="0.*" />
21+
<PackageReference Include="FSharp.Data.Json.Core" Version="6.4.0" />
22+
<PackageReference Include="NJsonSchema" Version="11.0.2" />
1823
</ItemGroup>
1924
<ItemGroup>
20-
<ProjectReference Include="..\..\src\JsonSchemaProvider.Runtime\JsonSchemaProvider.Runtime.fsproj" />
21-
<ProjectReference Include="..\..\src\JsonSchemaProvider.DesignTime\JsonSchemaProvider.DesignTime.fsproj" />
25+
<Reference Include="JsonSchemaProvider">
26+
<HintPath Condition="Exists('..\..\src\JsonSchemaProvider.Runtime\bin\Debug\netstandard2.0\JsonSchemaProvider.dll')">..\..\src\JsonSchemaProvider.Runtime\bin\Debug\netstandard2.0\JsonSchemaProvider.dll</HintPath>
27+
<HintPath Condition="Exists('..\..\src\JsonSchemaProvider.Runtime\bin\Release\netstandard2.0\JsonSchemaProvider.dll')">..\..\src\JsonSchemaProvider.Runtime\bin\Release\netstandard2.0\JsonSchemaProvider.dll</HintPath>
28+
</Reference>
29+
<Reference Include="JsonSchemaProvider.DesignTime">
30+
<HintPath Condition="Exists('..\..\src\JsonSchemaProvider.Runtime\bin\Debug\netstandard2.0\JsonSchemaProvider.DesignTime.dll')">..\..\src\JsonSchemaProvider.Runtime\bin\Debug\netstandard2.0\JsonSchemaProvider.DesignTime.dll</HintPath>
31+
<HintPath Condition="Exists('..\..\src\JsonSchemaProvider.Runtime\bin\Release\netstandard2.0\JsonSchemaProvider.DesignTime.dll')">..\..\src\JsonSchemaProvider.Runtime\bin\Release\netstandard2.0\JsonSchemaProvider.DesignTime.dll</HintPath>
32+
</Reference>
2233
</ItemGroup>
2334
</Project>

0 commit comments

Comments
 (0)