Skip to content

Commit

Permalink
Merge branch 'release/0.9.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
emmanuelmathot committed Jun 15, 2021
2 parents ab35377 + 0eb17bd commit dec0b31
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
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>netcoreapp3.1;net5.0</TargetFrameworks>
<Version>0.9.5</Version>
<Version>0.9.6</Version>
<Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
<VersionSuffix>$(VersionSuffix)</VersionSuffix>
<AssemblyName>Stars</AssemblyName>
Expand Down
11 changes: 8 additions & 3 deletions src/Stars.Services/Model/Stac/StacAssetAsset.cs
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,17 @@ public ContentDisposition ContentDisposition
{
ContentDisposition cd = new ContentDisposition();
if (asset.Properties.ContainsKey("filename"))
{
cd.FileName = asset.GetProperty<string>("filename");
try
}
else
{
cd = GetStreamable()?.ContentDisposition ?? new ContentDisposition() { FileName = Filename };
try
{
cd = GetStreamable()?.ContentDisposition ?? new ContentDisposition() { FileName = Filename };
}
catch { }
}
catch { }
return cd;
}
}
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.1</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>0.9.5</Version>
<Version>0.9.6</Version>
<!-- <VersionSuffix>beta.1</VersionSuffix> -->
<AssemblyName>Terradue.Stars.Services</AssemblyName>
<PackageId>Terradue.Stars</PackageId>
Expand Down

0 comments on commit dec0b31

Please sign in to comment.