Skip to content

Commit 8bd3d46

Browse files
authored
Merge pull request #53 from ladeak/net6_compatible
NET6 compatible
2 parents f1f7b39 + 17cb5ea commit 8bd3d46

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

src/JsonMergePatch.Http/JsonMergePatch.Http.csproj

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;netstandard2.1</TargetFrameworks>
4+
<TargetFramework>net6.0</TargetFramework>
55
<RootNamespace>LaDeak.JsonMergePatch.Http</RootNamespace>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>
88

9-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
10-
<PackageReference Include="System.Text.Json" Version="6.0.0" />
11-
</ItemGroup>
12-
139
<ItemGroup>
1410
<ProjectReference Include="..\JsonMergePatch.Abstractions\JsonMergePatch.Abstractions.csproj" />
1511
</ItemGroup>

src/JsonMergePatch.SourceGenerator/JsonMergePatch.SourceGenerator.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.11.0" PrivateAssets="all" />
11+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" />
1212
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="$(MicrosoftCodeAnalysisAnalyzersVersion)" PrivateAssets="all" />
1313
</ItemGroup>
1414

test/JsonMergePatch.SourceGenerator.Abstractions.Tests/JsonMergePatch.SourceGenerator.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.11.0" />
10+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" />
1111
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
1212
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
1313
<PackageReference Include="NSubstitute" Version="4.2.2" />

0 commit comments

Comments
 (0)