Skip to content

Commit 8fc07c9

Browse files
committed
Convert sdk.sln to slnx
1 parent 47d0bba commit 8fc07c9

File tree

20 files changed

+384
-1294
lines changed

20 files changed

+384
-1294
lines changed

TemplateEngine.slnf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"solution": {
3-
"path": "sdk.sln",
3+
"path": "sdk.slnx",
44
"projects": [
55
"test\\TestAssets\\TestPackages\\dotnet-new\\Microsoft.TemplateEngine.TestTemplates.csproj",
66
"src\\Cli\\Microsoft.DotNet.Cli.Sln.Internal\\Microsoft.DotNet.Cli.Sln.Internal.csproj",
@@ -21,4 +21,4 @@
2121
"template_feed\\Microsoft.DotNet.Common.ProjectTemplates.10.0\\Microsoft.DotNet.Common.ProjectTemplates.10.0.csproj"
2222
]
2323
}
24-
}
24+
}

containers.slnf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"solution": {
3-
"path": "sdk.sln",
3+
"path": "sdk.slnx",
44
"projects": [
55
"src\\Cli\\Microsoft.DotNet.Cli.Utils\\Microsoft.DotNet.Cli.Utils.csproj",
66
"src\\Cli\\Microsoft.DotNet.InternalAbstractions\\Microsoft.DotNet.InternalAbstractions.csproj",
@@ -13,4 +13,4 @@
1313
"test\\containerize.UnitTests\\containerize.UnitTests.csproj"
1414
]
1515
}
16-
}
16+
}

documentation/project-docs/developer-guide.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ As part of the build, some intermediate files will get generated which may run i
3434

3535
#### Using Visual Studio
3636

37-
The simple way to launch Visual Studio after building via `build.cmd` is to double-click the `VS with sdk.sln` Windows shortcut in the `artifacts` folder. This will load the generated environment automatically and launch Visual Studio with the `sdk.sln` solution.
37+
The simple way to launch Visual Studio after building via `build.cmd` is to double-click the `VS with sdk.slnx` Windows shortcut in the `artifacts` folder. This will load the generated environment automatically and launch Visual Studio with the `sdk.slnx` solution.
3838

39-
Alternatively, to open the solution in Visual Studio, be sure to build with `build.cmd` and run the generated environment for your shell. If you're using `cmd`, then run `artifacts\sdk-build-env.bat`. If you're using PowerShell, you need to 'dot source' `artifacts/sdk-build-env.ps1`. Finally, open Visual Studio with `devenv sdk.sln`.
39+
Alternatively, to open the solution in Visual Studio, be sure to build with `build.cmd` and run the generated environment for your shell. If you're using `cmd`, then run `artifacts\sdk-build-env.bat`. If you're using PowerShell, you need to 'dot source' `artifacts/sdk-build-env.ps1`. Finally, open Visual Studio with `devenv sdk.slnx`.
4040

4141
In addition, Visual Studio must have the following option set (this option is automatically set in preview Visual Studio builds):
4242

@@ -79,7 +79,7 @@ Run the following command from the root of the repository to run all the .NET Co
7979

8080
The `dotnet` executable in the artifacts directory can be run directly.
8181

82-
However, it's easier to configure a test environment to run the built `dotnet`. This test environment is managed by dogfood.
82+
However, it's easier to configure a test environment to run the built `dotnet`. This test environment is managed by dogfood.
8383
The dogfood script starts a new Powershell with the environment configured to redirect SDK resolution to your build.
8484

8585
From that shell your SDK will be available in:
@@ -146,7 +146,7 @@ Use developer command prompt for Visual Studio or put devenv on you PATH
146146
```shell
147147
build.cmd # to have a full build first
148148
.\artifacts\sdk-build-env.bat
149-
devenv sdk.sln
149+
devenv sdk.slnx
150150
```
151151

152152
Note again that in Visual studio "Use previews of the .NET SDK (requires restart)" must be checked. See the above comment for how to enable this.

eng/dotnet-format/dotnet-format-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ parameters:
1717
- Name: sdk
1818
_repo: "https://github.com/dotnet/sdk"
1919
_repoName: "dotnet/sdk"
20-
_targetSolution: "sdk.sln"
20+
_targetSolution: "sdk.slnx"
2121
_branchName: "main"
2222
_sha: "be25db95c376bffd508a023399ddd34392fe6458"
2323
_useParentSdk: 0

eng/restore-toolset.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ function CreateVSShortcut()
102102
}
103103

104104
$scriptPath = Join-Path $ArtifactsDir 'sdk-build-env.ps1'
105-
$slnPath = Join-Path $RepoRoot 'sdk.sln'
105+
$slnPath = Join-Path $RepoRoot 'sdk.slnx'
106106
$commandToLaunch = "& '$scriptPath'; & '$devenvPath' '$slnPath'"
107107
$powershellPath = '%SystemRoot%\system32\WindowsPowerShell\v1.0\powershell.exe'
108108
$shortcutPath = Join-Path $ArtifactsDir 'VS with sdk.sln.lnk'

sdk.sln

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

sdk.slnx

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

source-build.slnf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"solution": {
3-
"path": "sdk.sln",
3+
"path": "sdk.slnx",
44
"projects": [
55
"src\\BlazorWasmSdk\\Tasks\\Microsoft.NET.Sdk.BlazorWebAssembly.Tasks.csproj",
66
"src\\BlazorWasmSdk\\Tool\\Microsoft.NET.Sdk.BlazorWebAssembly.Tool.csproj",

src/BlazorWasmSdk/BlazorWasmSdk.slnf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"solution": {
3-
"path": "..\\..\\sdk.sln",
3+
"path": "..\\..\\sdk.slnx",
44
"projects": [
55
"src\\BlazorWasmSdk\\Tasks\\Microsoft.NET.Sdk.BlazorWebAssembly.Tasks.csproj",
66
"src\\BlazorWasmSdk\\Tool\\Microsoft.NET.Sdk.BlazorWebAssembly.Tool.csproj",

src/BuiltInTools/dotnet-format.slnf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"solution": {
3-
"path": "..\\..\\sdk.sln",
3+
"path": "..\\..\\sdk.slnx",
44
"projects": [
55
"src\\BuiltInTools\\dotnet-format\\dotnet-format.csproj",
66
"test\\dotnet-format.UnitTests\\dotnet-format.UnitTests.csproj"
77
]
88
}
9-
}
9+
}

0 commit comments

Comments
 (0)