Skip to content

Commit 497572c

Browse files
committed
Merge branch 'release/2.25.11'
2 parents 18c98ba + 2ad9d74 commit 497572c

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

src/Stars.Console/Terradue.Stars.Console.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
44
<TargetFrameworks>net6.0</TargetFrameworks>
5-
<Version>2.25.10</Version>
5+
<Version>2.25.11</Version>
66
<!-- <VersionSuffix>beta.8</VersionSuffix> -->
77
<Description>Stars is a CLI for working with Spatio Temporal Catalog such as STAC but not only</Description>
88
<Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>

src/Stars.Data/Terradue.Stars.Data.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<ProjectName>Terradue.Stars.Data</ProjectName>
55
<Title>Terradue.Stars.Data</Title>
66
<Description>Collection of data Plugins for Terradue.Stars</Description>
7-
<Version>2.25.10</Version>
7+
<Version>2.25.11</Version>
88
<!-- <VersionSuffix>beta.8</VersionSuffix> -->
99
<Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
1010
<NoWarn>NU1603</NoWarn>
@@ -33,7 +33,7 @@
3333
<PackageReference Include="MimeTypes" Version="2.0.2" />
3434
<PackageReference Include="Terradue.OpenSearch.SciHub" Version="1.48.*"/>
3535
<PackageReference Include="Terradue.OpenSearch.Asf" Version="1.4.*" />
36-
<PackageReference Include="Terradue.OpenSearch.Usgs" Version="1.8.0" />
36+
<PackageReference Include="Terradue.OpenSearch.Usgs" Version="1.8.*" />
3737
<PackageReference Include="Terradue.OpenSearch.GeoJson" Version="1.4.5" />
3838
<PackageReference Include="Terradue.GeoJson" Version="1.12.1" />
3939
<PackageReference Include="MaxRev.Gdal.Core" Version="3.3.3.110" />

src/Stars.Services/Processing/TarArchiveAsset.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,10 @@ public Task<IDictionary<string, IAsset>> ExtractTarAsync(Stream tarStream,
147147
blockingStream.Close();
148148
}, null, TaskCreationOptions.AttachedToParent);
149149

150-
extractedAssets.Add(name, tarEntryAction(tarEntryAsset, destination, carrierManager, ct).GetAwaiter().GetResult());
150+
if (!name.Contains("/@") && !extractedAssets.ContainsKey(name))
151+
{
152+
extractedAssets.Add(name, tarEntryAction(tarEntryAsset, destination, carrierManager, ct).GetAwaiter().GetResult());
153+
}
151154

152155
if (!extractTask.IsCompleted)
153156
{

src/Stars.Services/Terradue.Stars.Services.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<TargetFramework>netstandard2.0</TargetFramework>
44
<Title>Terradue.Stars</Title>
55
<Description>Stars is a set of services for working with Spatio Temporal Catalog such as STAC but not only</Description>
6-
<Version>2.25.10</Version>
6+
<Version>2.25.11</Version>
77
<!-- <VersionSuffix>beta.8</VersionSuffix> -->
88
<Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
99
<AssemblyName>Terradue.Stars.Services</AssemblyName>

0 commit comments

Comments
 (0)