Skip to content

Commit 1a08564

Browse files
authored
Merge pull request #2 from SamhammerAG/dotnet6
ASMO-3956 update to dotnet 6
2 parents 0968eed + 66392c7 commit 1a08564

File tree

5 files changed

+12
-28
lines changed

5 files changed

+12
-28
lines changed

.github/workflows/cicd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
id: tag
2121
- uses: actions/setup-dotnet@v1
2222
with:
23-
dotnet-version: 3.1.x
23+
dotnet-version: 6.0.x
2424
- run: echo "::remove-matcher owner=csc::"
2525
- uses: reviewdog/action-setup@v1
2626
- run: dotnet --info

src/Samhammer.Web.Common.sln

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29306.81
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.32112.339
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samhammer.Web.Common", "Samhammer.Web.Common\Samhammer.Web.Common.csproj", "{9FC91AD8-3FF7-4B74-B99E-D8F18DFA6B5D}"
77
EndProject

src/Samhammer.Web.Common/Extensions/UnsignedHttpClientExtensions.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
1-
using Microsoft.AspNetCore.Hosting;
2-
using Microsoft.Extensions.DependencyInjection;
1+
using Microsoft.Extensions.DependencyInjection;
32
using Samhammer.Web.Common.Http;
43

54
namespace Samhammer.Web.Common.Extensions
65
{
76
public static class UnsignedHttpClientExtensions
87
{
9-
public static void AddUnsignedHttpClient(this IWebHostBuilder webHostBuilder)
10-
{
11-
webHostBuilder.ConfigureServices(AddUnsignedHttpClient);
12-
}
13-
148
public static void AddUnsignedHttpClient(this IServiceCollection serviceCollection)
159
{
1610
serviceCollection.AddTransient<UnsignedHttpClientHandler>();

src/Samhammer.Web.Common/Http/UnsignedHttpClientBuilder.cs

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/Samhammer.Web.Common/Samhammer.Web.Common.csproj

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,28 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<CodeAnalysisRuleSet>..\stylecop.ruleset</CodeAnalysisRuleSet>
66
<Authors>Samhammer AG</Authors>
77
<Company>Samhammer AG</Company>
88
<PackageProjectUrl>https://github.com/SamhammerAG/Samhammer.Web.Common/</PackageProjectUrl>
99
<RepositoryUrl>https://github.com/SamhammerAG/Samhammer.Web.Common/</RepositoryUrl>
1010
<PackageLicenseExpression>MIT</PackageLicenseExpression>
11-
<Version>3.2.0</Version>
11+
<PackageReadmeFile>README.md</PackageReadmeFile>
12+
<Description>Common logic you can use in your for .NET Core web projects</Description>
1213
</PropertyGroup>
1314

1415
<ItemGroup>
1516
<AdditionalFiles Include="..\stylecop.json" />
1617
</ItemGroup>
1718

19+
<ItemGroup>
20+
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
21+
</ItemGroup>
22+
1823
<ItemGroup>
1924
<FrameworkReference Include="Microsoft.AspNetCore.App" />
20-
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
25+
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.376">
2126
<PrivateAssets>all</PrivateAssets>
2227
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2328
</PackageReference>

0 commit comments

Comments
 (0)