diff --git a/README.md b/README.md
index 9828d5d1b0..07de4bf223 100644
--- a/README.md
+++ b/README.md
@@ -89,7 +89,7 @@ The **OpenAPI Generator** code generator produces code that depends on the follo
- [RestSharp](https://www.nuget.org/packages/RestSharp/110.2.0)
- [JsonSubTypes](https://www.nuget.org/packages/JsonSubTypes/2.0.1)
-- [Polly](https://www.nuget.org/packages/Polly/8.3.1)
+- [Polly](https://www.nuget.org/packages/Polly/8.4.0)
- [Newtonsoft.Json](https://www.nuget.org/packages/Newtonsoft.Json/13.0.3)
The project **Kiota** code generator produces code that depends on the following NuGet packages
diff --git a/docs/Marketplace.md b/docs/Marketplace.md
index 03c82d4566..4f0f1cc7d7 100644
--- a/docs/Marketplace.md
+++ b/docs/Marketplace.md
@@ -60,7 +60,7 @@ The **OpenAPI Generator** code generator produces code that depends on the follo
- [RestSharp](https://www.nuget.org/packages/RestSharp/110.2.0)
- [JsonSubTypes](https://www.nuget.org/packages/JsonSubTypes/2.0.1)
-- [Polly](https://www.nuget.org/packages/Polly/8.3.1)
+- [Polly](https://www.nuget.org/packages/Polly/8.4.0)
- [Newtonsoft.Json](https://www.nuget.org/packages/Newtonsoft.Json/13.0.3)
The project **Kiota** code generator produces code that depends on the following NuGet packages
diff --git a/docs/Marketplace2022.md b/docs/Marketplace2022.md
index 5490496444..d949e23630 100644
--- a/docs/Marketplace2022.md
+++ b/docs/Marketplace2022.md
@@ -60,7 +60,7 @@ The **OpenAPI Generator** code generator produces code that depends on the follo
- [RestSharp](https://www.nuget.org/packages/RestSharp/110.2.0)
- [JsonSubTypes](https://www.nuget.org/packages/JsonSubTypes/2.0.1)
-- [Polly](https://www.nuget.org/packages/Polly/8.3.1)
+- [Polly](https://www.nuget.org/packages/Polly/8.4.0)
- [Newtonsoft.Json](https://www.nuget.org/packages/Newtonsoft.Json/13.0.3)
The project **Kiota** code generator produces code that depends on the following NuGet packages
diff --git a/docs/VisualStudioForMac.md b/docs/VisualStudioForMac.md
index ae77fa78ed..48cc0a170d 100644
--- a/docs/VisualStudioForMac.md
+++ b/docs/VisualStudioForMac.md
@@ -48,7 +48,7 @@ The **OpenAPI Generator** code generator produces code that depends on the follo
- [RestSharp](https://www.nuget.org/packages/RestSharp/110.2.0)
- [JsonSubTypes](https://www.nuget.org/packages/JsonSubTypes/2.0.1)
-- [Polly](https://www.nuget.org/packages/Polly/8.3.1)
+- [Polly](https://www.nuget.org/packages/Polly/8.4.0)
- [Newtonsoft.Json](https://www.nuget.org/packages/Newtonsoft.Json/13.0.3)
The project **Kiota** code generator produces code that depends on the following NuGet packages
diff --git a/src/Core/ApiClientCodeGen.Core/ApiClientCodeGen.Core.csproj b/src/Core/ApiClientCodeGen.Core/ApiClientCodeGen.Core.csproj
index 041542ed54..33703d0636 100644
--- a/src/Core/ApiClientCodeGen.Core/ApiClientCodeGen.Core.csproj
+++ b/src/Core/ApiClientCodeGen.Core/ApiClientCodeGen.Core.csproj
@@ -20,7 +20,7 @@
-
+
diff --git a/src/Core/ApiClientCodeGen.Core/NuGet/PackageDependencies.cs b/src/Core/ApiClientCodeGen.Core/NuGet/PackageDependencies.cs
index 50bae0b0a0..9ca2e13b38 100644
--- a/src/Core/ApiClientCodeGen.Core/NuGet/PackageDependencies.cs
+++ b/src/Core/ApiClientCodeGen.Core/NuGet/PackageDependencies.cs
@@ -56,7 +56,7 @@ public static class PackageDependencies
public static readonly PackageDependency Polly =
new PackageDependency(
"Polly",
- "8.3.1");
+ "8.4.0");
public static readonly PackageDependency AutoRestCSharp =
new PackageDependency(
diff --git a/src/Core/ApiClientCodeGen.Tests.Common/Build/Projects/OpenApiGeneratorProjectFileContents.cs b/src/Core/ApiClientCodeGen.Tests.Common/Build/Projects/OpenApiGeneratorProjectFileContents.cs
index 2f32e734c8..7985e56731 100644
--- a/src/Core/ApiClientCodeGen.Tests.Common/Build/Projects/OpenApiGeneratorProjectFileContents.cs
+++ b/src/Core/ApiClientCodeGen.Tests.Common/Build/Projects/OpenApiGeneratorProjectFileContents.cs
@@ -10,7 +10,7 @@ public static class OpenApiGeneratorProjectFileContents
-
+
@@ -25,7 +25,7 @@ public static class OpenApiGeneratorProjectFileContents
-
+
@@ -51,7 +51,7 @@ public static class OpenApiGeneratorProjectFileContents
-
+
diff --git a/test/GeneratedCode/OpenApiGenerator/Net462/Net462.csproj b/test/GeneratedCode/OpenApiGenerator/Net462/Net462.csproj
index 597a2519ed..989f0a2619 100644
--- a/test/GeneratedCode/OpenApiGenerator/Net462/Net462.csproj
+++ b/test/GeneratedCode/OpenApiGenerator/Net462/Net462.csproj
@@ -17,7 +17,7 @@
-
+
diff --git a/test/GeneratedCode/OpenApiGenerator/Net472/Net472.csproj b/test/GeneratedCode/OpenApiGenerator/Net472/Net472.csproj
index 4689cc55b4..f6a6dcc4c6 100644
--- a/test/GeneratedCode/OpenApiGenerator/Net472/Net472.csproj
+++ b/test/GeneratedCode/OpenApiGenerator/Net472/Net472.csproj
@@ -17,7 +17,7 @@
-
+
diff --git a/test/GeneratedCode/OpenApiGenerator/Net48/Net48.csproj b/test/GeneratedCode/OpenApiGenerator/Net48/Net48.csproj
index 03a94c4897..64fdddfa93 100644
--- a/test/GeneratedCode/OpenApiGenerator/Net48/Net48.csproj
+++ b/test/GeneratedCode/OpenApiGenerator/Net48/Net48.csproj
@@ -17,7 +17,7 @@
-
+
diff --git a/test/GeneratedCode/OpenApiGenerator/Net481/Net481.csproj b/test/GeneratedCode/OpenApiGenerator/Net481/Net481.csproj
index de895c0068..40ab016605 100644
--- a/test/GeneratedCode/OpenApiGenerator/Net481/Net481.csproj
+++ b/test/GeneratedCode/OpenApiGenerator/Net481/Net481.csproj
@@ -17,7 +17,7 @@
-
+
diff --git a/test/GeneratedCode/OpenApiGenerator/Net6/Net6.csproj b/test/GeneratedCode/OpenApiGenerator/Net6/Net6.csproj
index bc42e02b5d..f0c395f341 100644
--- a/test/GeneratedCode/OpenApiGenerator/Net6/Net6.csproj
+++ b/test/GeneratedCode/OpenApiGenerator/Net6/Net6.csproj
@@ -6,7 +6,7 @@
-
+
diff --git a/test/GeneratedCode/OpenApiGenerator/Net7/Net7.csproj b/test/GeneratedCode/OpenApiGenerator/Net7/Net7.csproj
index b05bf18f72..0a2b0a8749 100644
--- a/test/GeneratedCode/OpenApiGenerator/Net7/Net7.csproj
+++ b/test/GeneratedCode/OpenApiGenerator/Net7/Net7.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/test/GeneratedCode/OpenApiGenerator/NetStandard20/NetStandard20.csproj b/test/GeneratedCode/OpenApiGenerator/NetStandard20/NetStandard20.csproj
index c1c7665774..58495dc2bb 100644
--- a/test/GeneratedCode/OpenApiGenerator/NetStandard20/NetStandard20.csproj
+++ b/test/GeneratedCode/OpenApiGenerator/NetStandard20/NetStandard20.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/test/GeneratedCode/OpenApiGenerator/NetStandard21/NetStandard21.csproj b/test/GeneratedCode/OpenApiGenerator/NetStandard21/NetStandard21.csproj
index 9ea2b76877..635729978c 100644
--- a/test/GeneratedCode/OpenApiGenerator/NetStandard21/NetStandard21.csproj
+++ b/test/GeneratedCode/OpenApiGenerator/NetStandard21/NetStandard21.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/test/OpenAPI/V3/Templates/httpclient/netcore_project.mustache b/test/OpenAPI/V3/Templates/httpclient/netcore_project.mustache
index 76cb8553cb..90290dfa74 100644
--- a/test/OpenAPI/V3/Templates/httpclient/netcore_project.mustache
+++ b/test/OpenAPI/V3/Templates/httpclient/netcore_project.mustache
@@ -42,7 +42,7 @@
{{/supportsRetry}}
{{/useGenericHost}}
{{#supportsRetry}}
-
+
{{/supportsRetry}}
{{#validatable}}
diff --git a/test/OpenAPI/V3/Templates/httpclient/nuspec.mustache b/test/OpenAPI/V3/Templates/httpclient/nuspec.mustache
index c589ec9b40..d453d9f0b8 100644
--- a/test/OpenAPI/V3/Templates/httpclient/nuspec.mustache
+++ b/test/OpenAPI/V3/Templates/httpclient/nuspec.mustache
@@ -42,7 +42,7 @@
{{/validatable}}
{{#supportsRetry}}
-
+
{{/supportsRetry}}
diff --git a/test/OpenAPI/V3/Templates/restsharp/netcore_project.mustache b/test/OpenAPI/V3/Templates/restsharp/netcore_project.mustache
index 76cb8553cb..90290dfa74 100644
--- a/test/OpenAPI/V3/Templates/restsharp/netcore_project.mustache
+++ b/test/OpenAPI/V3/Templates/restsharp/netcore_project.mustache
@@ -42,7 +42,7 @@
{{/supportsRetry}}
{{/useGenericHost}}
{{#supportsRetry}}
-
+
{{/supportsRetry}}
{{#validatable}}
diff --git a/test/OpenAPI/V3/Templates/restsharp/nuspec.mustache b/test/OpenAPI/V3/Templates/restsharp/nuspec.mustache
index c589ec9b40..d453d9f0b8 100644
--- a/test/OpenAPI/V3/Templates/restsharp/nuspec.mustache
+++ b/test/OpenAPI/V3/Templates/restsharp/nuspec.mustache
@@ -42,7 +42,7 @@
{{/validatable}}
{{#supportsRetry}}
-
+
{{/supportsRetry}}