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
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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

[*.{received,verified}.{txt,xml,json}]
Expand Down
104 changes: 0 additions & 104 deletions TodoApp.sln

This file was deleted.

53 changes: 53 additions & 0 deletions TodoApp.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<Solution>
<Folder Name="/perf/">
<Project Path="perf/TodoApp.Benchmarks/TodoApp.Benchmarks.csproj" />
</Folder>
<Folder Name="/Solution Items/">
<File Path=".editorconfig" />
<File Path=".gitattributes" />
<File Path=".gitignore" />
<File Path=".markdownlint.json" />
<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="omnisharp.json" />
<File Path="README.md" />
<File Path="SECURITY.md" />
<File Path="startvs.cmd" />
<File Path="startvscode.cmd" />
<File Path="TodoApp.ruleset" />
</Folder>
<Folder Name="/Solution Items/.github/">
<File Path=".github/actionlint-matcher.json" />
<File Path=".github/CODEOWNERS" />
<File Path=".github/CONTRIBUTING.md" />
<File Path=".github/dependabot.yml" />
<File Path=".github/FUNDING.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" />
<File Path=".github/ISSUE_TEMPLATE/config.yml" />
</Folder>
<Folder Name="/Solution Items/.github/workflows/">
<File Path=".github/workflows/build.yml" />
<File Path=".github/workflows/code-scan.yml" />
<File Path=".github/workflows/lint.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>
6 changes: 3 additions & 3 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ if ($installDotNetSdk -eq $true) {
}

function DotNetTest {
param([string]$Project)
param()

$additionalArgs = @()

Expand All @@ -78,7 +78,7 @@ function DotNetTest {
$additionalArgs += "GitHubActions;report-warnings=false"
}

& $dotnet test $Project --configuration "Release" $additionalArgs
& $dotnet test --configuration "Release" $additionalArgs

if ($LASTEXITCODE -ne 0) {
throw "dotnet test failed with exit code $LASTEXITCODE"
Expand All @@ -100,5 +100,5 @@ DotNetPublish (Join-Path $solutionPath "src" "TodoApp" "TodoApp.csproj")

if (-Not $SkipTests) {
Write-Host "Testing solution..." -ForegroundColor Green
DotNetTest(Join-Path $solutionPath "tests" "TodoApp.Tests" "TodoApp.Tests.csproj")
DotNetTest
}
2 changes: 1 addition & 1 deletion perf/TodoApp.Benchmarks/OpenApiBenchmarks.cs
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ private static string GetContentRoot()

do
{
string? solutionPath = Directory.EnumerateFiles(directoryInfo.FullName, "TodoApp.sln").FirstOrDefault();
string? solutionPath = Directory.EnumerateFiles(directoryInfo.FullName, "TodoApp.slnx").FirstOrDefault();

if (solutionPath is not null)
{
Expand Down
2 changes: 1 addition & 1 deletion startvs.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ SET DOTNET_ROOT(x86)=%~dp0.dotnet\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
Expand Down
2 changes: 1 addition & 1 deletion tests/TodoApp.Tests/TodoAppFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@ 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");
}
}