Skip to content

Commit 84acaa2

Browse files
author
Simen Støa
authored
Merge pull request #352 from digipost/support-seid-2
Upgrade Digipost.Api.Client.Shared to 7.1.2 to support seid2
2 parents 7976e4f + a6cea1c commit 84acaa2

File tree

11 files changed

+30
-30
lines changed

11 files changed

+30
-30
lines changed

‎.github/workflows/release.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Release
33
on:
44
push:
55
tags:
6-
- '*'
6+
- "*"
77

88
jobs:
99
release:
@@ -25,17 +25,17 @@ jobs:
2525
- name: Print assembly version
2626
run: echo $ASSEMBLY_VERSION
2727
- name: Pack nupkg
28-
run: dotnet pack -p:PackageVersion=$RELEASE_VERSION -p:AssemblyVersion=$ASSEMBLY_VERSION --configuration Release --no-build --output digipost/packed Digipost.Signature.Api.Client.Core
28+
run: dotnet pack -p:PackageVersion=$RELEASE_VERSION -p:AssemblyVersion=$ASSEMBLY_VERSION -p:InformationalVersion=$RELEASE_VERSION --configuration Release --no-build --output digipost/packed Digipost.Signature.Api.Client.Core
2929
- name: Pack nupkg
30-
run: dotnet pack -p:PackageVersion=$RELEASE_VERSION -p:AssemblyVersion=$ASSEMBLY_VERSION --configuration Release --no-build --output digipost/packed Digipost.Signature.Api.Client.Archive
30+
run: dotnet pack -p:PackageVersion=$RELEASE_VERSION -p:AssemblyVersion=$ASSEMBLY_VERSION -p:InformationalVersion=$RELEASE_VERSION --configuration Release --no-build --output digipost/packed Digipost.Signature.Api.Client.Archive
3131
- name: Pack nupkg
32-
run: dotnet pack -p:PackageVersion=$RELEASE_VERSION -p:AssemblyVersion=$ASSEMBLY_VERSION --configuration Release --no-build --output digipost/packed Digipost.Signature.Api.Client.Direct
32+
run: dotnet pack -p:PackageVersion=$RELEASE_VERSION -p:AssemblyVersion=$ASSEMBLY_VERSION -p:InformationalVersion=$RELEASE_VERSION --configuration Release --no-build --output digipost/packed Digipost.Signature.Api.Client.Direct
3333
- name: Pack nupkg
34-
run: dotnet pack -p:PackageVersion=$RELEASE_VERSION -p:AssemblyVersion=$ASSEMBLY_VERSION --configuration Release --no-build --output digipost/packed Digipost.Signature.Api.Client.Portal
34+
run: dotnet pack -p:PackageVersion=$RELEASE_VERSION -p:AssemblyVersion=$ASSEMBLY_VERSION -p:InformationalVersion=$RELEASE_VERSION --configuration Release --no-build --output digipost/packed Digipost.Signature.Api.Client.Portal
3535
- name: Pack nupkg
36-
run: dotnet pack -p:PackageVersion=$RELEASE_VERSION -p:AssemblyVersion=$ASSEMBLY_VERSION --configuration Release --no-build --output digipost/packed Digipost.Signature.Api.Client.Resources
36+
run: dotnet pack -p:PackageVersion=$RELEASE_VERSION -p:AssemblyVersion=$ASSEMBLY_VERSION -p:InformationalVersion=$RELEASE_VERSION --configuration Release --no-build --output digipost/packed Digipost.Signature.Api.Client.Resources
3737
- name: Pack nupkg
38-
run: dotnet pack -p:PackageVersion=$RELEASE_VERSION -p:AssemblyVersion=$ASSEMBLY_VERSION --configuration Release --no-build --output digipost/packed Digipost.Signature.Api.Client.Scripts
38+
run: dotnet pack -p:PackageVersion=$RELEASE_VERSION -p:AssemblyVersion=$ASSEMBLY_VERSION -p:InformationalVersion=$RELEASE_VERSION --configuration Release --no-build --output digipost/packed Digipost.Signature.Api.Client.Scripts
3939
- name: Push Client to NuGet
4040
env:
4141
NUGET_API_KEY: ${{ secrets.NUGETAPIKEY }}

‎Digipost.Signature.Api.Client.Core.Tests/Digipost.Signature.Api.Client.Core.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<ItemGroup>
3-
<PackageReference Include="Digipost.Api.Client.Shared" Version="7.0.1" />
3+
<PackageReference Include="Digipost.Api.Client.Shared" Version="7.1.2" />
44
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="5.0.0" />
55
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
66
<PackageReference Include="NLog" Version="4.7.6" />

‎Digipost.Signature.Api.Client.Core/Digipost.Signature.Api.Client.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Digipost.Api.Client.Shared" Version="7.0.1" />
10+
<PackageReference Include="Digipost.Api.Client.Shared" Version="7.1.2" />
1111
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
1212
<PackageReference Include="System.Net.Requests" Version="4.3.0" />
1313
<PackageReference Include="System.Security.Cryptography.Xml" Version="5.0.0" />

‎Digipost.Signature.Api.Client.Core/Internal/UserAgentHandler.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ internal class UserAgentHandler : DelegatingHandler
1111
{
1212
protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
1313
{
14-
request.Headers.Add("User-Agent", GetAssemblyVersion());
14+
request.Headers.Add("User-Agent", GetInformationalVersion());
1515

1616
return await base.SendAsync(request, cancellationToken).ConfigureAwait(false);
1717
}
18-
19-
private static string GetAssemblyVersion()
18+
19+
private static string GetInformationalVersion()
2020
{
21-
var assemblyVersion = Assembly.GetExecutingAssembly().GetName().Version;
21+
var informationalVersion = Assembly.GetExecutingAssembly().GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion;
2222

23-
return $"posten-signature-api-client-dotnet/{assemblyVersion} (netcore/{GetNetCoreVersion()})";
23+
return $"posten-signature-api-client-dotnet/{informationalVersion} (netcore/{GetNetCoreVersion()})";
2424
}
2525

2626
private static string GetNetCoreVersion()

‎Digipost.Signature.Api.Client.Direct.Tests/Digipost.Signature.Api.Client.Direct.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<ItemGroup>
3-
<PackageReference Include="Digipost.Api.Client.Shared" Version="7.0.1" />
3+
<PackageReference Include="Digipost.Api.Client.Shared" Version="7.1.2" />
44
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
55
<PackageReference Include="xunit" Version="2.4.1" />
66
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />

‎Digipost.Signature.Api.Client.Direct/Digipost.Signature.Api.Client.Direct.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
1313
<PackageReference Include="System.Net.Requests" Version="4.*" />
1414
<PackageReference Include="System.Security.Cryptography.Xml" Version="5.0.0" />
15-
<PackageReference Include="Digipost.Api.Client.Shared" Version="7.0.1" />
15+
<PackageReference Include="Digipost.Api.Client.Shared" Version="7.1.2" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎Digipost.Signature.Api.Client.Docs/Digipost.Signature.Api.Client.Docs.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Digipost.Api.Client.Shared" Version="7.0.1" />
8+
<PackageReference Include="Digipost.Api.Client.Shared" Version="7.1.2" />
99
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
1010
<PackageReference Include="NLog" Version="4.7.6" />
1111
<PackageReference Include="NLog.Extensions.Logging" Version="1.6.5" />

‎Digipost.Signature.Api.Client.Portal.Tests/Digipost.Signature.Api.Client.Portal.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<ItemGroup>
3-
<PackageReference Include="Digipost.Api.Client.Shared" Version="7.0.1" />
3+
<PackageReference Include="Digipost.Api.Client.Shared" Version="7.1.2" />
44
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
55
<PackageReference Include="NLog" Version="4.7.6" />
66
<PackageReference Include="NLog.Extensions.Logging" Version="1.6.5" />

‎Digipost.Signature.Api.Client.Portal/Digipost.Signature.Api.Client.Portal.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Digipost.Api.Client.Shared" Version="7.0.1" />
10+
<PackageReference Include="Digipost.Api.Client.Shared" Version="7.1.2" />
1111
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
1212
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
1313
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />

‎Digipost.Signature.Api.Client.Resources/Digipost.Signature.Api.Client.Resources.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Digipost.Api.Client.Shared" Version="7.0.1" />
10+
<PackageReference Include="Digipost.Api.Client.Shared" Version="7.1.2" />
1111
</ItemGroup>
1212

1313
<ItemGroup Condition="'$(Configuration)' == 'Debug'">
14-
<None Update="Xml\Data\**\*" CopyToOutputDirectory="PreserveNewest"/>
15-
<None Update="Xsd\Data\**\*" CopyToOutputDirectory="PreserveNewest"/>
16-
<None Update="Document\Data\**\*" CopyToOutputDirectory="PreserveNewest"/>
14+
<None Update="Xml\Data\**\*" CopyToOutputDirectory="PreserveNewest" />
15+
<None Update="Xsd\Data\**\*" CopyToOutputDirectory="PreserveNewest" />
16+
<None Update="Document\Data\**\*" CopyToOutputDirectory="PreserveNewest" />
1717
</ItemGroup>
1818
<ItemGroup>
19-
<None Remove="Xml\Data\**\*"/>
20-
<None Remove="Xsd\Data\**\*"/>
21-
<None Remove="Document\Data\**\*"/>
19+
<None Remove="Xml\Data\**\*" />
20+
<None Remove="Xsd\Data\**\*" />
21+
<None Remove="Document\Data\**\*" />
2222
</ItemGroup>
2323
<ItemGroup>
24-
<EmbeddedResource Include="Xml\Data\**\*"/>
25-
<EmbeddedResource Include="Xsd\Data\**\*"/>
26-
<EmbeddedResource Include="Document\Data\**\*"/>
24+
<EmbeddedResource Include="Xml\Data\**\*" />
25+
<EmbeddedResource Include="Xsd\Data\**\*" />
26+
<EmbeddedResource Include="Document\Data\**\*" />
2727
</ItemGroup>
2828
</Project>

0 commit comments

Comments
 (0)