Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions Ocelot.sln
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ocelot", "src\Ocelot\Ocelot
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ocelot.Provider.Consul", "src\Ocelot.Provider.Consul\Ocelot.Provider.Consul.csproj", "{F38B5372-D141-3A0D-6FF8-30EFA93C7506}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ocelot.Provider.Eureka", "src\Ocelot.Provider.Eureka\Ocelot.Provider.Eureka.csproj", "{3C77D0A0-173A-628F-FA3C-E113B9501E89}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ocelot.Provider.Kubernetes", "src\Ocelot.Provider.Kubernetes\Ocelot.Provider.Kubernetes.csproj", "{1FD9E0B6-EC08-54E4-82F2-A215A388968D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ocelot.Provider.Polly", "src\Ocelot.Provider.Polly\Ocelot.Provider.Polly.csproj", "{1424441E-1143-0F05-1346-E90195CDE10E}"
Expand Down Expand Up @@ -131,18 +129,6 @@ Global
{F38B5372-D141-3A0D-6FF8-30EFA93C7506}.Release|x64.Build.0 = Release|Any CPU
{F38B5372-D141-3A0D-6FF8-30EFA93C7506}.Release|x86.ActiveCfg = Release|Any CPU
{F38B5372-D141-3A0D-6FF8-30EFA93C7506}.Release|x86.Build.0 = Release|Any CPU
{3C77D0A0-173A-628F-FA3C-E113B9501E89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3C77D0A0-173A-628F-FA3C-E113B9501E89}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3C77D0A0-173A-628F-FA3C-E113B9501E89}.Debug|x64.ActiveCfg = Debug|Any CPU
{3C77D0A0-173A-628F-FA3C-E113B9501E89}.Debug|x64.Build.0 = Debug|Any CPU
{3C77D0A0-173A-628F-FA3C-E113B9501E89}.Debug|x86.ActiveCfg = Debug|Any CPU
{3C77D0A0-173A-628F-FA3C-E113B9501E89}.Debug|x86.Build.0 = Debug|Any CPU
{3C77D0A0-173A-628F-FA3C-E113B9501E89}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3C77D0A0-173A-628F-FA3C-E113B9501E89}.Release|Any CPU.Build.0 = Release|Any CPU
{3C77D0A0-173A-628F-FA3C-E113B9501E89}.Release|x64.ActiveCfg = Release|Any CPU
{3C77D0A0-173A-628F-FA3C-E113B9501E89}.Release|x64.Build.0 = Release|Any CPU
{3C77D0A0-173A-628F-FA3C-E113B9501E89}.Release|x86.ActiveCfg = Release|Any CPU
{3C77D0A0-173A-628F-FA3C-E113B9501E89}.Release|x86.Build.0 = Release|Any CPU
{1FD9E0B6-EC08-54E4-82F2-A215A388968D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1FD9E0B6-EC08-54E4-82F2-A215A388968D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1FD9E0B6-EC08-54E4-82F2-A215A388968D}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down
1 change: 0 additions & 1 deletion Ocelot.slnx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Solution>
<Project Path="src/Ocelot/Ocelot.csproj" />
<Project Path="src/Ocelot.Provider.Consul/Ocelot.Provider.Consul.csproj" />
<Project Path="src/Ocelot.Provider.Eureka/Ocelot.Provider.Eureka.csproj" />
<Project Path="src/Ocelot.Provider.Kubernetes/Ocelot.Provider.Kubernetes.csproj" />
<Project Path="src/Ocelot.Provider.Polly/Ocelot.Provider.Polly.csproj" />
<Project Path="test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@
<None Include="..\README.md" Pack="true" PackagePath="\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\src\Ocelot.Provider.Eureka\Ocelot.Provider.Eureka.csproj" />
<ProjectReference Include="..\..\..\src\Ocelot.Provider.Polly\Ocelot.Provider.Polly.csproj" />
<ProjectReference Include="..\..\..\src\Ocelot\Ocelot.csproj" />
<PackageReference Include="Ocelot.Provider.Eureka" Version="25.0.0-beta.2" />
<PackageReference Include="Ocelot.Provider.Polly" Version="25.0.0-beta.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Web\Ocelot.Samples.Web.csproj" />
</ItemGroup>
</Project>
170 changes: 97 additions & 73 deletions samples/Eureka/ApiGateway/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,27 @@
"version": 1,
"dependencies": {
"net10.0": {
"Ocelot.Provider.Eureka": {
"type": "Direct",
"requested": "[25.0.0-beta.2, )",
"resolved": "25.0.0-beta.2",
"contentHash": "0Ps5A0pbgGNZ+5Va1vkFQqYjcY9FX7ELcnbtToMZwqU3zAsHmNEdkNLK0SaZ3jUlSIN9mCV7A5bjZ62KnXIy4w==",
"dependencies": {
"Ocelot": "25.0.0-beta.2",
"Steeltoe.Discovery.ClientCore": "3.3.0",
"Steeltoe.Discovery.Eureka": "3.3.0"
}
},
"Ocelot.Provider.Polly": {
"type": "Direct",
"requested": "[25.0.0-beta.2, )",
"resolved": "25.0.0-beta.2",
"contentHash": "R1AGtfOXPBSZsC0HFX62l0eZzAx/mDfc3/s2yQGf7RJq6pYPfKe6hFJFwcAIMoXQqA14OXufZly4+5gKd/uUtg==",
"dependencies": {
"Ocelot": "25.0.0-beta.2",
"Polly": "8.6.6"
}
},
"FluentValidation": {
"type": "Transitive",
"resolved": "12.1.1",
Expand Down Expand Up @@ -53,6 +74,18 @@
"Newtonsoft.Json": "12.0.1"
}
},
"Ocelot": {
"type": "Transitive",
"resolved": "25.0.0-beta.2",
"contentHash": "PAxk5ncrINDIQhZ0lOIrWnXGoo8MXyKWRlYzt69rcbZvvtDHON6vgAl82u3IcRT8uZhgXu9gButxq8LYEM8New==",
"dependencies": {
"FluentValidation": "12.1.1",
"IPAddressRange": "6.3.0",
"Microsoft.AspNetCore.MiddlewareAnalysis": "10.0.5",
"Microsoft.AspNetCore.Mvc.NewtonsoftJson": "10.0.5",
"Microsoft.Extensions.DiagnosticAdapter": "3.1.32"
}
},
"Polly": {
"type": "Transitive",
"resolved": "8.6.6",
Expand Down Expand Up @@ -156,36 +189,32 @@
"resolved": "4.6.0",
"contentHash": "TezS9fEP9kzL5U6GYHZY6I/tqz6qiHKNgAzuT6JJXJXuP+wWvNLN03gPxBK2uLP0LrLg/QXEAF++lxBNBSYILA=="
},
"ocelot": {
"type": "Project",
"dependencies": {
"FluentValidation": "[12.1.1, )",
"IPAddressRange": "[6.3.0, )",
"Microsoft.AspNetCore.MiddlewareAnalysis": "[10.0.5, )",
"Microsoft.AspNetCore.Mvc.NewtonsoftJson": "[10.0.5, )",
"Microsoft.Extensions.DiagnosticAdapter": "[3.1.32, )"
}
},
"ocelot.provider.eureka": {
"type": "Project",
"ocelot.samples.web": {
"type": "Project"
}
},
"net8.0": {
"Ocelot.Provider.Eureka": {
"type": "Direct",
"requested": "[25.0.0-beta.2, )",
"resolved": "25.0.0-beta.2",
"contentHash": "0Ps5A0pbgGNZ+5Va1vkFQqYjcY9FX7ELcnbtToMZwqU3zAsHmNEdkNLK0SaZ3jUlSIN9mCV7A5bjZ62KnXIy4w==",
"dependencies": {
"Ocelot": "[0.0.0-dev, )",
"Steeltoe.Discovery.ClientCore": "[3.3.0, )",
"Steeltoe.Discovery.Eureka": "[3.3.0, )"
"Ocelot": "25.0.0-beta.2",
"Steeltoe.Discovery.ClientCore": "3.3.0",
"Steeltoe.Discovery.Eureka": "3.3.0"
}
},
"ocelot.provider.polly": {
"type": "Project",
"Ocelot.Provider.Polly": {
"type": "Direct",
"requested": "[25.0.0-beta.2, )",
"resolved": "25.0.0-beta.2",
"contentHash": "R1AGtfOXPBSZsC0HFX62l0eZzAx/mDfc3/s2yQGf7RJq6pYPfKe6hFJFwcAIMoXQqA14OXufZly4+5gKd/uUtg==",
"dependencies": {
"Ocelot": "[0.0.0-dev, )",
"Polly": "[8.6.6, )"
"Ocelot": "25.0.0-beta.2",
"Polly": "8.6.6"
}
},
"ocelot.samples.web": {
"type": "Project"
}
},
"net8.0": {
"FluentValidation": {
"type": "Transitive",
"resolved": "12.1.1",
Expand Down Expand Up @@ -237,6 +266,18 @@
"Newtonsoft.Json": "12.0.1"
}
},
"Ocelot": {
"type": "Transitive",
"resolved": "25.0.0-beta.2",
"contentHash": "PAxk5ncrINDIQhZ0lOIrWnXGoo8MXyKWRlYzt69rcbZvvtDHON6vgAl82u3IcRT8uZhgXu9gButxq8LYEM8New==",
"dependencies": {
"FluentValidation": "12.1.1",
"IPAddressRange": "6.3.0",
"Microsoft.AspNetCore.MiddlewareAnalysis": "8.0.25",
"Microsoft.AspNetCore.Mvc.NewtonsoftJson": "8.0.25",
"Microsoft.Extensions.DiagnosticAdapter": "3.1.32"
}
},
"Polly": {
"type": "Transitive",
"resolved": "8.6.6",
Expand Down Expand Up @@ -340,36 +381,32 @@
"resolved": "4.6.0",
"contentHash": "TezS9fEP9kzL5U6GYHZY6I/tqz6qiHKNgAzuT6JJXJXuP+wWvNLN03gPxBK2uLP0LrLg/QXEAF++lxBNBSYILA=="
},
"ocelot": {
"type": "Project",
"dependencies": {
"FluentValidation": "[12.1.1, )",
"IPAddressRange": "[6.3.0, )",
"Microsoft.AspNetCore.MiddlewareAnalysis": "[8.0.25, )",
"Microsoft.AspNetCore.Mvc.NewtonsoftJson": "[8.0.25, )",
"Microsoft.Extensions.DiagnosticAdapter": "[3.1.32, )"
}
},
"ocelot.provider.eureka": {
"type": "Project",
"ocelot.samples.web": {
"type": "Project"
}
},
"net9.0": {
"Ocelot.Provider.Eureka": {
"type": "Direct",
"requested": "[25.0.0-beta.2, )",
"resolved": "25.0.0-beta.2",
"contentHash": "0Ps5A0pbgGNZ+5Va1vkFQqYjcY9FX7ELcnbtToMZwqU3zAsHmNEdkNLK0SaZ3jUlSIN9mCV7A5bjZ62KnXIy4w==",
"dependencies": {
"Ocelot": "[0.0.0-dev, )",
"Steeltoe.Discovery.ClientCore": "[3.3.0, )",
"Steeltoe.Discovery.Eureka": "[3.3.0, )"
"Ocelot": "25.0.0-beta.2",
"Steeltoe.Discovery.ClientCore": "3.3.0",
"Steeltoe.Discovery.Eureka": "3.3.0"
}
},
"ocelot.provider.polly": {
"type": "Project",
"Ocelot.Provider.Polly": {
"type": "Direct",
"requested": "[25.0.0-beta.2, )",
"resolved": "25.0.0-beta.2",
"contentHash": "R1AGtfOXPBSZsC0HFX62l0eZzAx/mDfc3/s2yQGf7RJq6pYPfKe6hFJFwcAIMoXQqA14OXufZly4+5gKd/uUtg==",
"dependencies": {
"Ocelot": "[0.0.0-dev, )",
"Polly": "[8.6.6, )"
"Ocelot": "25.0.0-beta.2",
"Polly": "8.6.6"
}
},
"ocelot.samples.web": {
"type": "Project"
}
},
"net9.0": {
"FluentValidation": {
"type": "Transitive",
"resolved": "12.1.1",
Expand Down Expand Up @@ -421,6 +458,18 @@
"Newtonsoft.Json": "12.0.1"
}
},
"Ocelot": {
"type": "Transitive",
"resolved": "25.0.0-beta.2",
"contentHash": "PAxk5ncrINDIQhZ0lOIrWnXGoo8MXyKWRlYzt69rcbZvvtDHON6vgAl82u3IcRT8uZhgXu9gButxq8LYEM8New==",
"dependencies": {
"FluentValidation": "12.1.1",
"IPAddressRange": "6.3.0",
"Microsoft.AspNetCore.MiddlewareAnalysis": "9.0.14",
"Microsoft.AspNetCore.Mvc.NewtonsoftJson": "9.0.14",
"Microsoft.Extensions.DiagnosticAdapter": "3.1.32"
}
},
"Polly": {
"type": "Transitive",
"resolved": "8.6.6",
Expand Down Expand Up @@ -524,31 +573,6 @@
"resolved": "4.6.0",
"contentHash": "TezS9fEP9kzL5U6GYHZY6I/tqz6qiHKNgAzuT6JJXJXuP+wWvNLN03gPxBK2uLP0LrLg/QXEAF++lxBNBSYILA=="
},
"ocelot": {
"type": "Project",
"dependencies": {
"FluentValidation": "[12.1.1, )",
"IPAddressRange": "[6.3.0, )",
"Microsoft.AspNetCore.MiddlewareAnalysis": "[9.0.14, )",
"Microsoft.AspNetCore.Mvc.NewtonsoftJson": "[9.0.14, )",
"Microsoft.Extensions.DiagnosticAdapter": "[3.1.32, )"
}
},
"ocelot.provider.eureka": {
"type": "Project",
"dependencies": {
"Ocelot": "[0.0.0-dev, )",
"Steeltoe.Discovery.ClientCore": "[3.3.0, )",
"Steeltoe.Discovery.Eureka": "[3.3.0, )"
}
},
"ocelot.provider.polly": {
"type": "Project",
"dependencies": {
"Ocelot": "[0.0.0-dev, )",
"Polly": "[8.6.6, )"
}
},
"ocelot.samples.web": {
"type": "Project"
}
Expand Down
29 changes: 0 additions & 29 deletions src/Ocelot.Provider.Eureka/Eureka.cs

This file was deleted.

This file was deleted.

28 changes: 0 additions & 28 deletions src/Ocelot.Provider.Eureka/EurekaProviderFactory.cs

This file was deleted.

Loading
Loading