Skip to content

Commit

Permalink
Merge branch 'hotfix/2.16.2' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
emmanuelmathot committed Sep 22, 2023
2 parents 88e8991 + a3dca0e commit b87ee08
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 6 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@ 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.16.1](https://github.com/Terradue/Stars/compare/2.16.0...2.16.1)
## [2.16.2](https://github.com/Terradue/Stars/compare/2.16.1...2.16.2)

### Commits

- fix null content [`f6953f4`](https://github.com/Terradue/Stars/commit/f6953f4a2f9816562898668871179c58cb6d7e52)

## [2.16.1](https://github.com/Terradue/Stars/compare/2.16.0...2.16.1) - 2023-09-22

### Commits

Expand Down
2 changes: 1 addition & 1 deletion src/Stars.Console/Terradue.Stars.Console.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0</TargetFrameworks>
<Version>2.16.1</Version>
<Version>2.16.2</Version>
<!-- <VersionSuffix>beta.8</VersionSuffix> -->
<Description>Stars is a CLI for working with Spatio Temporal Catalog such as STAC but not only</Description>
<Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
Expand Down
2 changes: 1 addition & 1 deletion src/Stars.Data/Terradue.Stars.Data.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<ProjectName>Terradue.Stars.Data</ProjectName>
<Title>Terradue.Stars.Data</Title>
<Description>Collection of data Plugins for Terradue.Stars</Description>
<Version>2.16.1</Version>
<Version>2.16.2</Version>
<!-- <VersionSuffix>beta.8</VersionSuffix> -->
<Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
<NoWarn>NU1603</NoWarn>
Expand Down
4 changes: 2 additions & 2 deletions src/Stars.Data/ThirdParty/Publication/GeosquareService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ public async Task PrepareAtomItem(AtomItem atomItem, GeosquarePublicationState g
{
var xml = extension.GetReader().ReadOuterXml();
var offering = OwcContextHelper.OwcOfferingSerializer.Deserialize(new System.IO.StringReader(xml)) as OwcOffering;
if ( offering == null ) continue;
if (offering == null || offering.Contents == null) continue;
atomItem.ElementExtensions.Remove(extension);
foreach (var content in offering.Contents)
{
Expand All @@ -225,7 +225,7 @@ public async Task PrepareAtomItem(AtomItem atomItem, GeosquarePublicationState g
atomItem.ElementExtensions.Add(offering.CreateReader());
}
}

atomItem.ElementExtensions.ReadElementExtensions<OwcOffering>("offering", OwcNamespaces.Owc, new System.Xml.Serialization.XmlSerializer(typeof(OwcOffering)));


Expand Down
2 changes: 1 addition & 1 deletion src/Stars.Services/Terradue.Stars.Services.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<TargetFramework>netstandard2.0</TargetFramework>
<Title>Terradue.Stars</Title>
<Description>Stars is a set of services for working with Spatio Temporal Catalog such as STAC but not only</Description>
<Version>2.16.1</Version>
<Version>2.16.2</Version>
<!-- <VersionSuffix>beta.8</VersionSuffix> -->
<Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
<AssemblyName>Terradue.Stars.Services</AssemblyName>
Expand Down

0 comments on commit b87ee08

Please sign in to comment.