Skip to content

Commit 73ae2c9

Browse files
authored
Move to slnx and slnf (#32514)
* Switch to the new slnx format * fix the workspace * Generate during local dev
1 parent a1ba236 commit 73ae2c9

33 files changed

+399
-3021
lines changed

.github/copilot-instructions.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ UI tests use Appium WebDriver with NUnit. See [UI Testing Guide](../docs/UITesti
149149
Before committing any changes, format the codebase using the following command to ensure consistent code style:
150150

151151
```bash
152-
dotnet format Microsoft.Maui.sln --no-restore --exclude Templates/src --exclude-diagnostics CA1822
152+
dotnet format Microsoft.Maui.slnx --no-restore --exclude Templates/src --exclude-diagnostics CA1822
153153
```
154154

155155
This command:
@@ -267,9 +267,9 @@ dotnet build ./Microsoft.Maui.BuildTasks.slnf
267267
**Issue: "Dependency version conflicts"**
268268
```bash
269269
# Solution: Full clean and restore
270-
dotnet clean Microsoft.Maui.sln
270+
dotnet clean Microsoft.Maui.slnx
271271
rm -rf bin/ obj/
272-
dotnet restore Microsoft.Maui.sln --force
272+
dotnet restore Microsoft.Maui.slnx --force
273273
```
274274

275275
**Issue: "Android SDK not found"**
@@ -282,7 +282,7 @@ android # Opens Android SDK Manager
282282
**Issue: "PublicAPI analyzer failures"**
283283
```bash
284284
# Solution: Use format analyzers first
285-
dotnet format analyzers Microsoft.Maui.sln
285+
dotnet format analyzers Microsoft.Maui.slnx
286286
# If still failing, check build output for required API entries
287287
```
288288

.github/workflows/dotnet-autoformat-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ jobs:
1414
- name: 'Autoformat'
1515
uses: rolfbjarne/[email protected]
1616
with:
17-
script: 'dotnet format Microsoft.Maui.sln --no-restore --exclude Templates/src BlazorWebView/src/SharedSource/BlazorWebViewDeveloperTools.cs BlazorWebView/src/SharedSource/BlazorWebViewServiceCollectionExtensions.cs Graphics/src/Graphics.Win2D/W2DCanvas.cs Graphics/src/Graphics.Win2D/W2DExtensions.cs'
17+
script: 'dotnet format Microsoft.Maui.slnx --no-restore --exclude Templates/src BlazorWebView/src/SharedSource/BlazorWebViewDeveloperTools.cs BlazorWebView/src/SharedSource/BlazorWebViewServiceCollectionExtensions.cs Graphics/src/Graphics.Win2D/W2DCanvas.cs Graphics/src/Graphics.Win2D/W2DExtensions.cs'
1818
onlyFilesModifiedInPullRequest: true
1919
git_commit_message: 'Auto-format source code'

.github/workflows/dotnet-format-daily.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ jobs:
5454
5555
- name: Run dotnet format
5656
run: |
57-
dotnet restore Microsoft.Maui.sln
58-
dotnet format Microsoft.Maui.sln --exclude Templates/src --exclude-diagnostics CA1822
57+
dotnet restore Microsoft.Maui.slnx
58+
dotnet format Microsoft.Maui.slnx --exclude Templates/src --exclude-diagnostics CA1822
5959
6060
- name: Create Pull Request
6161
uses: dotnet/actions-create-pull-request@v4

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"dotnet.defaultSolution": "Microsoft.Maui-vscode.sln"
2+
"dotnet.defaultSolution": "Microsoft.Maui-vscode.slnx"
33
}

AGENTS.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ dotnet cake --target=VS --android --ios
7575
Before committing any changes:
7676

7777
```bash
78-
dotnet format Microsoft.Maui.sln --no-restore --exclude Templates/src --exclude-diagnostics CA1822
78+
dotnet format Microsoft.Maui.slnx --no-restore --exclude Templates/src --exclude-diagnostics CA1822
7979
```
8080

8181
### PublicAPI Management
@@ -486,15 +486,15 @@ dotnet build ./Microsoft.Maui.BuildTasks.slnf
486486
**Issue: "Dependency version conflicts"**
487487
```bash
488488
# Solution: Full clean and restore
489-
dotnet clean Microsoft.Maui.sln
489+
dotnet clean Microsoft.Maui.slnx
490490
rm -rf bin/ obj/
491-
dotnet restore Microsoft.Maui.sln --force
491+
dotnet restore Microsoft.Maui.slnx --force
492492
```
493493

494494
**Issue: "PublicAPI analyzer failures"**
495495
```bash
496496
# Solution: Use format analyzers first
497-
dotnet format analyzers Microsoft.Maui.sln
497+
dotnet format analyzers Microsoft.Maui.slnx
498498
# If still failing, check build output for required API entries
499499
```
500500

Directory.Build.props

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,6 @@
122122
<IncludeAndroidTargetFrameworks>true</IncludeAndroidTargetFrameworks>
123123
<IncludeMacCatalystTargetFrameworks>true</IncludeMacCatalystTargetFrameworks>
124124
<IncludeIosTargetFrameworks>true</IncludeIosTargetFrameworks>
125-
<IncludeCompatibilityProjects>false</IncludeCompatibilityProjects>
126-
<IncludeCompatibilityProjects Condition="'$(SolutionFileName)' == 'Microsoft.Maui.sln'">true</IncludeCompatibilityProjects>
127125
</PropertyGroup>
128126

129127
<!-- this is CI, so everything should be there -->
@@ -139,7 +137,6 @@
139137

140138
<PropertyGroup>
141139
<DefineConstants Condition="'$(_MauiTargetPlatformIsWindows)' == 'True'">$(DefineConstants);WINDOWS</DefineConstants>
142-
<DefineConstants Condition="'$(IncludeCompatibilityProjects)' == 'True'">$(DefineConstants);COMPATIBILITY_ENABLED</DefineConstants>
143140
<DefineConstants Condition="'$(IncludePreviousTfms)' == 'True'">$(DefineConstants);ENABLE_PREVIOUS_TFM_BUILDS</DefineConstants>
144141
<!-- <SymbolPackageFormat>snupkg</SymbolPackageFormat> -->
145142
<!-- <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles> -->

0 commit comments

Comments
 (0)