Skip to content

Commit efbd178

Browse files
authored
[automated] Merge branch 'release/10.0.2xx' => 'main' (#51898)
2 parents b13860b + b0b91f6 commit efbd178

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

documentation/general/decouple-vs-and-net-sdk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ Based on the value of the `RoslynCompilerType` property, the SDK (or compiler to
145145

146146
These values are recognized for property `RoslynCompilerType`:
147147
- `Core`: use the compiler that comes with the .NET SDK
148-
- `Framework`: use the compiler that comes with .NET Framework MSBuild
148+
- `Framework`: use the compiler that comes with .NET Framework MSBuild (this option is [deprecated and will be removed in .NET 11](https://aka.ms/roslyn-compiler-type-framework))
149149
- `FrameworkPackage`: download the Microsoft.Net.Sdk.Compilers.Toolset package which contains the .NET Framework compiler corresponding to the .NET SDK version
150150
- `Custom`: the SDK will not override `RoslynTasksAssembly` and the other properties listed above - used for example by Microsoft.Net.Compilers.Toolset package which injects its own version of the build task
151151

test/TestAssets/TestProjects/MultiTestProjectSolutionWithTests/MultiTestProjectSolutionWithTests.sln

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
44
VisualStudioVersion = 17.12.35322.30 main
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProject", "TestProject/TestProject.csproj", "{C43FCD94-028D-4DE8-96EC-A3663AE225B4}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProject", "TestProject\TestProject.csproj", "{C43FCD94-028D-4DE8-96EC-A3663AE225B4}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OtherTestProject", "OtherTestProject/OtherTestProject.csproj", "{6171FC1F-E2F2-4F66-A8DE-EC4765081661}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OtherTestProject", "OtherTestProject\OtherTestProject.csproj", "{6171FC1F-E2F2-4F66-A8DE-EC4765081661}"
99
EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"solution": {
3-
"path": "../MultiTestProjectSolutionWithTests.sln",
3+
"path": "..\\MultiTestProjectSolutionWithTests.sln",
44
"projects": [
5-
"TestProject/TestProject.csproj"
5+
"TestProject\\TestProject.csproj"
66
]
77
}
8-
}
8+
}

test/TestAssets/TestProjects/MultiTestProjectSolutionWithTests/TestProjects.slnf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"solution": {
33
"path": "MultiTestProjectSolutionWithTests.sln",
44
"projects": [
5-
"TestProject/TestProject.csproj"
5+
"TestProject\\TestProject.csproj"
66
]
77
}
8-
}
8+
}

0 commit comments

Comments
 (0)