Skip to content

Convert sdk.sln to slnx #49291

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Convert sdk.sln to slnx #49291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions TemplateEngine.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"solution": {
"path": "sdk.sln",
"path": "sdk.slnx",
"projects": [
"test\\TestAssets\\TestPackages\\dotnet-new\\Microsoft.TemplateEngine.TestTemplates.csproj",
"src\\Cli\\Microsoft.DotNet.Cli.Sln.Internal\\Microsoft.DotNet.Cli.Sln.Internal.csproj",
Expand All @@ -21,4 +21,4 @@
"template_feed\\Microsoft.DotNet.Common.ProjectTemplates.10.0\\Microsoft.DotNet.Common.ProjectTemplates.10.0.csproj"
]
}
}
}
4 changes: 2 additions & 2 deletions containers.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"solution": {
"path": "sdk.sln",
"path": "sdk.slnx",
"projects": [
"src\\Cli\\Microsoft.DotNet.Cli.Utils\\Microsoft.DotNet.Cli.Utils.csproj",
"src\\Cli\\Microsoft.DotNet.InternalAbstractions\\Microsoft.DotNet.InternalAbstractions.csproj",
Expand All @@ -13,4 +13,4 @@
"test\\containerize.UnitTests\\containerize.UnitTests.csproj"
]
}
}
}
8 changes: 4 additions & 4 deletions documentation/project-docs/developer-guide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ As part of the build, some intermediate files will get generated which may run i

#### Using Visual Studio

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.
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.

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`.
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`.

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

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

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

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

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

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.
Expand Down
2 changes: 1 addition & 1 deletion eng/dotnet-format/dotnet-format-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ parameters:
- Name: sdk
_repo: "https://github.com/dotnet/sdk"
_repoName: "dotnet/sdk"
_targetSolution: "sdk.sln"
_targetSolution: "sdk.slnx"
_branchName: "main"
_sha: "be25db95c376bffd508a023399ddd34392fe6458"
_useParentSdk: 0
Expand Down
2 changes: 1 addition & 1 deletion eng/restore-toolset.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ function CreateVSShortcut()
}

$scriptPath = Join-Path $ArtifactsDir 'sdk-build-env.ps1'
$slnPath = Join-Path $RepoRoot 'sdk.sln'
$slnPath = Join-Path $RepoRoot 'sdk.slnx'
$commandToLaunch = "& '$scriptPath'; & '$devenvPath' '$slnPath'"
$powershellPath = '%SystemRoot%\system32\WindowsPowerShell\v1.0\powershell.exe'
$shortcutPath = Join-Path $ArtifactsDir 'VS with sdk.sln.lnk'
Expand Down
1,263 changes: 0 additions & 1,263 deletions sdk.sln
View file
Open in desktop

This file was deleted.

353 changes: 353 additions & 0 deletions sdk.slnx
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion source-build.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"solution": {
"path": "sdk.sln",
"path": "sdk.slnx",
"projects": [
"src\\BlazorWasmSdk\\Tasks\\Microsoft.NET.Sdk.BlazorWebAssembly.Tasks.csproj",
"src\\BlazorWasmSdk\\Tool\\Microsoft.NET.Sdk.BlazorWebAssembly.Tool.csproj",
Expand Down
2 changes: 1 addition & 1 deletion src/BlazorWasmSdk/BlazorWasmSdk.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"solution": {
"path": "..\\..\\sdk.sln",
"path": "..\\..\\sdk.slnx",
"projects": [
"src\\BlazorWasmSdk\\Tasks\\Microsoft.NET.Sdk.BlazorWebAssembly.Tasks.csproj",
"src\\BlazorWasmSdk\\Tool\\Microsoft.NET.Sdk.BlazorWebAssembly.Tool.csproj",
Expand Down
4 changes: 2 additions & 2 deletions src/BuiltInTools/dotnet-format.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"solution": {
"path": "..\\..\\sdk.sln",
"path": "..\\..\\sdk.slnx",
"projects": [
"src\\BuiltInTools\\dotnet-format\\dotnet-format.csproj",
"test\\dotnet-format.UnitTests\\dotnet-format.UnitTests.csproj"
]
}
}
}
4 changes: 2 additions & 2 deletions src/BuiltInTools/dotnet-watch.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"solution": {
"path": "..\\..\\sdk.sln",
"path": "..\\..\\sdk.slnx",
"projects": [
"src\\BuiltInTools\\AspireService\\Microsoft.WebTools.AspireService.Package.csproj",
"src\\BuiltInTools\\AspireService\\Microsoft.WebTools.AspireService.shproj",
Expand All @@ -21,4 +21,4 @@
"test\\dotnet-watch.Tests\\dotnet-watch.Tests.csproj"
]
}
}
}
4 changes: 2 additions & 2 deletions src/Compatibility/ApiCompat/apicompat.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"solution": {
"path": "..\\..\\..\\sdk.sln",
"path": "..\\..\\..\\sdk.slnx",
"projects": [
"src\\Cli\\Microsoft.DotNet.Cli.Utils\\Microsoft.DotNet.Cli.Utils.csproj",
"src\\Cli\\Microsoft.DotNet.InternalAbstractions\\Microsoft.DotNet.InternalAbstractions.csproj",
Expand All @@ -19,4 +19,4 @@
"test\\Microsoft.NET.TestFramework\\Microsoft.NET.TestFramework.csproj"
]
}
}
}
2 changes: 1 addition & 1 deletion src/Compatibility/ApiDiff/apidiff.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"solution": {
"path": "..\\..\\..\\sdk.sln",
"path": "..\\..\\..\\sdk.slnx",
"projects": [
"src\\Compatibility\\ApiDiff\\Microsoft.DotNet.ApiDiff\\Microsoft.DotNet.ApiDiff.csproj",
"src\\Compatibility\\ApiDiff\\Microsoft.DotNet.ApiDiff.Tool\\Microsoft.DotNet.ApiDiff.Tool.csproj",
Expand Down
4 changes: 2 additions & 2 deletions src/Compatibility/GenAPI/genapi.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"solution": {
"path": "..\\..\\..\\sdk.sln",
"path": "..\\..\\..\\sdk.slnx",
"projects": [
"src\\Cli\\Microsoft.DotNet.Cli.Utils\\Microsoft.DotNet.Cli.Utils.csproj",
"src\\Cli\\Microsoft.DotNet.InternalAbstractions\\Microsoft.DotNet.InternalAbstractions.csproj",
Expand All @@ -14,4 +14,4 @@
"test\\Microsoft.NET.TestFramework\\Microsoft.NET.TestFramework.csproj"
]
}
}
}
2 changes: 1 addition & 1 deletion src/Compatibility/compatibility.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"solution": {
"path": "..\\..\\sdk.sln",
"path": "..\\..\\sdk.slnx",
"projects": [
"src\\Cli\\Microsoft.DotNet.Cli.Utils\\Microsoft.DotNet.Cli.Utils.csproj",
"src\\Cli\\Microsoft.DotNet.InternalAbstractions\\Microsoft.DotNet.InternalAbstractions.csproj",
Expand Down
4 changes: 2 additions & 2 deletions src/RazorSdk/Razor.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"solution": {
"path": "..\\..\\sdk.sln",
"path": "..\\..\\sdk.slnx",
"projects": [
"src\\BlazorWasmSdk\\Tasks\\Microsoft.NET.Sdk.BlazorWebAssembly.Tasks.csproj",
"src\\BlazorWasmSdk\\Tool\\Microsoft.NET.Sdk.BlazorWebAssembly.Tool.csproj",
Expand All @@ -18,4 +18,4 @@
"test\\Microsoft.NET.TestFramework\\Microsoft.NET.TestFramework.csproj"
]
}
}
}
2 changes: 1 addition & 1 deletion src/Tasks/Microsoft.NET.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"solution": {
"path": "..\\..\\sdk.sln",
"path": "..\\..\\sdk.slnx",
"projects": [
"src\\Cli\\Microsoft.DotNet.Cli.Sln.Internal\\Microsoft.DotNet.Cli.Sln.Internal.csproj",
"src\\Cli\\Microsoft.DotNet.Cli.Utils\\Microsoft.DotNet.Cli.Utils.csproj",
Expand Down
4 changes: 2 additions & 2 deletions src/WebSdk/WebSdk.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"solution": {
"path": "..\\..\\sdk.sln",
"path": "..\\..\\sdk.slnx",
"projects": [
"src\\WebSdk\\ProjectSystem\\Tasks\\Microsoft.NET.Sdk.Web.ProjectSystem.Tasks.csproj",
"src\\WebSdk\\Publish\\Tasks\\Microsoft.NET.Sdk.Publish.Tasks.csproj",
Expand All @@ -9,4 +9,4 @@
"test\\Microsoft.NET.Sdk.Publish.Tasks.Tests\\Microsoft.NET.Sdk.Publish.Tasks.Tests.csproj"
]
}
}
}
4 changes: 2 additions & 2 deletions test/Microsoft.TemplateEngine.Cli.UnitTests/BaseTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ private static string GetAndVerifyRepoRoot()
{
Assert.Fail($"The repo root cannot be evaluated.");
}
if (!File.Exists(Path.Combine(repoRoot, "sdk.sln")))
if (!File.Exists(Path.Combine(repoRoot, "sdk.slnx")))
{
Assert.Fail($"The repo root doesn't contain 'sdk.sln'.");
Assert.Fail($"The repo root doesn't contain 'sdk.slnx'.");
}
return repoRoot;
}
Expand Down
4 changes: 2 additions & 2 deletions test/dotnet-new.IntegrationTests/BaseIntegrationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,9 @@ private static string GetAndVerifyRepoRoot()
{
Assert.Fail($"The repo root cannot be evaluated.");
}
if (!File.Exists(Path.Combine(repoRoot, "sdk.sln")))
if (!File.Exists(Path.Combine(repoRoot, "sdk.slnx")))
{
Assert.Fail($"The repo root doesn't contain 'sdk.sln'.");
Assert.Fail($"The repo root doesn't contain 'sdk.slnx'.");
}
return repoRoot;
}
Expand Down
Loading