Merge branch 'main' into FixCodeOwnersFile

# Conflicts: # CODEOWNERS
dotnet · Jul 12, 2024 · cf98059 · cf98059
2 parents a572bc8 + 68681c1
commit cf98059
Show file tree

Hide file tree

Showing 1,487 changed files with 92 additions and 668 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -14,17 +14,17 @@
 # Area-AspNetCore
 /src/BlazorWasmSdk/ @dotnet/aspnet-blazor-eng
 /test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/ @dotnet/aspnet-blazor-eng
-/src/Assets/TestProjects/BlazorHosted/ @dotnet/aspnet-blazor-eng
-/src/Assets/TestProjects/BlazorHostedRID/ @dotnet/aspnet-blazor-eng
-/src/Assets/TestProjects/BlazorWasmMinimal/ @dotnet/aspnet-blazor-eng
-/src/Assets/TestProjects/BlazorWasmWithLibrary/ @dotnet/aspnet-blazor-eng
+/test/TestAssets/TestProjects/BlazorHosted/ @dotnet/aspnet-blazor-eng
+/test/TestAssets/TestProjects/BlazorHostedRID/ @dotnet/aspnet-blazor-eng
+/test/TestAssets/TestProjects/BlazorWasmMinimal/ @dotnet/aspnet-blazor-eng
+/test/TestAssets/TestProjects/BlazorWasmWithLibrary/ @dotnet/aspnet-blazor-eng
 /src/RazorSdk/ @dotnet/razor-compiler
 /test/Microsoft.NET.Sdk.BlazorWebAssembly.AoT.Tests/ @dotnet/aspnet-blazor-eng
 /test/Microsoft.NET.Sdk.Razor.Tests/ @dotnet/razor-compiler
 /test/Microsoft.NET.Sdk.Razor.Tool.Tests/ @dotnet/razor-compiler
-/src/Assets/TestPackages/PackageLibraryDirectDependency/ @dotnet/aspnet-blazor-eng
-/src/Assets/TestPackages/PackageLibraryTransitiveDependency/ @dotnet/aspnet-blazor-eng
-/src/src/Assets/TestProjects/Razor*/ @dotnet/razor-compiler
+/test/TestAssets/TestPackages/PackageLibraryDirectDependency/ @dotnet/aspnet-blazor-eng
+/test/TestAssets/TestPackages/PackageLibraryTransitiveDependency/ @dotnet/aspnet-blazor-eng
+/test/TestAssets/TestProjects/Razor*/ @dotnet/razor-compiler
 
 # Area-Wasm
 /src/WasmSdk @lewing @akoeplinger @pavelsavara @maraf
@@ -72,7 +72,7 @@
 /src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ClickOnce.targets @sujitnayak
 
 # Area-Watch
-/src/Assets/TestProjects/Watch*/ @tmat @arkalyanms @dotnet/roslyn-ide
+/test/TestAssets/TestProjects/Watch*/ @tmat @arkalyanms @dotnet/roslyn-ide
 /test/dotnet-watch.Tests/ @tmat @arkalyanms @dotnet/roslyn-ide
 /test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/ @dotnet/aspnet-blazor-eng
 /src/BuiltInTools/* @tmat @arkalyanms @dotnet/roslyn-ide

diff --git a/TemplateEngine.slnf b/TemplateEngine.slnf
@@ -2,7 +2,7 @@
   "solution": {
     "path": "sdk.sln",
     "projects": [
-      "src\\Assets\\TestPackages\\dotnet-new\\Microsoft.TemplateEngine.TestTemplates.csproj",
+      "test\\TestAssets\\TestPackages\\dotnet-new\\Microsoft.TemplateEngine.TestTemplates.csproj",
       "src\\Cli\\Microsoft.DotNet.Cli.Sln.Internal\\Microsoft.DotNet.Cli.Sln.Internal.csproj",
       "src\\Cli\\Microsoft.DotNet.Cli.Utils\\Microsoft.DotNet.Cli.Utils.csproj",
       "src\\Cli\\Microsoft.DotNet.Configurer\\Microsoft.DotNet.Configurer.csproj",

diff --git a/build/RunTestsOnHelix.cmd b/build/RunTestsOnHelix.cmd
@@ -28,7 +28,7 @@ robocopy %HELIX_CORRELATION_PAYLOAD%\t\TestExecutionDirectoryFiles %TestExecutio
 
 set DOTNET_SDK_TEST_EXECUTION_DIRECTORY=%TestExecutionDirectory%
 set DOTNET_SDK_TEST_MSBUILDSDKRESOLVER_FOLDER=%HELIX_CORRELATION_PAYLOAD%\r
-set DOTNET_SDK_TEST_ASSETS_DIRECTORY=%TestExecutionDirectory%\assets
+set DOTNET_SDK_TEST_ASSETS_DIRECTORY=%TestExecutionDirectory%\TestAssets
 
 REM call dotnet new so the first run message doesn't interfere with the first test
 dotnet new --debug:ephemeral-hive

diff --git a/build/RunTestsOnHelix.sh b/build/RunTestsOnHelix.sh
@@ -16,7 +16,7 @@ cp -a $HELIX_CORRELATION_PAYLOAD/t/TestExecutionDirectoryFiles/. $TestExecutionD
 
 export DOTNET_SDK_TEST_EXECUTION_DIRECTORY=$TestExecutionDirectory
 export DOTNET_SDK_TEST_MSBUILDSDKRESOLVER_FOLDER=$HELIX_CORRELATION_PAYLOAD/r
-export DOTNET_SDK_TEST_ASSETS_DIRECTORY=$TestExecutionDirectory/Assets
+export DOTNET_SDK_TEST_ASSETS_DIRECTORY=$TestExecutionDirectory/TestAssets
 
 # call dotnet new so the first run message doesn't interfere with the first test
 dotnet new --debug:ephemeral-hive

diff --git a/sdk.sln b/sdk.sln
@@ -389,7 +389,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.ApiCompat.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.ApiCompat.Tests", "test\Microsoft.DotNet.ApiCompat.Tests\Microsoft.DotNet.ApiCompat.Tests.csproj", "{A9103B98-D888-4260-8A05-FA36F640698A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.TestTemplates", "src\Assets\TestPackages\dotnet-new\Microsoft.TemplateEngine.TestTemplates.csproj", "{C37EC61D-6A88-4C15-B371-A61F23EF9072}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.TestTemplates", "test\TestAssets\TestPackages\dotnet-new\Microsoft.TemplateEngine.TestTemplates.csproj", "{C37EC61D-6A88-4C15-B371-A61F23EF9072}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assets", "Assets", "{06260DC7-BA64-42BE-B99C-6069A1C3E70E}"
 EndProject

diff --git a/...topTestProjects/NETFrameworkReferenceNETStandard20/MultiTFMTestApp/MultiTFMTestApp.csproj b/...topTestProjects/NETFrameworkReferenceNETStandard20/MultiTFMTestApp/MultiTFMTestApp.csproj
diff --git a/src/Assets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/MultiTFMTestApp/Program.cs b/src/Assets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/MultiTFMTestApp/Program.cs
diff --git a/src/Assets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/TestApp/Program.cs b/src/Assets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/TestApp/Program.cs
diff --git a/src/Assets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/TestApp/TestApp.csproj b/src/Assets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/TestApp/TestApp.csproj
diff --git a/src/Assets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/TestLibrary/Helper.cs b/src/Assets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/TestLibrary/Helper.cs
diff --git a/...ets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/TestLibrary/TestLibrary.csproj b/...ets/DesktopTestProjects/NETFrameworkReferenceNETStandard20/TestLibrary/TestLibrary.csproj
diff --git a/src/Assets/Directory.Build.props b/src/Assets/Directory.Build.props
diff --git a/src/Assets/Directory.Build.targets b/src/Assets/Directory.Build.targets
diff --git a/src/Assets/TestPackages/dotnet-portable/Program.cs b/src/Assets/TestPackages/dotnet-portable/Program.cs
diff --git a/src/Assets/TestPackages/dotnet-portable/dotnet-portable.csproj b/src/Assets/TestPackages/dotnet-portable/dotnet-portable.csproj
diff --git a/src/Assets/TestPackages/dotnet-prefercliruntime/Program.cs b/src/Assets/TestPackages/dotnet-prefercliruntime/Program.cs
diff --git a/src/Assets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj b/src/Assets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj
diff --git a/src/Assets/TestPackages/dotnet-prefercliruntime/prefercliruntime b/src/Assets/TestPackages/dotnet-prefercliruntime/prefercliruntime
diff --git a/...ojects/AppWithApplicationUrlInLaunchSettings/AppWithApplicationUrlInLaunchSettings.csproj b/...ojects/AppWithApplicationUrlInLaunchSettings/AppWithApplicationUrlInLaunchSettings.csproj
diff --git a/src/Assets/TestProjects/AppWithApplicationUrlInLaunchSettings/Program.cs b/src/Assets/TestProjects/AppWithApplicationUrlInLaunchSettings/Program.cs
diff --git a/src/Assets/TestProjects/AppWithApplicationUrlInLaunchSettings/Properties/launchSettings.json b/src/Assets/TestProjects/AppWithApplicationUrlInLaunchSettings/Properties/launchSettings.json
diff --git a/src/Assets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj b/src/Assets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
diff --git a/src/Assets/TestProjects/MSBuildTestApp/Program.cs b/src/Assets/TestProjects/MSBuildTestApp/Program.cs
diff --git a/...ileWithNoProjectReferencesAndUnknownProjectType/UnknownProject/UnknownProject.unknownproj b/...ileWithNoProjectReferencesAndUnknownProjectType/UnknownProject/UnknownProject.unknownproj
diff --git a/src/Assets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/App.sln b/src/Assets/TestProjects/SlnFileWithNoProjectReferencesAndVBProject/App.sln
diff --git a/src/Assets/TestProjects/TestAppSimple/Program.cs b/src/Assets/TestProjects/TestAppSimple/Program.cs
diff --git a/src/Assets/TestProjects/TestAppSimple/TestAppSimple.csproj b/src/Assets/TestProjects/TestAppSimple/TestAppSimple.csproj