Skip to content

Feature/move to support net standard20 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 23, 2021
Merged

Feature/move to support net standard20 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
126f25c
Updated so it will run with .net standard 2.0
Dec 21, 2021
43ee7dc
Added msbuild
Dec 21, 2021
118d232
Merge branch 'main' into feature/move-to-support-net-standard20
matt-lethargic Dec 23, 2021
cab67ce
Merge issue on build actions
matt-lethargic Dec 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .github/workflows/ci-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,14 @@ jobs:
build:

name: 'Build and Test'
runs-on: ubuntu-latest

runs-on: windows-latest

env:
VSTEST_CONNECTION_TIMEOUT: 900

steps:
- uses: actions/checkout@v2
- name: Setup .NET
- uses: actions/checkout@v2
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: |
Expand Down
8 changes: 4 additions & 4 deletions src/GeoJSON.Text.Test.Unit/CoordinateReferenceSystem/DefaultCrsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ public void Can_Deserialize_CRS_issue_89()
public void Can_Serialize_CRS_issue_89()
{
var expected =
"{\"type\":\"Point\",\"coordinates\":[34.56,12.34],\"crs\":{\"properties\":{\"name\":\"TEST NAME\"},\"type\":\"name\"}}";
var point = new Point(new Position(12.34, 34.56)) { CRS = new NamedCRS("TEST NAME") };
"{\"type\":\"Point\",\"coordinates\":[34.57,12.35],\"crs\":{\"properties\":{\"name\":\"TEST NAME\"},\"type\":\"name\"}}";
var point = new Point(new Position(12.35, 34.57)) { CRS = new NamedCRS("TEST NAME") };

var json = JsonSerializer.Serialize(point);

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

var json = JsonSerializer.Serialize(point);

Expand Down
3 changes: 2 additions & 1 deletion src/GeoJSON.Text.Test.Unit/GeoJSON.Text.Test.Unit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<ProjectGuid>{6C93B314-9208-4684-B873-172F7EC81689}</ProjectGuid>
<RootNamespace>GeoJSON.Text.Tests</RootNamespace>
<AssemblyName>GeoJSON.Text.Tests</AssemblyName>
<TargetFrameworks>netcoreapp3.1;net5;net6</TargetFrameworks>
<TargetFrameworks>net462;netcoreapp3.1;net5;net6</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<ItemGroup>
Expand Down Expand Up @@ -66,6 +66,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
Expand Down
1 change: 1 addition & 0 deletions src/GeoJSON.Text/GeoJSON.Text.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>

</PropertyGroup>

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