Skip to content

Commit

Permalink
new style
Browse files Browse the repository at this point in the history
  • Loading branch information
emmanuelmathot committed Jul 17, 2019
1 parent 36656f3 commit 6b001f4
Show file tree
Hide file tree
Showing 28 changed files with 469 additions and 1,040 deletions.
6 changes: 6 additions & 0 deletions .directory
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[Dolphin]
Timestamp=2019,6,10,10,31,52
Version=4

[Settings]
HiddenFilesShown=true
25 changes: 25 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Query sentinel2 index",
"type": "mono",
"request": "launch",
"program": "${workspaceRoot}/Terradue.OpenSearch.Client/bin/x86/Debug/net4.5/OpenSearchClient.exe",
"args": [
"https://catalog.terradue.com/sentinel2/search"
],
"cwd": "${workspaceRoot}"
},
{
"name": "Attach",
"type": "mono",
"request": "attach",
"address": "localhost",
"port": 55555
}
]
}
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"nxunitExplorer.nunit": "packages/nunit.consolerunner/3.10.0/tools/nunit3-console.exe"
}
8 changes: 8 additions & 0 deletions .vscode/solution-explorer/class.cs-template
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using System;

namespace {{namespace}}
{
public class {{name}}
{
}
}
3 changes: 3 additions & 0 deletions .vscode/solution-explorer/class.ts-template
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export class {{name}} {

}
9 changes: 9 additions & 0 deletions .vscode/solution-explorer/class.vb-template
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Imports System

Namespace {{namespace}}

Public Class {{name}}

End Class

End Namespace
3 changes: 3 additions & 0 deletions .vscode/solution-explorer/default.ts-template
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default {{name}} {

}
8 changes: 8 additions & 0 deletions .vscode/solution-explorer/enum.cs-template
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using System;

namespace {{namespace}}
{
public enum {{name}}
{
}
}
8 changes: 8 additions & 0 deletions .vscode/solution-explorer/interface.cs-template
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using System;

namespace {{namespace}}
{
public interface {{name}}
{
}
}
3 changes: 3 additions & 0 deletions .vscode/solution-explorer/interface.ts-template
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export interface {{name}} {

}
46 changes: 46 additions & 0 deletions .vscode/solution-explorer/template-list.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"templates": [
{
"name": "Class",
"extension": "cs",
"file": "./class.cs-template",
"parameters": "./template-parameters.js"
},
{
"name": "Interface",
"extension": "cs",
"file": "./interface.cs-template",
"parameters": "./template-parameters.js"
},
{
"name": "Enum",
"extension": "cs",
"file": "./enum.cs-template",
"parameters": "./template-parameters.js"
},
{
"name": "Class",
"extension": "ts",
"file": "./class.ts-template",
"parameters": "./template-parameters.js"
},
{
"name": "Interface",
"extension": "ts",
"file": "./interface.ts-template",
"parameters": "./template-parameters.js"
},
{
"name": "Default",
"extension": "ts",
"file": "./default.ts-template",
"parameters": "./template-parameters.js"
},
{
"name": "Class",
"extension": "vb",
"file": "./class.vb-template",
"parameters": "./template-parameters.js"
}
]
}
17 changes: 17 additions & 0 deletions .vscode/solution-explorer/template-parameters.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
var path = require("path");

module.exports = function(filename, projectPath, folderPath) {
var namespace = "Unknown";
if (projectPath) {
namespace = path.basename(projectPath, path.extname(projectPath));
if (folderPath) {
namespace += "." + folderPath.replace(path.dirname(projectPath), "").substring(1).replace(/[\\\/]/g, ".");
}
namespace = namespace.replace(/[\\\-]/g, "_");
}

return {
namespace: namespace,
name: path.basename(filename, path.extname(filename))
}
};
43 changes: 43 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"label": "build",
"type": "shell",
"command": "msbuild",
"args": [
// Ask msbuild to generate full paths for file names.
"/property:GenerateFullPaths=true",
"/t:build",
"/restore:True"
],
"group": "build",
"presentation": {
// Reveal the output only if unrecognized errors occur.
"reveal": "silent"
},
// Use the standard MS compiler pattern to detect errors, warnings and infos
"problemMatcher": "$msCompile"
},
{
"label": "pack",
"type": "shell",
"command": "msbuild",
"args": [
// Ask msbuild to generate full paths for file names.
"/property:GenerateFullPaths=true",
"/t:pack",
"/restore:True"
],
"group": "build",
"presentation": {
// Reveal the output only if unrecognized errors occur.
"reveal": "silent"
},
// Use the standard MS compiler pattern to detect errors, warnings and infos
"problemMatcher": "$msCompile"
}
]
}
2 changes: 1 addition & 1 deletion Terradue.OpenSearch.Client.Test/BugTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class BugTests : TestBase {

OpenSearchClient client;

[SetUp]
[OneTimeSetUp]
public void SetUpClient() {

client = new OpenSearchClient();
Expand Down
150 changes: 23 additions & 127 deletions Terradue.OpenSearch.Client.Test/Terradue.OpenSearch.Client.Test.csproj
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{22528738-2074-43F0-BC03-92B20234B484}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>Terradue.OpenSearch.Client.Test</RootNamespace>
<AssemblyName>Terradue.OpenSearch.Client.Test</AssemblyName>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFramework>net4.5</TargetFramework>
<RuntimeIdentifiers>win;linux-x64</RuntimeIdentifiers>
<Title>DotNetOpenSearchClient</Title>
<Description>Generic OpenSearch Client</Description>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<Authors>Emmanuel Mathot</Authors>
<Company>Terradue</Company>
<RepositoryUrl>https://github.com/Terradue/DotNetOpenSearchClient</RepositoryUrl>
<PackageTags>OGC;Terradue;Opensearch</PackageTags>
<PackageOutputPath>$(SolutionDir)\build</PackageOutputPath>
<RestorePackagesPath>$(SolutionDir)\packages</RestorePackagesPath>
<IsPackable>false</IsPackable>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -32,126 +40,9 @@
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="GeoAPI, Version=1.7.4.0, Culture=neutral, PublicKeyToken=a1a0da7def465678">
<HintPath>..\packages\GeoAPI.1.7.4\lib\net45\GeoAPI.dll</HintPath>
</Reference>
<Reference Include="GeoJSON.Net, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\GeoJSON.Net.1.0.62\lib\net45\GeoJSON.Net.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a">
<HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
</Reference>
<Reference Include="MathNet.Numerics, Version=3.20.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\MathNet.Numerics.3.20.0\lib\net40\MathNet.Numerics.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Web.XmlTransform, Version=2.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<HintPath>..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
</Reference>
<Reference Include="Mono.Options, Version=5.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\Mono.Options.5.3.0.1\lib\net4-client\Mono.Options.dll</HintPath>
</Reference>
<Reference Include="NetTopologySuite, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1">
<HintPath>..\packages\NetTopologySuite.1.14\lib\net45\NetTopologySuite.dll</HintPath>
</Reference>
<Reference Include="NetTopologySuite.IO, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1">
<HintPath>..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.dll</HintPath>
</Reference>
<Reference Include="NetTopologySuite.IO.GeoTools, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1">
<HintPath>..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.GeoTools.dll</HintPath>
</Reference>
<Reference Include="NetTopologySuite.IO.MsSqlSpatial, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1">
<HintPath>..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.MsSqlSpatial.dll</HintPath>
</Reference>
<Reference Include="NetTopologySuite.IO.PostGis, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1">
<HintPath>..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.PostGis.dll</HintPath>
</Reference>
<Reference Include="NetTopologySuite.IO.ShapeFile, Version=1.14.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1">
<HintPath>..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.ShapeFile.dll</HintPath>
</Reference>
<Reference Include="NetTopologySuite.IO.ShapeFile.Extended, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\NetTopologySuite.IO.1.14.0.1\lib\net45\NetTopologySuite.IO.ShapeFile.Extended.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NuGet.Core, Version=2.14.0.832, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
<HintPath>..\packages\NuGet.Core.2.14.0\lib\net40-Client\NuGet.Core.dll</HintPath>
</Reference>
<Reference Include="PowerCollections, Version=1.0.0.0, Culture=neutral, PublicKeyToken=2573bf8a1bdddcd5">
<HintPath>..\packages\NetTopologySuite.1.14\lib\net45\PowerCollections.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="Terradue.ServiceModel.Ogc">
<HintPath>..\packages\Terradue.ServiceModel.Ogc.2.1.2\lib\net45\Terradue.ServiceModel.Ogc.dll</HintPath>
</Reference>
<Reference Include="Terradue.Metadata.EarthObservation">
<HintPath>..\packages\Terradue.Metadata.EarthObservation.1.5.9\lib\net45\Terradue.Metadata.EarthObservation.dll</HintPath>
</Reference>
<Reference Include="Terradue.OpenSearch">
<HintPath>..\packages\Terradue.OpenSearch.1.17.0\lib\net45\Terradue.OpenSearch.dll</HintPath>
</Reference>
<Reference Include="Terradue.ServiceModel.Syndication">
<HintPath>..\packages\Terradue.ServiceModel.Syndication.1.0.7\lib\net45\Terradue.ServiceModel.Syndication.dll</HintPath>
</Reference>
<Reference Include="Terradue.GeoJson">
<HintPath>..\packages\Terradue.GeoJson.1.9.2\lib\net45\Terradue.GeoJson.dll</HintPath>
</Reference>
<Reference Include="Terradue.OpenSearch.SciHub">
<HintPath>..\packages\Terradue.OpenSearch.SciHub.1.7.14\lib\net45\Terradue.OpenSearch.SciHub.dll</HintPath>
</Reference>
<Reference Include="NuGet4Mono">
<HintPath>..\packages\NuGet4Mono.0.8.0\lib\net45\NuGet4Mono.exe</HintPath>
</Reference>
<Reference Include="NuGet4Mono.Extensions">
<HintPath>..\packages\NuGet4Mono.Extensions.0.8.0\lib\net45\NuGet4Mono.Extensions.dll</HintPath>
</Reference>
<Reference Include="Terradue.ServiceModel.Ogc.OwsContext">
<HintPath>..\packages\Terradue.ServiceModel.Ogc.OwsContext.1.2.0\lib\net45\Terradue.ServiceModel.Ogc.OwsContext.dll</HintPath>
</Reference>
<Reference Include="Terradue.OpenSearch.Usgs">
<HintPath>..\packages\Terradue.OpenSearch.Usgs.1.1.6\lib\net45\Terradue.OpenSearch.Usgs.dll</HintPath>
</Reference>
<Reference Include="Terradue.OpenSearch.RdfEO">
<HintPath>..\packages\Terradue.OpenSearch.RdfEO.1.4.3\lib\net45\Terradue.OpenSearch.RdfEO.dll</HintPath>
</Reference>
<Reference Include="System.Core" />
<Reference Include="System.Net" />
<Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.Web" />
<Reference Include="mscorlib" />
<Reference Include="System.Configuration" />
<Reference Include="System.Net.Http" />
<Reference Include="System.IO" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Numerics" />
</ItemGroup>
<ItemGroup>
<Compile Include="BugTests.cs" />
<Compile Include="GeoTimeModelTests.cs" />
<Compile Include="CwicTests.cs" />
<Compile Include="ScihubTests.cs" />
<Compile Include="ResultAdjustmentTests.cs" />
<Compile Include="Sentinel1AuxTests.cs" />
<Compile Include="_NewTests.cs" />
<Compile Include="_TestBase.cs" />
<Compile Include="ParameterInteroperabilityTests.cs" />
<Compile Include="ContentTests.cs" />
<Compile Include="CatalogParameterTests.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<None Include="packages.config" />
<None Include="Resources\ne_110m_land\ne_110m_land.shx" />
<None Include="Resources\ne_110m_land\ne_110m_land.shp" />
<None Include="Resources\ne_110m_land\ne_110m_land.prj" />
<None Include="Resources\ne_110m_land\ne_110m_land.dbf" />
<Reference Include="System"/>
<Reference Include="System.Xml"/>
<Reference Include="System.Xml.Linq"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Terradue.OpenSearch.Client\Terradue.OpenSearch.Client.csproj">
Expand All @@ -168,6 +59,11 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="out\" />
<Folder Include="out\"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Terradue.OpenSearch" Version="1.17.0-ft11720190424t091305"/>
<PackageReference Include="NUnit" Version="3.12.0"/>
<PackageReference Include="NUnit.ConsoleRunner" Version="3.10.0"/>
</ItemGroup>
</Project>
</Project>
Loading

0 comments on commit 6b001f4

Please sign in to comment.