Skip to content

Commit 4abf3ac

Browse files
MartinCarpentierMartinCarpentier
committed
Fixed merge conflict
2 parents b1fd931 + b5b8d90 commit 4abf3ac

7 files changed

Lines changed: 63 additions & 12 deletions

File tree

‎src/GeoJSON.Text.Tests/GeoJSON.Text.Tests.csproj‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,20 @@
5858
<EmbeddedResource Include="Geometry\PolygonTests_Can_Serialize.json" />
5959
</ItemGroup>
6060
<ItemGroup>
61-
<ProjectReference Include="..\GeoJSON.Text\GeoJSON.Text.csproj" />
6261
<PackageReference Include="NUnit" Version="3.13.2" />
6362
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
6463
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
65-
<PackageReference Include="System.Text.Json" Version="6.0.1" />
64+
</ItemGroup>
65+
<ItemGroup>
66+
<ProjectReference Include="..\GeoJSON.Text\GeoJSON.Text.csproj" />
67+
</ItemGroup>
68+
<ItemGroup>
69+
<None Update="Feature\*.json">
70+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
71+
</None>
72+
<None Update="Geometry\*.json">
73+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
74+
</None>
6675
</ItemGroup>
6776
<ItemGroup>
6877
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />

‎src/GeoJSON.Text.Tests/Properties/AssemblyInfo.cs‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// --------------------------------------------------------------------------------------------------------------------
2+
// <copyright file="AssemblyInfo.cs" company="Joerg Battermann">
3+
// Copyright © Joerg Battermann 2014
4+
// </copyright>
5+
// <summary>
6+
// AssemblyInfo.cs
7+
// </summary>
8+
// --------------------------------------------------------------------------------------------------------------------
9+
10+
using System.Reflection;
11+
using System.Runtime.InteropServices;
12+
13+
[assembly: AssemblyTitle("GeoJSON.Text.Tests")]
14+
[assembly: AssemblyDescription("Unit tests for the GeoJSON.Text library")]
15+
[assembly: AssemblyConfiguration("")]
16+
[assembly: AssemblyCompany("Joerg Battermann")]
17+
[assembly: AssemblyProduct("GeoJSON.Text.Tests")]
18+
[assembly: AssemblyCopyright("Copyright © Joerg Battermann 2014")]
19+
[assembly: AssemblyTrademark("")]
20+
[assembly: AssemblyCulture("")]
21+
22+
[assembly: ComVisible(false)]
23+
24+
[assembly: AssemblyVersion("0.0.0.6")]
25+
26+
[assembly: Guid("94688f28-e983-417d-8e6e-96d4c687e085")]

‎src/GeoJSON.Text.Tests/Settings.StyleCop‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<StyleCopSettings Version="4.3">
2+
<Analyzers>
3+
<Analyzer AnalyzerId="Microsoft.StyleCop.CSharp.DocumentationRules">
4+
<AnalyzerSettings>
5+
<StringProperty Name="CompanyName">Jörg Battermann</StringProperty>
6+
<StringProperty Name="Copyright">Copyright © Jörg Battermann 2011</StringProperty>
7+
</AnalyzerSettings>
8+
</Analyzer>
9+
</Analyzers>
10+
</StyleCopSettings>

‎src/GeoJSON.Text.Tests/TestBase.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ public static string AssemblyDirectory
2525

2626
protected string GetExpectedJson([CallerMemberName] string name = null)
2727
{
28+
var names = Assembly.GetExecutingAssembly().GetManifestResourceNames();
29+
2830
var assembly = Assembly.GetExecutingAssembly();
2931
var type = GetType().FullName;
3032
using (Stream stream = assembly.GetManifestResourceStream($"{type}_{name}.json"))

‎src/GeoJSON.Text.Tests/app.config‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<configuration>
4+
<startup>
5+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
6+
</startup>
7+
</configuration>

‎src/GeoJSON.Text.sln‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,24 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1010
..\README.md = ..\README.md
1111
EndProjectSection
1212
EndProject
13-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GeoJSON.Text.Tests", "GeoJSON.Text.Tests\GeoJSON.Text.Tests.csproj", "{6C93B314-9208-4684-B873-172F7EC81689}"
13+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GeoJSON.Text", "GeoJSON.Text\GeoJSON.Text.csproj", "{ECD95D99-8429-4358-92AE-1C51061D774C}"
1414
EndProject
15-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GeoJSON.Text", "GeoJSON.Text\GeoJSON.Text.csproj", "{8AF7C40E-E8C7-425F-A8B1-A4B7E74D3CA9}"
15+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GeoJSON.Text.Tests", "GeoJSON.Text.Tests\GeoJSON.Text.Tests.csproj", "{6C93B314-9208-4684-B873-172F7EC81689}"
1616
EndProject
1717
Global
1818
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1919
Debug|Any CPU = Debug|Any CPU
2020
Release|Any CPU = Release|Any CPU
2121
EndGlobalSection
2222
GlobalSection(ProjectConfigurationPlatforms) = postSolution
23+
{ECD95D99-8429-4358-92AE-1C51061D774C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
24+
{ECD95D99-8429-4358-92AE-1C51061D774C}.Debug|Any CPU.Build.0 = Debug|Any CPU
25+
{ECD95D99-8429-4358-92AE-1C51061D774C}.Release|Any CPU.ActiveCfg = Release|Any CPU
26+
{ECD95D99-8429-4358-92AE-1C51061D774C}.Release|Any CPU.Build.0 = Release|Any CPU
2327
{6C93B314-9208-4684-B873-172F7EC81689}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2428
{6C93B314-9208-4684-B873-172F7EC81689}.Debug|Any CPU.Build.0 = Debug|Any CPU
2529
{6C93B314-9208-4684-B873-172F7EC81689}.Release|Any CPU.ActiveCfg = Release|Any CPU
2630
{6C93B314-9208-4684-B873-172F7EC81689}.Release|Any CPU.Build.0 = Release|Any CPU
27-
{8AF7C40E-E8C7-425F-A8B1-A4B7E74D3CA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
28-
{8AF7C40E-E8C7-425F-A8B1-A4B7E74D3CA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
29-
{8AF7C40E-E8C7-425F-A8B1-A4B7E74D3CA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
30-
{8AF7C40E-E8C7-425F-A8B1-A4B7E74D3CA9}.Release|Any CPU.Build.0 = Release|Any CPU
3131
EndGlobalSection
3232
GlobalSection(SolutionProperties) = preSolution
3333
HideSolutionNode = FALSE

‎src/GeoJSON.Text/Converters/PositionEnumerableConverter.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
// Copyright © Joerg Battermann 2014, Matt Hunt 2017
22

3+
using GeoJSON.Text.Geometry;
34
using System;
45
using System.Collections.Generic;
56
using System.Collections.ObjectModel;
6-
using System.IO;
7-
using System.Linq;
8-
using System.Text;
97
using System.Text.Json;
108
using System.Text.Json.Serialization;
11-
using GeoJSON.Text.Geometry;
129

1310
namespace GeoJSON.Text.Converters
1411
{

0 commit comments

Comments
 (0)