Skip to content

Commit eefa50f

Browse files
Refactor solution file from .sln to .slnx format and update related d… (#9295)
* Refactor solution file from .sln to .slnx format and update related documentation and scripts - Created new Aspire.slnx file with updated project structure. - Updated contributing and usage documentation to reference Aspire.slnx. - Modified build scripts to use Aspire.slnx instead of Aspire.sln. - Adjusted project template configuration to exclude both .sln and .slnx files. - Updated startvs.cmd to default to Aspire.slnx when no solution is specified. * Update local VS Code settings --------- Co-authored-by: Safia Abdalla <safia@safia.rocks>
1 parent a8c8aba commit eefa50f

File tree

12 files changed

+427
-4410
lines changed

12 files changed

+427
-4410
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"remote.otherPortsAttributes": {
4848
"onAutoForward": "ignore"
4949
},
50-
"dotnet.defaultSolution": "Aspire.sln"
50+
"dotnet.defaultSolution": "Aspire.slnx"
5151
}
5252
}
5353
},

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
*.fsproj text=auto
5454
*.dbproj text=auto
5555
*.sln text=auto eol=crlf
56+
*.slnx text=auto eol=crlf
5657

5758
# Set linguist language for .h files explicitly based on
5859
# https://github.com/github/linguist/issues/1626#issuecomment-401442069

.github/workflows/update-dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

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

3737
- name: Revert all changes except Directory.Packages.props files
3838
run: |

.vscode/settings.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{
22
"dotnet.previewSolution-freeWorkspaceMode": true,
3+
"dotnet.defaultSolution": "./Aspire.slnx",
4+
"dotnet.preview.enableSupportForSlnx": true,
35
"dotnet.testWindow.useTestingPlatformProtocol": false
46
}

Aspire.sln

Lines changed: 0 additions & 4399 deletions
This file was deleted.

Aspire.slnx

Lines changed: 411 additions & 0 deletions
Large diffs are not rendered by default.

docs/contributing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ This will confirm that you're all set up.
1515

1616
If you are using Visual Studio:
1717

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

docs/using-latest-daily.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ dotnet new aspire-starter
6464
> [!TIP]
6565
> 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`.
6666
67-
These will create a `.sln` file and at least two projects.
67+
These will create a `.slnx` file and at least two projects.
6868

69-
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`
69+
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`
7070
```shell
7171
dotnet restore
7272
dotnet build

eng/build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ if ($help) {
5757
}
5858

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

6262
. $PSScriptRoot\common\tools.ps1
6363

eng/common/build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ function Print-Usage() {
6363
Write-Host ""
6464

6565
Write-Host "Advanced settings:"
66-
Write-Host " -projects <value> Semi-colon delimited list of sln/proj's to build. Globbing is supported (*.sln)"
66+
Write-Host " -projects <value> Semi-colon delimited list of sln/slnx/proj's to build. Globbing is supported (*.slnx)"
6767
Write-Host " -ci Set when running on CI server"
6868
Write-Host " -excludeCIBinarylog Don't output binary log (short: -nobl)"
6969
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"

0 commit comments

Comments
 (0)