Migrate to slnx

.gitattributes

@@ -1,65 +1,2 @@
-###############################################################################
-# Set default behavior to automatically normalize line endings.
-###############################################################################
 * text=auto
-
 *.md text=auto
-
-###############################################################################
-# Set default behavior for command prompt diff.
-#
-# This is need for earlier builds of msysgit that does not have it on by
-# default for csharp files.
-# Note: This is only used by command line
-###############################################################################
-#*.cs     diff=csharp
-
-###############################################################################
-# Set the merge driver for project and solution files
-#
-# Merging from the command prompt will add diff markers to the files if there
-# are conflicts (Merging from VS is not affected by the settings below, in VS
-# the diff markers are never inserted). Diff markers may cause the following 
-# file extensions to fail to load in VS. An alternative would be to treat
-# these files as binary and thus will always conflict and require user
-# intervention with every merge. To do so, just uncomment the entries below
-###############################################################################
-#*.sln       merge=binary
-#*.csproj    merge=binary
-#*.vbproj    merge=binary
-#*.vcxproj   merge=binary
-#*.vcproj    merge=binary
-#*.dbproj    merge=binary
-#*.fsproj    merge=binary
-#*.lsproj    merge=binary
-#*.wixproj   merge=binary
-#*.modelproj merge=binary
-#*.sqlproj   merge=binary
-#*.wwaproj   merge=binary
-
-###############################################################################
-# behavior for image files
-#
-# image files are treated as binary by default.
-###############################################################################
-#*.jpg   binary
-#*.png   binary
-#*.gif   binary
-
-###############################################################################
-# diff behavior for common document formats
-# 
-# Convert binary document formats to text before diffing them. This feature
-# is only available from the command line. Turn it on by uncommenting the 
-# entries below.
-###############################################################################
-#*.doc   diff=astextplain
-#*.DOC   diff=astextplain
-#*.docx  diff=astextplain
-#*.DOCX  diff=astextplain
-#*.dot   diff=astextplain
-#*.DOT   diff=astextplain
-#*.pdf   diff=astextplain
-#*.PDF   diff=astextplain
-#*.rtf   diff=astextplain
-#*.RTF   diff=astextplain

.vscode/settings.json

@@ -1,3 +1,3 @@
 {
-  "dotnet.defaultSolution": "Polly.sln"
+  "dotnet.defaultSolution": "Polly.slnx"
 }

.vscode/tasks.json

@@ -3,7 +3,7 @@
   "tasks": [
     {
       "label": "build",
-      "command": "dotnet build ./src/Polly.sln",
+      "command": "dotnet build ./src/Polly.slnx",
       "type": "shell",
       "group": "build",
       "presentation": {

Polly.slnx

@@ -0,0 +1,56 @@
+<Solution>
+  <Folder Name="/bench/">
+    <Project Path="bench/Polly.Benchmarks/Polly.Benchmarks.csproj" />
+    <Project Path="bench/Polly.Core.Benchmarks/Polly.Core.Benchmarks.csproj" />
+  </Folder>
+  <Folder Name="/Solution Items/">
+    <File Path=".editorconfig" />
+    <File Path=".gitattributes" />
+    <File Path=".gitignore" />
+    <File Path="build.cake" />
+    <File Path="CHANGELOG.md" />
+    <File Path="Directory.Build.props" />
+    <File Path="Directory.Build.targets" />
+    <File Path="Directory.Packages.props" />
+    <File Path="global.json" />
+    <File Path="NuGet.config" />
+    <File Path="README.md" />
+  </Folder>
+  <Folder Name="/Solution Items/eng/">
+    <File Path="eng/Analyzers.targets" />
+    <File Path="eng/Benchmark.targets" />
+    <File Path="eng/bump-version.ps1" />
+    <File Path="eng/Common.targets" />
+    <File Path="eng/Library.targets" />
+    <File Path="eng/stryker-config.json" />
+    <File Path="eng/Test.targets" />
+    <File Path="eng/update-baselines.ps1" />
+    <File Path="eng/update-changelog.ps1" />
+  </Folder>
+  <Folder Name="/Solution Items/eng/analyzers/">
+    <File Path="eng/analyzers/BannedSymbols.txt" />
+    <File Path="eng/analyzers/Benchmark.globalconfig" />
+    <File Path="eng/analyzers/Library.globalconfig" />
+    <File Path="eng/analyzers/SonarLint.xml" />
+    <File Path="eng/analyzers/Stylecop.globalconfig" />
+    <File Path="eng/analyzers/Stylecop.json" />
+    <File Path="eng/analyzers/Test.globalconfig" />
+  </Folder>
+  <Folder Name="/src/">
+    <Project Path="src/Polly.Core/Polly.Core.csproj" />
+    <Project Path="src/Polly.Extensions/Polly.Extensions.csproj" />
+    <Project Path="src/Polly.RateLimiting/Polly.RateLimiting.csproj" />
+    <Project Path="src/Polly.Testing/Polly.Testing.csproj" />
+    <Project Path="src/Polly/Polly.csproj" />
+    <Project Path="src/Snippets/Snippets.csproj" />
+  </Folder>
+  <Folder Name="/test/">
+    <Project Path="test/Polly.AotTest/Polly.AotTest.csproj" />
+    <Project Path="test/Polly.Core.Tests/Polly.Core.Tests.csproj" />
+    <Project Path="test/Polly.Extensions.Tests/Polly.Extensions.Tests.csproj" />
+    <Project Path="test/Polly.RateLimiting.Tests/Polly.RateLimiting.Tests.csproj" />
+    <Project Path="test/Polly.Specs/Polly.Specs.csproj" />
+    <Project Path="test/Polly.Testing.Tests/Polly.Testing.Tests.csproj" />
+    <Project Path="test/Polly.TestUtils/Polly.TestUtils.csproj" />
+  </Folder>
+</Solution>

build.cake

@@ -18,7 +18,7 @@ var configuration = Argument<string>("configuration", "Release");
 
 var projectName = "Polly";
 
-var solutions = GetFiles("./**/*.sln");
+var solutions = GetFiles("./**/*.slnx");
 var solutionPaths = solutions.Select(solution => solution.GetDirectory());
 
 var srcDir = Directory("./src");

samples/.vscode/settings.json

@@ -1,3 +1,3 @@
 {
-    "dotnet.defaultSolution": "Samples.sln"
-}
+    "dotnet.defaultSolution": "Samples.slnx"
+}