From 54e756116e4eaa36207318947dd29e693346ced6 Mon Sep 17 00:00:00 2001 From: Emmanuel Mathot Date: Fri, 8 Mar 2024 10:36:06 +0100 Subject: [PATCH 1/2] Add launch configuration for displaying copy help --- .vscode/launch.json | 16 ++++++++++++++++ src/Stars.Console/Operations/BaseOperation.cs | 1 + .../ThirdParty/Publication/GeosquareService.cs | 2 +- src/Stars.Tests/S3Tests.cs | 3 --- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 844db564..8a05b035 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -47,6 +47,22 @@ "console": "internalConsole", "stopAtEntry": false }, + { + "name": "Display Copy Help", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build", + // If you have changed target frameworks, make sure to update the program path. + "program": "${workspaceFolder}/src/Stars.Console/bin/Debug/net6.0/Stars.dll", + "args": [ + "copy", + "-h" + ], + "cwd": "${workspaceFolder}/src", + // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console + "console": "internalConsole", + "stopAtEntry": false + }, { "name": "Display Plugins", "type": "coreclr", diff --git a/src/Stars.Console/Operations/BaseOperation.cs b/src/Stars.Console/Operations/BaseOperation.cs index 743ed690..dc721e17 100644 --- a/src/Stars.Console/Operations/BaseOperation.cs +++ b/src/Stars.Console/Operations/BaseOperation.cs @@ -17,6 +17,7 @@ namespace Terradue.Stars.Console.Operations { + [HelpOption] internal abstract class BaseOperation { [Option] diff --git a/src/Stars.Data/ThirdParty/Publication/GeosquareService.cs b/src/Stars.Data/ThirdParty/Publication/GeosquareService.cs index a97b7c77..e0f381b7 100644 --- a/src/Stars.Data/ThirdParty/Publication/GeosquareService.cs +++ b/src/Stars.Data/ThirdParty/Publication/GeosquareService.cs @@ -73,7 +73,7 @@ public async Task PublishAsync(IPublicationModel publicationM GeosquarePublicationState state = new GeosquarePublicationState(geosquareModel, client); state.Hash = guid; - await routingService.RouteAsync(route, 4, null, state, ct); + await routingService.RouteAsync(route, publicationModel.Depth, null, state, ct); state.OsdUri = new Uri(client.BaseAddress, string.Format("{0}/cat/{1}/description", geosquareModel.Index, guid.Value)); diff --git a/src/Stars.Tests/S3Tests.cs b/src/Stars.Tests/S3Tests.cs index ec9a7628..911df2d5 100644 --- a/src/Stars.Tests/S3Tests.cs +++ b/src/Stars.Tests/S3Tests.cs @@ -1,19 +1,16 @@ using System; using System.IO; using System.Linq; -using System.Net; using System.Threading; using System.Threading.Tasks; using Amazon.S3.Model; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Options; using Stac; using Stac.Extensions.File; using Terradue.Stars.Interface; using Terradue.Stars.Services; using Terradue.Stars.Services.Model.Stac; using Terradue.Stars.Services.Resources; -using Terradue.Stars.Services.Router; using Terradue.Stars.Services.Supplier; using Terradue.Stars.Services.Supplier.Carrier; using Terradue.Stars.Services.Supplier.Destination; From 47982e3189ef6078bb4c7329261f51696566460c Mon Sep 17 00:00:00 2001 From: Emmanuel Mathot Date: Fri, 8 Mar 2024 10:37:18 +0100 Subject: [PATCH 2/2] Update project versions to 2.20.1 --- CHANGELOG.md | 31 +++++++++++++++++-- .../Terradue.Stars.Console.csproj | 2 +- src/Stars.Data/Terradue.Stars.Data.csproj | 2 +- .../Terradue.Stars.Services.csproj | 2 +- 4 files changed, 32 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 67cafe73..d2495368 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ # Changelog - + All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) @@ -7,10 +7,37 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). -## [2.19.5](https://github.com/Terradue/Stars/compare/2.19.4...2.19.5) +## [2.20.1](https://github.com/Terradue/Stars/compare/2.20.0...2.20.1) + +### Commits + +- Add launch configuration for displaying copy help [`54e7561`](https://github.com/Terradue/Stars/commit/54e756116e4eaa36207318947dd29e693346ced6) + +## [2.20.0](https://github.com/Terradue/Stars/compare/2.19.6...2.20.0) - 2024-03-07 + +### Merged + +- Changes for Vision-1 metadata extraction [`#47`](https://github.com/Terradue/Stars/pull/47) +- SciHub refresh 1.28.5 for Sentinel-3 DATAAUTHOR-252 [`#45`](https://github.com/Terradue/Stars/pull/45) + +### Commits + +- Vision-1 refactoring and test changes [`fa35730`](https://github.com/Terradue/Stars/commit/fa357300e5f04dc26bbcc38dcec79d2e5fae34e5) +- Initial changes for different DIMAP format (Vision-1 bundles) [`aef5f65`](https://github.com/Terradue/Stars/commit/aef5f65eb8cc2820ca93a6d046c20b68fc0fb0cc) +- Corrections for Vision-1 and related functionality [`bb50fbd`](https://github.com/Terradue/Stars/commit/bb50fbd3e406045310e2fd8b03daf67fd6a6119b) + +## [2.19.6](https://github.com/Terradue/Stars/compare/2.19.5...2.19.6) - 2024-02-27 + +### Commits + +- Update GeosquareService and AmazonCustomS3Config classes [`c192cf0`](https://github.com/Terradue/Stars/commit/c192cf05adfa20409f22a437cabc02afac7bfdfa) +- Update project versions to 2.19.6 [`da25d1f`](https://github.com/Terradue/Stars/commit/da25d1f98fa714b44800b6ca95084e0ff5807e56) + +## [2.19.5](https://github.com/Terradue/Stars/compare/2.19.4...2.19.5) - 2024-02-26 ### Commits +- Update version numbers to 2.19.5 [`9dfb5dd`](https://github.com/Terradue/Stars/commit/9dfb5dd5df6b05edc68dd372696dc49129fc91cb) - fix for empty serviceUrl in AmazonCustomS3Config.cs [`5a42ea8`](https://github.com/Terradue/Stars/commit/5a42ea8cbb32032b58e239d91703f86df21d972e) ## [2.19.4](https://github.com/Terradue/Stars/compare/2.19.3...2.19.4) - 2024-02-20 diff --git a/src/Stars.Console/Terradue.Stars.Console.csproj b/src/Stars.Console/Terradue.Stars.Console.csproj index 723df67d..a80104f6 100644 --- a/src/Stars.Console/Terradue.Stars.Console.csproj +++ b/src/Stars.Console/Terradue.Stars.Console.csproj @@ -2,7 +2,7 @@ Exe net6.0 - 2.20.0 + 2.20.1 Stars is a CLI for working with Spatio Temporal Catalog such as STAC but not only $(Version)-$(VersionSuffix) diff --git a/src/Stars.Data/Terradue.Stars.Data.csproj b/src/Stars.Data/Terradue.Stars.Data.csproj index f8a582cf..08257b9e 100644 --- a/src/Stars.Data/Terradue.Stars.Data.csproj +++ b/src/Stars.Data/Terradue.Stars.Data.csproj @@ -4,7 +4,7 @@ Terradue.Stars.Data Terradue.Stars.Data Collection of data Plugins for Terradue.Stars - 2.20.0 + 2.20.1 $(Version)-$(VersionSuffix) NU1603 diff --git a/src/Stars.Services/Terradue.Stars.Services.csproj b/src/Stars.Services/Terradue.Stars.Services.csproj index a3d60d1a..d959ddee 100644 --- a/src/Stars.Services/Terradue.Stars.Services.csproj +++ b/src/Stars.Services/Terradue.Stars.Services.csproj @@ -3,7 +3,7 @@ netstandard2.0 Terradue.Stars Stars is a set of services for working with Spatio Temporal Catalog such as STAC but not only - 2.20.0 + 2.20.1 $(Version)-$(VersionSuffix) Terradue.Stars.Services