Skip to content

Refactor solution file from .sln to .slnx format and update related d… #9295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidfowl merged 2 commits into from
May 14, 2025
Merged

Refactor solution file from .sln to .slnx format and update related d… #9295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2df9005
Refactor solution file from .sln to .slnx format and update related d…
davidfowl May 13, 2025
571cd6a
Update local VS Code settings
captainsafia May 13, 2025
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 .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"remote.otherPortsAttributes": {
"onAutoForward": "ignore"
},
"dotnet.defaultSolution": "Aspire.sln"
Copy link
Contributor

@captainsafia captainsafia May 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe devcontainer will respect the settings in the local .vscode directory so we can just have all the customizations there so they work for non-DevContainer users as well.

"dotnet.defaultSolution": "Aspire.slnx"
}
}
},
Expand Down
1 change: 1 addition & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
*.fsproj text=auto
*.dbproj text=auto
*.sln text=auto eol=crlf
*.slnx text=auto eol=crlf

# Set linguist language for .h files explicitly based on
# https://github.com/github/linguist/issues/1626#issuecomment-401442069
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-dependencies.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

- name: Update packages
continue-on-error: true
run: dotnet outdated --no-restore -u ./Aspire.sln || echo "Some dependencies could not be updated, but continuing workflow."
run: dotnet outdated --no-restore -u ./Aspire.slnx || echo "Some dependencies could not be updated, but continuing workflow."

- name: Revert all changes except Directory.Packages.props files
run: |
Expand Down
2 changes: 2 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"dotnet.previewSolution-freeWorkspaceMode": true,
"dotnet.defaultSolution": "./Aspire.slnx",
"dotnet.preview.enableSupportForSlnx": true,
"dotnet.testWindow.useTestingPlatformProtocol": false
}
4,399 changes: 0 additions & 4,399 deletions Aspire.sln
View file
Open in desktop

This file was deleted.

411 changes: 411 additions & 0 deletions Aspire.slnx
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/contributing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ This will confirm that you're all set up.

If you are using Visual Studio:

1. Open `Aspire.sln`
1. Open `Aspire.slnx`
1. Set the Startup Project to be the `AppHost` project (it's under `\playground\TestShop`). Make sure the launch profile is set to "http".
1. <kbd>F5</kbd> to debug, or <kbd>Ctrl+F5</kbd> to launch without debugging.

Expand Down
4 changes: 2 additions & 2 deletions docs/using-latest-daily.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ dotnet new aspire-starter
> [!TIP]
> If you get an error saying `Unable to resolve the template, the following installed templates are conflicting`, append a `-9` to the above template names. For example, `dotnet new aspire-starter-9`.

These will create a `.sln` file and at least two projects.
These will create a `.slnx` file and at least two projects.

Assuming the NuGet feed you added above is visible -- for example you added it globally or it's in a NuGet.config in this folder - you can now build that `.sln`
Assuming the NuGet feed you added above is visible -- for example you added it globally or it's in a NuGet.config in this folder - you can now build that `.slnx`
```shell
dotnet restore
dotnet build
Expand Down
2 changes: 1 addition & 1 deletion eng/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ if ($help) {
}

if ($vs) {
$solution = Split-Path $PSScriptRoot -Parent | Join-Path -ChildPath "Aspire.sln"
$solution = Split-Path $PSScriptRoot -Parent | Join-Path -ChildPath "Aspire.slnx"

. $PSScriptRoot\common\tools.ps1

Expand Down
2 changes: 1 addition & 1 deletion eng/common/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ function Print-Usage() {
Write-Host ""

Write-Host "Advanced settings:"
Write-Host " -projects <value> Semi-colon delimited list of sln/proj's to build. Globbing is supported (*.sln)"
Write-Host " -projects <value> Semi-colon delimited list of sln/slnx/proj's to build. Globbing is supported (*.slnx)"
Write-Host " -ci Set when running on CI server"
Write-Host " -excludeCIBinarylog Don't output binary log (short: -nobl)"
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"
Expand Down
6 changes: 4 additions & 2 deletions src/Aspire.ProjectTemplates/templates/aspire-empty/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@
{
"condition": "(hostIdentifier != \"dotnetcli\" && hostIdentifier != \"dotnetcli-preview\")",
"exclude": [
"*.sln"
"*.sln",
"*.slnx"
]
}
]
Expand All @@ -55,7 +56,8 @@
{
"condition": "(hostIdentifier != \"dotnetcli\" && hostIdentifier != \"dotnetcli-preview\")",
"exclude": [
"*.sln"
"*.sln",
"*.slnx"
]
}
]
Expand Down
4 changes: 2 additions & 2 deletions startvs.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ SET PATH=%DOTNET_ROOT%;%PATH%
SET sln=%~1

IF "%sln%"=="" (
echo Solution not specified, using Aspire.sln
SET sln=%~dp0Aspire.sln
echo Solution not specified, using Aspire.slnx
SET sln=%~dp0Aspire.slnx
)

start "" "%sln%"