Fixing compilation

restsharp · Apr 5, 2024 · 51abdef · 51abdef
1 parent 229550a
commit 51abdef
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -18,7 +18,7 @@
         <PackageReadmeFile>README.md</PackageReadmeFile>
     </PropertyGroup>
 
-    <PropertyGroup Condition="'$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'netstandard2.0'">
+    <PropertyGroup Condition="'$(TargetFramework)' == 'net471' Or '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'net48'">
         <AddSystemTextJson>true</AddSystemTextJson>
         <AddNullable>true</AddNullable>
     </PropertyGroup>

diff --git a/src/RestSharp/RestSharp.csproj b/src/RestSharp/RestSharp.csproj
@@ -5,11 +5,9 @@
     <ItemGroup>
         <None Remove="RestSharp.csproj.DotSettings"/>
     </ItemGroup>
-    <ItemGroup Condition="'$(TargetFramework)' == 'net471'">
+    <ItemGroup Condition="'$(TargetFramework)' == 'net471' Or '$(TargetFramework)' == 'net48'">
         <Reference Include="System.Net.Http"/>
         <Reference Include="System.Web"/>
-        <PackageReference Include="Nullable" PrivateAssets="All"/>
-        <PackageReference Include="System.Text.Json"/>
     </ItemGroup>
     <ItemGroup Condition="$(AddNullable) == 'true'">
         <PackageReference Include="Nullable" PrivateAssets="All"/>

diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -20,7 +20,7 @@
         <PackageReference Include="AutoFixture" />
         <PackageReference Include="FluentAssertions" />
     </ItemGroup>
-    <ItemGroup Condition="$(TargetFramework) == 'net472'">
+    <ItemGroup Condition="$(TargetFramework) == 'net48'">
         <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net472" PrivateAssets="All"/>
     </ItemGroup>
 

diff --git a/test/RestSharp.Tests.Shared/Fixtures/RequestBodyCapturer.cs b/test/RestSharp.Tests.Shared/Fixtures/RequestBodyCapturer.cs
@@ -1,14 +1,14 @@
-namespace RestSharp.Tests.Integrated.Fixtures;
+namespace RestSharp.Tests.Shared.Fixtures;
 
 public class RequestBodyCapturer {
     public const string Resource = "/capture";
 
-    public string? ContentType { get; private set; }
-    public bool    HasBody     { get; private set; }
-    public string? Body        { get; private set; }
-    public Uri?    Url         { get; private set; }
+    public string ContentType { get; private set; }
+    public bool   HasBody     { get; private set; }
+    public string Body        { get; private set; }
+    public Uri    Url         { get; private set; }
 
-    public bool CaptureBody(string? content) {
+    public bool CaptureBody(string content) {
         Body    = content;
         HasBody = !string.IsNullOrWhiteSpace(content);
         return true;

diff --git a/test/RestSharp.Tests.Shared/Fixtures/WireMockExtensions.cs b/test/RestSharp.Tests.Shared/Fixtures/WireMockExtensions.cs
@@ -1,4 +1,3 @@
-using RestSharp.Tests.Integrated.Fixtures;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Server;