Skip to content

Commit

Permalink
Merge pull request #146 from signnow/dependecies-update
Browse files Browse the repository at this point in the history
Dependencies update
  • Loading branch information
AlexNDRmac authored Dec 21, 2022
2 parents 08fd325 + 1b85d90 commit c527e88
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 25 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ jobs:
matrix:
include:
# Ubuntu
- { name: 'Linux .NET Core 3', os: ubuntu-18.04, framework: 'netcoreapp3.1' }
- { name: 'Linux .NET 5', os: ubuntu-18.04, framework: 'net5' }
- { name: 'Linux .NET Core 3', os: ubuntu-22.04, framework: 'netcoreapp3.1' }
- { name: 'Linux .NET 5', os: ubuntu-22.04, framework: 'net5' }
# macOs
- { name: 'macOS .NET Core 3', os: macOS-latest, framework: 'netcoreapp3.1' }
- { name: 'macOS .NET 5', os: macOS-latest, framework: 'net5' }
Expand All @@ -55,7 +55,7 @@ jobs:
shell: pwsh

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 1

Expand All @@ -69,12 +69,12 @@ jobs:
- name: Setup .NET SDK
if: (runner.os == 'macOS' || runner.os == 'Linux')
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: ${{ env.DOTNET_SDK_VERSION }}

- name: Setup Nuget Cache
uses: actions/cache@v2
uses: actions/cache@v3
id: nuget-cache
with:
path: ~/.nuget
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
/p:CollectCoverage=true
- name: Save Code Coverage Results
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: CoverageReports-${{ runner.os }}-${{ matrix.framework }}.zip
path: SignNow.Net.Test/bin/Debug/**/coverage*
Expand All @@ -136,10 +136,10 @@ jobs:
- name: Upload Code Coverage Report (Codecov.io)
continue-on-error: true
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@v3
with:
name: ${{ runner.os }}-codecov-${{ matrix.framework }}
flags: ${{ runner.os }},${{ env.TARGET_FRAMEWORK }}
token: ${{ secrets.CODECOV_TOKEN }}
file: ${{ env.COVERAGE_PATH }}/${{ matrix.framework }}/coverage.${{ matrix.framework }}.opencover.xml
files: ${{ env.COVERAGE_PATH }}/${{ matrix.framework }}/coverage.${{ matrix.framework }}.opencover.xml
fail_ci_if_error: false
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@ jobs:
NUGET_XMLDOC_MODE: skip # prevent the download of the XML documentation for the packages

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Setup .NET 5
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
3.1.x
5.0.x
- name: Setup Nuget Cache
uses: actions/cache@v2
uses: actions/cache@v3
id: nuget-cache
with:
path: ~/.nuget
Expand All @@ -51,7 +51,7 @@ jobs:
- name: Prepare Release Assets
id: get-version
run: |
echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/}
echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
.github/release-notes.sh CHANGELOG.md > release-notes.txt
- name: Create Release
Expand Down
8 changes: 6 additions & 2 deletions SignNow.Net.Examples/SignNow.Net.Examples.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion SignNow.Net.Test/AuthorizedApiTestBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ protected static void DeleteTestDocument(string documentId)
}

using (var client = new HttpClient())
using (var requestMessage = new HttpRequestMessage(HttpMethod.Delete, $"{ApiBaseUrl}/document/{documentId}"))
using (var requestMessage = new HttpRequestMessage(HttpMethod.Delete, $"{ApiBaseUrl.AbsoluteUri.Trim('/')}/document/{documentId}"))
{
requestMessage.Headers.Add("Authorization", Token.GetAuthorizationHeaderValue());
var response = client.SendAsync(requestMessage).Result;
Expand Down
3 changes: 3 additions & 0 deletions SignNow.Net.Test/FeatureTests/FreeFormInviteTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ public async Task DocumentOwnerCanSendFreeFormInviteToUser()
Assert.IsNull(documentInviteRequest.IsCanceled, "Invite status should not be canceled by default.");
Assert.AreEqual(InviteStatus.Pending, documentInviteRequest.Status);
Assert.AreEqual(DocumentStatus.Pending, documentInfo.Status);

// Could not delete document with pending invites. Invites must be cancelled first
await SignNowTestContext.Invites.CancelInviteAsync(documentInviteRequest).ConfigureAwait(false);
}

[TestMethod]
Expand Down
3 changes: 3 additions & 0 deletions SignNow.Net.Test/FeatureTests/RoleBasedInviteTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ public async Task DocumentOwnerCanSendRoleBasedInvite()
Assert.AreEqual("Pending", fieldInvites.Status.ToString(), "Newly created Invite must have status: pending.");
Assert.AreEqual("Signer 1", fieldInvites.RoleName, "Signer role mismatch.");
Assert.AreEqual("signer1@signnow.com", fieldInvites.SignerEmail, "Signer email mismatch.");

// Could not delete document with pending invites. Invites must be cancelled first
await SignNowTestContext.Invites.CancelInviteAsync(documentUpdated.Id).ConfigureAwait(false);
}

[TestMethod]
Expand Down
12 changes: 4 additions & 8 deletions SignNow.Net.Test/SignNow.Net.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,17 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="Moq" Version="4.14.5" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="Moq" Version="4.17.2" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
<!-- Do not upgrade Coverlet.MSBuild and Coverlet.Collector to avoid coverage report with missed methods -->
<PackageReference Include="coverlet.msbuild" Version="2.8.0" />
<PackageReference Include="coverlet.collector" Version="1.2.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Bogus" Version="31.0.3" />
<PackageReference Include="Bogus" Version="34.0.2" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
Expand Down
4 changes: 2 additions & 2 deletions SignNow.Net/SignNow.Net.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<None Include="icon.png" Pack="true" PackagePath="\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System.Net.Http" />
Expand Down

0 comments on commit c527e88

Please sign in to comment.