Use encoded filename for FileNameStar (#2117)

restsharp · Aug 10, 2023 · ce3d5df · ce3d5df
1 parent 6197f31
commit ce3d5df
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 10 deletions.
diff --git a/benchmarks/RestSharp.Benchmarks/RestSharp.Benchmarks.csproj b/benchmarks/RestSharp.Benchmarks/RestSharp.Benchmarks.csproj
@@ -9,7 +9,7 @@
 
     <ItemGroup>
         <PackageReference Include="AutoFixture" Version="4.18.0" />
-        <PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
+        <PackageReference Include="BenchmarkDotNet" Version="0.13.7" />
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.6.0" />
     </ItemGroup>
     <ItemGroup>

diff --git a/props/Common.props b/props/Common.props
@@ -7,4 +7,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
+    <ItemGroup>
+        <Using Include="System.Net.Http"/>
+    </ItemGroup>
 </Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -21,7 +21,7 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
         <PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="All"/>
-        <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All"/>
+        <PackageReference Include="JetBrains.Annotations" Version="2023.2.0" PrivateAssets="All"/>
     </ItemGroup>
     <ItemGroup>
         <None Include="$(RepoRoot)\restsharp.png" Pack="true" PackagePath="\"/>

diff --git a/src/RestSharp.Serializers.CsvHelper/RestSharp.Serializers.CsvHelper.csproj b/src/RestSharp.Serializers.CsvHelper/RestSharp.Serializers.CsvHelper.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <ItemGroup>
-        <PackageReference Include="CsvHelper" Version="28.0.1"/>
+        <PackageReference Include="CsvHelper" Version="30.0.1" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\RestSharp\RestSharp.csproj"/>

diff --git a/src/RestSharp/Request/RequestContent.cs b/src/RestSharp/Request/RequestContent.cs
@@ -83,7 +83,7 @@ class RequestContent : IDisposable {
         var dispositionHeader = fileParameter.Options.DisableFilenameEncoding
             ? ContentDispositionHeaderValue.Parse($"form-data; name=\"{fileParameter.Name}\"; filename=\"{fileParameter.FileName}\"")
             : new ContentDispositionHeaderValue("form-data") { Name = $"\"{fileParameter.Name}\"", FileName = $"\"{fileParameter.FileName}\"" };
-        if (!fileParameter.Options.DisableFileNameStar) dispositionHeader.FileNameStar = fileParameter.FileName;
+        if (!fileParameter.Options.DisableFileNameStar) dispositionHeader.FileNameStar = Uri.EscapeDataString(fileParameter.FileName);
         streamContent.Headers.ContentDisposition = dispositionHeader;
 
         return streamContent;

diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -9,14 +9,14 @@
     </PropertyGroup>
 
     <ItemGroup Condition="$(IsTestProject) == 'true'">
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3"/>
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="All"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0"/>
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" PrivateAssets="All"/>
         <PackageReference Include="coverlet.collector" Version="6.0.0"/>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="xunit" Version="2.4.2"/>
+        <PackageReference Include="xunit" Version="2.5.0"/>
         <PackageReference Include="AutoFixture" Version="4.18.0"/>
-        <PackageReference Include="FluentAssertions" Version="6.10.0"/>
+        <PackageReference Include="FluentAssertions" Version="6.11.0"/>
     </ItemGroup>
     <ItemGroup Condition="$(TargetFramework) == 'net472'">
         <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.3" PrivateAssets="All"/>

diff --git a/test/RestSharp.Tests.Integrated/RestSharp.Tests.Integrated.csproj b/test/RestSharp.Tests.Integrated/RestSharp.Tests.Integrated.csproj
@@ -16,7 +16,7 @@
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="HttpTracer" Version="2.1.1" />
-        <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.19" />
+        <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.21" />
         <PackageReference Include="Polly" Version="7.2.4" />
         <PackageReference Include="Xunit.Extensions.Logging" Version="1.1.0" />
     </ItemGroup>

diff --git a/test/RestSharp.Tests/RestSharp.Tests.csproj b/test/RestSharp.Tests/RestSharp.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
-    <PackageReference Include="Moq" Version="4.18.4" />
+    <PackageReference Include="Moq" Version="4.20.2" />
     <PackageReference Include="RichardSzalay.MockHttp" Version="6.0.0" />
     <PackageReference Include="System.Net.Http.Json" Version="7.0.1" />
   </ItemGroup>