Skip to content

Commit cd9c59e

Browse files
martintmkmartintmk
authored
Reorganize the src folder (App-vNext#1289)
1 parent a77a5d9 commit cd9c59e

File tree

329 files changed

+141
-154
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

329 files changed

+141
-154
lines changed

‎.vscode/settings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"dotnet.defaultSolution": "src\\Polly.sln"
2+
"dotnet.defaultSolution": "Polly.sln"
33
}

‎Directory.Build.targets‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<Project>
2+
<Import Project="$(MsBuildThisFileDirectory)eng/Common.targets" />
3+
<Import Project="$(MsBuildThisFileDirectory)eng/$(ProjectType).targets" Condition="$(ProjectType) != ''" />
4+
5+
<ItemGroup>
6+
<Using Include="System.Collections" />
7+
<Using Include="System.Collections.Concurrent" />
8+
<Using Include="System.Diagnostics" />
9+
<Using Include="System.Reflection" />
10+
<Using Remove="System.Net.Http" />
11+
</ItemGroup>
12+
13+
<ItemGroup Condition="'$(IncludePollyUsings)' == 'true'">
14+
<Using Include="Polly.Bulkhead" />
15+
<Using Include="Polly.Caching" />
16+
<Using Include="Polly.CircuitBreaker" />
17+
<Using Include="Polly.Fallback" />
18+
<Using Include="Polly.NoOp" />
19+
<Using Include="Polly.RateLimit" />
20+
<Using Include="Polly.Registry" />
21+
<Using Include="Polly.Retry" />
22+
<Using Include="Polly.Timeout" />
23+
<Using Include="Polly.Utilities" />
24+
<Using Include="Polly.Wrap" />
25+
</ItemGroup>
26+
</Project>

src/Directory.Packages.props renamed to Directory.Packages.props

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
25
<ItemGroup>
36
<PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
47
<PackageVersion Include="BenchmarkDotNet" Version="0.13.5" />
58
<PackageVersion Include="FluentAssertions" Version="6.11.0" />
69
<PackageVersion Include="GitHubActionsTestLogger" Version="2.3.2" />
710
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0" />
8-
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.1" />
911
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
1012
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
1113
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />

src/Polly.sln renamed to Polly.sln

Lines changed: 40 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,48 +6,54 @@ MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{79FE9DBE-1155-4F78-A41F-FE95DEFA19DD}"
77
ProjectSection(SolutionItems) = preProject
88
.editorconfig = .editorconfig
9-
..\eng\Analyzers.targets = ..\eng\Analyzers.targets
10-
..\build.cake = ..\build.cake
11-
..\.github\workflows\build.yml = ..\.github\workflows\build.yml
12-
..\.github\dependabot.yml = ..\.github\dependabot.yml
9+
eng\Analyzers.targets = eng\Analyzers.targets
10+
build.cake = build.cake
11+
.github\workflows\build.yml = .github\workflows\build.yml
12+
.github\dependabot.yml = .github\dependabot.yml
1313
Directory.Build.props = Directory.Build.props
1414
Directory.Build.targets = Directory.Build.targets
1515
Directory.Packages.props = Directory.Packages.props
16-
..\GitVersion.yml = ..\GitVersion.yml
17-
..\global.json = ..\global.json
18-
..\README.md = ..\README.md
19-
..\Version.props = ..\Version.props
16+
GitVersion.yml = GitVersion.yml
17+
global.json = global.json
18+
README.md = README.md
19+
Version.props = Version.props
2020
EndProjectSection
2121
EndProject
22-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Polly", "Polly\Polly.csproj", "{E273E6D8-87D4-4EC9-A2BE-734DD633EF15}"
22+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Polly", "src\Polly\Polly.csproj", "{E273E6D8-87D4-4EC9-A2BE-734DD633EF15}"
2323
EndProject
24-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Polly.Specs", "Polly.Specs\Polly.Specs.csproj", "{F771DF22-5684-43DF-B574-D76C35202AF4}"
24+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Polly.Specs", "test\Polly.Specs\Polly.Specs.csproj", "{F771DF22-5684-43DF-B574-D76C35202AF4}"
2525
EndProject
26-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Polly.Benchmarks", "Polly.Benchmarks\Polly.Benchmarks.csproj", "{BED2624C-E418-4177-8696-0242363FFD43}"
26+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Polly.Benchmarks", "bench\Polly.Benchmarks\Polly.Benchmarks.csproj", "{BED2624C-E418-4177-8696-0242363FFD43}"
2727
EndProject
28-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Polly.Core", "Polly.Core\Polly.Core.csproj", "{E3831CE2-795D-4979-BB48-1C88CBF66651}"
28+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Polly.Core", "src\Polly.Core\Polly.Core.csproj", "{E3831CE2-795D-4979-BB48-1C88CBF66651}"
2929
EndProject
30-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Polly.Core.Tests", "Polly.Core.Tests\Polly.Core.Tests.csproj", "{AF1383E7-BABF-492A-91C8-F2789AE7B3B4}"
30+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Polly.Core.Tests", "test\Polly.Core.Tests\Polly.Core.Tests.csproj", "{AF1383E7-BABF-492A-91C8-F2789AE7B3B4}"
3131
EndProject
3232
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "eng", "eng", "{04E3C7C5-31F7-4CD6-8BEC-C1032527D231}"
3333
ProjectSection(SolutionItems) = preProject
34-
..\eng\Analyzers.targets = ..\eng\Analyzers.targets
35-
..\eng\Common.targets = ..\eng\Common.targets
36-
..\eng\Library.targets = ..\eng\Library.targets
37-
..\eng\Test.targets = ..\eng\Test.targets
34+
eng\Analyzers.targets = eng\Analyzers.targets
35+
eng\Common.targets = eng\Common.targets
36+
eng\Library.targets = eng\Library.targets
37+
eng\Test.targets = eng\Test.targets
3838
EndProjectSection
3939
EndProject
40-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Polly.Core.Benchmarks", "Polly.Core.Benchmarks\Polly.Core.Benchmarks.csproj", "{CC306C35-E3BC-4F0B-AB8C-B9D4C82DC3DE}"
40+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Polly.Core.Benchmarks", "bench\Polly.Core.Benchmarks\Polly.Core.Benchmarks.csproj", "{CC306C35-E3BC-4F0B-AB8C-B9D4C82DC3DE}"
4141
EndProject
42-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Polly.Extensions", "Polly.Extensions\Polly.Extensions.csproj", "{F2FDE6BF-DA86-4DDE-A55C-E2A064CD30D8}"
42+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Polly.Extensions", "src\Polly.Extensions\Polly.Extensions.csproj", "{F2FDE6BF-DA86-4DDE-A55C-E2A064CD30D8}"
4343
EndProject
44-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Polly.Extensions.Tests", "Polly.Extensions.Tests\Polly.Extensions.Tests.csproj", "{BB2843CA-B518-48A1-BAD9-B63238F21608}"
44+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Polly.Extensions.Tests", "test\Polly.Extensions.Tests\Polly.Extensions.Tests.csproj", "{BB2843CA-B518-48A1-BAD9-B63238F21608}"
4545
EndProject
46-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Polly.RateLimiting", "Polly.RateLimiting\Polly.RateLimiting.csproj", "{BCA09595-A4D3-4D74-AC80-3E7017E51B24}"
46+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Polly.RateLimiting", "src\Polly.RateLimiting\Polly.RateLimiting.csproj", "{BCA09595-A4D3-4D74-AC80-3E7017E51B24}"
4747
EndProject
48-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Polly.RateLimiting.Tests", "Polly.RateLimiting.Tests\Polly.RateLimiting.Tests.csproj", "{06070F42-6738-4D0B-8D7E-9400B4030193}"
48+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Polly.RateLimiting.Tests", "test\Polly.RateLimiting.Tests\Polly.RateLimiting.Tests.csproj", "{06070F42-6738-4D0B-8D7E-9400B4030193}"
4949
EndProject
50-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Polly.TestUtils", "Polly.TestUtils\Polly.TestUtils.csproj", "{C04DEE61-C1EA-4028-B457-CDBD304B8ED9}"
50+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Polly.TestUtils", "test\Polly.TestUtils\Polly.TestUtils.csproj", "{C04DEE61-C1EA-4028-B457-CDBD304B8ED9}"
51+
EndProject
52+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "bench", "bench", "{71C259E7-08A4-4A91-AA8C-ECE726893507}"
53+
EndProject
54+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{A6CC41B9-E0B9-44F8-916B-3E4A78DA3BFB}"
55+
EndProject
56+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B7BF406B-B06F-4025-83E6-7219C53196A6}"
5157
EndProject
5258
Global
5359
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -104,7 +110,18 @@ Global
104110
HideSolutionNode = FALSE
105111
EndGlobalSection
106112
GlobalSection(NestedProjects) = preSolution
113+
{E273E6D8-87D4-4EC9-A2BE-734DD633EF15} = {B7BF406B-B06F-4025-83E6-7219C53196A6}
114+
{F771DF22-5684-43DF-B574-D76C35202AF4} = {A6CC41B9-E0B9-44F8-916B-3E4A78DA3BFB}
115+
{BED2624C-E418-4177-8696-0242363FFD43} = {71C259E7-08A4-4A91-AA8C-ECE726893507}
116+
{E3831CE2-795D-4979-BB48-1C88CBF66651} = {B7BF406B-B06F-4025-83E6-7219C53196A6}
117+
{AF1383E7-BABF-492A-91C8-F2789AE7B3B4} = {A6CC41B9-E0B9-44F8-916B-3E4A78DA3BFB}
107118
{04E3C7C5-31F7-4CD6-8BEC-C1032527D231} = {79FE9DBE-1155-4F78-A41F-FE95DEFA19DD}
119+
{CC306C35-E3BC-4F0B-AB8C-B9D4C82DC3DE} = {71C259E7-08A4-4A91-AA8C-ECE726893507}
120+
{F2FDE6BF-DA86-4DDE-A55C-E2A064CD30D8} = {B7BF406B-B06F-4025-83E6-7219C53196A6}
121+
{BB2843CA-B518-48A1-BAD9-B63238F21608} = {A6CC41B9-E0B9-44F8-916B-3E4A78DA3BFB}
122+
{BCA09595-A4D3-4D74-AC80-3E7017E51B24} = {B7BF406B-B06F-4025-83E6-7219C53196A6}
123+
{06070F42-6738-4D0B-8D7E-9400B4030193} = {A6CC41B9-E0B9-44F8-916B-3E4A78DA3BFB}
124+
{C04DEE61-C1EA-4028-B457-CDBD304B8ED9} = {A6CC41B9-E0B9-44F8-916B-3E4A78DA3BFB}
108125
EndGlobalSection
109126
GlobalSection(ExtensibilityGlobals) = postSolution
110127
SolutionGuid = {2E5D54CD-770A-4345-B585-1848FC2EA6F4}

src/Polly.snk renamed to Polly.snk

File renamed without changes.

BenchmarkDotNet.Artifacts/results/Polly.Core.Benchmarks.BridgeBenchmark-report-github.md renamed to bench/BenchmarkDotNet.Artifacts/results/Polly.Core.Benchmarks.BridgeBenchmark-report-github.md

BenchmarkDotNet.Artifacts/results/Polly.Core.Benchmarks.CircuitBreakerBenchmark-report-github.md renamed to bench/BenchmarkDotNet.Artifacts/results/Polly.Core.Benchmarks.CircuitBreakerBenchmark-report-github.md

BenchmarkDotNet.Artifacts/results/Polly.Core.Benchmarks.CircuitBreakerOpenedBenchmark-report-github.md renamed to bench/BenchmarkDotNet.Artifacts/results/Polly.Core.Benchmarks.CircuitBreakerOpenedBenchmark-report-github.md

BenchmarkDotNet.Artifacts/results/Polly.Core.Benchmarks.GenericOverheadBenchmark-report-github.md renamed to bench/BenchmarkDotNet.Artifacts/results/Polly.Core.Benchmarks.GenericOverheadBenchmark-report-github.md

BenchmarkDotNet.Artifacts/results/Polly.Core.Benchmarks.HedgingBenchmark-report-github.md renamed to bench/BenchmarkDotNet.Artifacts/results/Polly.Core.Benchmarks.HedgingBenchmark-report-github.md

0 commit comments

Comments
 (0)