Migrate solution to SLNX (#1374)

* Migrate solution to SLNX

Migrates the .NET solution to use the new [`.slnx`][slnx] file format.

[slnx]: https://devblogs.microsoft.com/dotnet/introducing-slnx-support-dotnet-cli/

Contributes to martincostello/repo-migrations#85.

Signed-off-by: costellobot[bot] <102247573+costellobot[bot]@users.noreply.github.com>

* Migrate to SLNX

Migrate to the new `.slnx` file format.

---------

Signed-off-by: costellobot[bot] <102247573+costellobot[bot]@users.noreply.github.com>
Co-authored-by: costellobot[bot] <102247573+costellobot[bot]@users.noreply.github.com>
Co-authored-by: Martin Costello <[email protected]>

Author: costellobot[bot]

.editorconfig

@@ -9,7 +9,7 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.{config,csproj,json,props,ruleset,targets,yml}]
+[*.{config,csproj,json,props,ruleset,slnx,targets,yml}]
 indent_size = 2
 
 # Code files

TodoApp.sln

@@ -0,0 +1,39 @@
+<Solution>
+  <Folder Name="/Solution Items/">
+    <File Path=".editorconfig" />
+    <File Path=".gitattributes" />
+    <File Path=".gitignore" />
+    <File Path=".vsconfig" />
+    <File Path="build.ps1" />
+    <File Path="CODE_OF_CONDUCT.md" />
+    <File Path="Directory.Build.props" />
+    <File Path="global.json" />
+    <File Path="LICENSE" />
+    <File Path="NuGet.config" />
+    <File Path="README.md" />
+    <File Path="TodoApp.ruleset" />
+  </Folder>
+  <Folder Name="/Solution Items/.github/">
+    <File Path=".github/CONTRIBUTING.md" />
+    <File Path=".github/dependabot.yml" />
+    <File Path=".github/ISSUE_TEMPLATE.md" />
+    <File Path=".github/PULL_REQUEST_TEMPLATE.md" />
+  </Folder>
+  <Folder Name="/Solution Items/.github/ISSUE_TEMPLATE/">
+    <File Path=".github/ISSUE_TEMPLATE/bug_report.md" />
+  </Folder>
+  <Folder Name="/Solution Items/.github/workflows/">
+    <File Path=".github/workflows/build.yml" />
+  </Folder>
+  <Folder Name="/Solution Items/.vscode/">
+    <File Path=".vscode/extensions.json" />
+    <File Path=".vscode/launch.json" />
+    <File Path=".vscode/tasks.json" />
+  </Folder>
+  <Folder Name="/src/">
+    <Project Path="src/TodoApp/TodoApp.csproj" />
+  </Folder>
+  <Folder Name="/tests/">
+    <Project Path="tests/TodoApp.Tests/TodoApp.Tests.csproj" />
+  </Folder>
+</Solution>

TodoApp.slnx

@@ -28,7 +28,7 @@ if ($OutputPath -eq "") {
 $installDotNetSdk = $false;
 
 if (($null -eq (Get-Command "dotnet" -ErrorAction SilentlyContinue)) -and ($null -eq (Get-Command "dotnet.exe" -ErrorAction SilentlyContinue))) {
-    Write-Host "The .NET SDK is not installed."
+    Write-Output "The .NET SDK is not installed."
     $installDotNetSdk = $true
 }
 else {
@@ -40,7 +40,7 @@ else {
     }
 
     if ($installedDotNetVersion -ne $dotnetVersion) {
-        Write-Host "The required version of the .NET SDK is not installed. Expected $dotnetVersion."
+        Write-Output "The required version of the .NET SDK is not installed. Expected $dotnetVersion."
         $installDotNetSdk = $true
     }
 }
@@ -79,7 +79,7 @@ if ($installDotNetSdk -eq $true) {
 }
 
 function DotNetTest {
-    param([string]$Project)
+    param()
 
     $additionalArgs = @()
 
@@ -88,7 +88,7 @@ function DotNetTest {
         $additionalArgs += "GitHubActions;report-warnings=false"
     }
 
-    & $dotnet test $Project --output $OutputPath --configuration $Configuration $additionalArgs
+    & $dotnet test --output $OutputPath --configuration $Configuration $additionalArgs
 
     if ($LASTEXITCODE -ne 0) {
         throw "dotnet test failed with exit code $LASTEXITCODE"
@@ -106,23 +106,17 @@ function DotNetPublish {
     }
 }
 
-$testProjects = @(
-    (Join-Path $solutionPath "tests" "TodoApp.Tests" "TodoApp.Tests.csproj")
-)
-
 $publishProjects = @(
     (Join-Path $solutionPath "src" "TodoApp" "TodoApp.csproj")
 )
 
-Write-Host "Publishing solution..." -ForegroundColor Green
+Write-Output "Publishing solution..."
 ForEach ($project in $publishProjects) {
     DotNetPublish $project $Configuration
 }
 
-if ($SkipTests -eq $false) {
-    Write-Host "Testing $($testProjects.Count) project(s)..." -ForegroundColor Green
-    ForEach ($project in $testProjects) {
-        DotNetTest $project
-    }
+if (-Not $SkipTests) {
+    Write-Output "Testing solution..."
+    DotNetTest
 }
 

build.ps1

@@ -10,7 +10,7 @@ SET DOTNET_ROOT(x86)=%~dp0.dotnetcli\x86
 :: Put our local dotnet.exe on PATH first so Visual Studio knows which one to use.
 SET PATH=%DOTNET_ROOT%;%PATH%
 
-SET sln=%~dp0TodoApp.sln
+SET sln=%~dp0TodoApp.slnx
 
 IF NOT EXIST "%DOTNET_ROOT%\dotnet.exe" (
     echo The .NET SDK has not yet been installed. Run `%~dp0build.ps1` to install it

startvs.cmd

@@ -69,7 +69,7 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
         builder.ConfigureLogging(loggingBuilder => loggingBuilder.ClearProviders().AddXUnit(this));
 
         // Configure the correct content root for the static content and Razor pages
-        builder.UseSolutionRelativeContentRoot(Path.Combine("src", "TodoApp"));
+        builder.UseSolutionRelativeContentRoot(Path.Combine("src", "TodoApp"), "*.slnx");
 
         // Configure the application so HTTP requests related to the OAuth flow
         // can be intercepted and redirected to not use the real GitHub service.