Skip to content

Commit 5576f16

Browse files
Merge pull request #6 from GeoJSON-Net/feature/move-to-support-net-standard20
Feature/move to support net standard20
2 parents 4833f62 + cab67ce commit 5576f16

4 files changed

Lines changed: 14 additions & 9 deletions

File tree

.github/workflows/ci-build.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,14 @@ jobs:
1919
build:
2020

2121
name: 'Build and Test'
22-
runs-on: ubuntu-latest
23-
22+
runs-on: windows-latest
23+
24+
env:
25+
VSTEST_CONNECTION_TIMEOUT: 900
26+
2427
steps:
25-
- uses: actions/checkout@v2
26-
- name: Setup .NET
28+
- uses: actions/checkout@v2
29+
- name: Setup .NET Core
2730
uses: actions/setup-dotnet@v1
2831
with:
2932
dotnet-version: |

src/GeoJSON.Text.Test.Unit/CoordinateReferenceSystem/DefaultCrsTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ public void Can_Deserialize_CRS_issue_89()
4444
public void Can_Serialize_CRS_issue_89()
4545
{
4646
var expected =
47-
"{\"type\":\"Point\",\"coordinates\":[34.56,12.34],\"crs\":{\"properties\":{\"name\":\"TEST NAME\"},\"type\":\"name\"}}";
48-
var point = new Point(new Position(12.34, 34.56)) { CRS = new NamedCRS("TEST NAME") };
47+
"{\"type\":\"Point\",\"coordinates\":[34.57,12.35],\"crs\":{\"properties\":{\"name\":\"TEST NAME\"},\"type\":\"name\"}}";
48+
var point = new Point(new Position(12.35, 34.57)) { CRS = new NamedCRS("TEST NAME") };
4949

5050
var json = JsonSerializer.Serialize(point);
5151

@@ -57,8 +57,8 @@ public void Can_Serialize_CRS_issue_89()
5757
public void Can_Serialize_DefaultCRS_issue_89()
5858
{
5959
var expected =
60-
"{\"type\":\"Point\",\"coordinates\":[34.56,12.34],\"crs\":{\"properties\":{\"name\":\"urn:ogc:def:crs:OGC::CRS84\"},\"type\":\"name\"}}";
61-
var point = new Point(new Position(12.34, 34.56)) { CRS = new NamedCRS("urn:ogc:def:crs:OGC::CRS84") };
60+
"{\"type\":\"Point\",\"coordinates\":[34.57,12.35],\"crs\":{\"properties\":{\"name\":\"urn:ogc:def:crs:OGC::CRS84\"},\"type\":\"name\"}}";
61+
var point = new Point(new Position(12.35, 34.57)) { CRS = new NamedCRS("urn:ogc:def:crs:OGC::CRS84") };
6262

6363
var json = JsonSerializer.Serialize(point);
6464

src/GeoJSON.Text.Test.Unit/GeoJSON.Text.Test.Unit.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<ProjectGuid>{6C93B314-9208-4684-B873-172F7EC81689}</ProjectGuid>
55
<RootNamespace>GeoJSON.Text.Tests</RootNamespace>
66
<AssemblyName>GeoJSON.Text.Tests</AssemblyName>
7-
<TargetFrameworks>netcoreapp3.1;net5;net6</TargetFrameworks>
7+
<TargetFrameworks>net462;netcoreapp3.1;net5;net6</TargetFrameworks>
88
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
99
</PropertyGroup>
1010
<ItemGroup>
@@ -66,6 +66,7 @@
6666
<PrivateAssets>all</PrivateAssets>
6767
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6868
</PackageReference>
69+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
6970
<PackageReference Include="NUnit" Version="3.13.2" />
7071
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
7172
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />

src/GeoJSON.Text/GeoJSON.Text.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<SignAssembly>true</SignAssembly>
2424
<AssemblyOriginatorKeyFile>../key.snk</AssemblyOriginatorKeyFile>
2525
<DelaySign>false</DelaySign>
26+
2627
</PropertyGroup>
2728

2829
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">

0 commit comments

Comments
 (0)