Skip to content

Commit

Permalink
Merge pull request #37 from vlnevyhosteny/master
Browse files Browse the repository at this point in the history
Update target to .NET standard 2.1
  • Loading branch information
ViolanteCodes authored Sep 6, 2023
2 parents 31f9c47 + 8d99988 commit db690ea
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 34 deletions.
10 changes: 5 additions & 5 deletions ButterCMS.Tests/ButterCMS.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="NUnit" Version="3.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ButterCMS\ButterCMS.csproj" />
Expand Down
13 changes: 0 additions & 13 deletions ButterCMS.Tests/packages.config

This file was deleted.

4 changes: 2 additions & 2 deletions ButterCMS.sln
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@


Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ButterCMS", "ButterCMS\ButterCMS.csproj", "{50FCE935-0E01-404B-87BE-0D075008EDCD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ButterCMS.Tests", "ButterCMS.Tests\ButterCMS.Tests.csproj", "{5ADAB9E1-1D98-4E71-8775-9CFF6D8895A9}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ButterCMS.Tests", "ButterCMS.Tests\ButterCMS.Tests.csproj", "{5ADAB9E1-1D98-4E71-8775-9CFF6D8895A9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
13 changes: 6 additions & 7 deletions ButterCMS/ButterCMS.csproj
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<TargetFrameworks>net45;net451;net452;net46;net461;net462;netstandard1.3;netstandard2.0;</TargetFrameworks>
<TargetFrameworks>netstandard2.1</TargetFrameworks>
<OldToolsVersion>2.0</OldToolsVersion>
</PropertyGroup>
<PropertyGroup>
<Version>1.4.1</Version>
<FileVersion>1.4.1</FileVersion>
<Version>2.0.0</Version>
<FileVersion>2.0.0</FileVersion>
<Authors>Brandon Nicoll; ButterCMS</Authors>
<Description>API Client for ButterCMS; including both synchronous and asynchronous API endpoint methods.</Description>
<Copyright>Copyright (c) 2020 ButterCMS</Copyright>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
</ItemGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='net45'">
<AssemblyTitle>Json.NET</AssemblyTitle>
<DefineConstants>HAVE_COM_ATTRIBUTES;</DefineConstants>
Expand All @@ -28,4 +24,7 @@
<PackageIconUrl>https://avatars0.githubusercontent.com/u/16144259</PackageIconUrl>
<PackageReleaseNotes>Name is now included in pages</PackageReleaseNotes>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
</Project>
5 changes: 0 additions & 5 deletions ButterCMS/packages.config

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# buttercms-csharp

.NET Library for ButterCMS API.
.NET Standard (2.1) Library for ButterCMS API.

## Documentation

Expand All @@ -25,7 +25,7 @@ Or by adding the package manually to the project file

```xml
<ItemGroup>
<PackageReference Include="ButterCMS" Version="1.4.1" />
<PackageReference Include="ButterCMS" Version="2.0.0" />
</ItemGroup>
```

Expand Down

0 comments on commit db690ea

Please sign in to comment.