Skip to content

Commit

Permalink
dotnet-version: 8.0.x and updated packages
Browse files Browse the repository at this point in the history
  • Loading branch information
paolo-arge-lf committed Jun 25, 2024
1 parent f5e354d commit a03f90d
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 21 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
3.1.x
6.0.x
dotnet-version: 8.0.x

- name: Restore dependencies
run: dotnet restore
Expand Down Expand Up @@ -111,7 +109,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
dotnet-version: 8.0.x

- name: Restore dependencies
run: dotnet restore
Expand Down Expand Up @@ -148,7 +146,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
dotnet-version: 8.0.x

- name: Restore dependencies
run: dotnet restore
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/veracode-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
dotnet-version: 8.0.x

- name: Restore dependencies
run: dotnet restore --ignore-failed-sources
Expand Down
2 changes: 0 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
MIT License

Copyright (c) 2022 Laserfiche

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
Expand Down
5 changes: 5 additions & 0 deletions Laserfiche.Repository.Api.Client.sln
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{820A4706-DE2D-4F9E-8760-AD027DC8304A}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
CHANGELOG.md = CHANGELOG.md
CODE_OF_CONDUCT.md = CODE_OF_CONDUCT.md
LICENSE = LICENSE
MIGRATION_GUIDE.md = MIGRATION_GUIDE.md
README.md = README.md
EndProjectSection
EndProject
Global
Expand Down
2 changes: 1 addition & 1 deletion src/Laserfiche.Repository.Api.Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Laserfiche.Api.Client.Core" Version="1.3.6-beta-9164999985" />
<PackageReference Include="Laserfiche.Api.Client.Core" Version="1.3.6-beta-9655005290" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/RepositoryApiClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ internal RepositoryApiClient(HttpClient httpClient)
/// <summary>
/// Create a Laserfiche repository client.
/// </summary>
/// <param name="httpRequestHandler">The http request handler for the Laserfiche repository client.</param>
/// <param name="httpRequestHandler">The http request handler for the Laserfiche APIs.</param>
/// <param name="baseUrlDebug">(optional) Override for the Laserfiche repository API base url.</param>
/// <returns>IRepositoryApiClient</returns>
public static IRepositoryApiClient CreateFromHttpRequestHandler(IHttpRequestHandler httpRequestHandler, string baseUrlDebug = null)
Expand All @@ -87,8 +87,8 @@ public static IRepositoryApiClient CreateFromHttpRequestHandler(IHttpRequestHand
baseUrlDebug = DefaultBaseAddress;
}

var repositoryClientHandler = new ApiHttpMessageHandler(httpRequestHandler, getApiBaseUri);
var httpClient = new HttpClient(repositoryClientHandler);
var apiHttpMessageHandler = new ApiHttpMessageHandler(httpRequestHandler, getApiBaseUri);
var httpClient = new HttpClient(apiHttpMessageHandler);
httpClient.BaseAddress = new Uri(baseUrlDebug);
var repositoryClient = new RepositoryApiClient(httpClient);
return repositoryClient;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<Authors>Laserfiche</Authors>
<Copyright>Apache License 2.0</Copyright>
Expand All @@ -11,9 +11,9 @@

<ItemGroup>
<PackageReference Include="DotNetEnv" Version="3.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
<PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.4.3" />
<PackageReference Include="MSTest.TestFramework" Version="3.4.3" />
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/Custom/ApiExceptionExtensionsTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class ApiExceptionExtensionsTest
{
private const string OPERATION_ID_HEADER = "X-RequestId";

private void AssertApiExceptionAreEqual(ApiException expected, ApiException actual)
private static void AssertApiExceptionAreEqual(ApiException expected, ApiException actual)
{
Assert.Equal(expected.StatusCode, actual.StatusCode);
Assert.Equal(expected.Message, actual.Message);
Expand Down
8 changes: 4 additions & 4 deletions tests/unit/Laserfiche.Repository.Api.Client.Test.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<Authors>Laserfiche</Authors>
<Copyright>Apache License 2.0</Copyright>
Expand All @@ -10,10 +10,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="xunit" Version="2.8.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
<PackageReference Include="xunit" Version="2.8.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down

0 comments on commit a03f90d

Please sign in to comment.