diff --git a/Directory.Build.props b/Directory.Build.props index c8e143f90c8f..66f6939e6a26 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -33,6 +33,7 @@ $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'redist', '$(Configuration)')) $([MSBuild]::NormalizeDirectory('$(TestHostFolder)', 'dotnet')) $(TestHostDotNetRoot)$([System.IO.Path]::GetFileName('$(DotNetTool)')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsTmpDir)', 'testing')) https://github.com/dotnet/sdk MIT diff --git a/eng/pipelines/templates/jobs/sdk-build.yml b/eng/pipelines/templates/jobs/sdk-build.yml index 53ce33b04fce..67d02032d6b3 100644 --- a/eng/pipelines/templates/jobs/sdk-build.yml +++ b/eng/pipelines/templates/jobs/sdk-build.yml @@ -137,7 +137,7 @@ jobs: - ${{ if eq(parameters.runAoTTests, true) }}: # For the reason this is here, see: https://github.com/dotnet/sdk/issues/22655 - script: $(Build.SourcesDirectory)/artifacts/bin/redist/$(buildConfiguration)/dotnet/dotnet workload install wasm-tools --skip-manifest-update - workingDirectory: $(Build.SourcesDirectory)/artifacts + workingDirectory: $(Build.SourcesDirectory)/artifacts/bin displayName: 🟣 Install wasm-tools Workload # For the /p:Projects syntax for PowerShell, see: https://github.com/dotnet/msbuild/issues/471#issuecomment-1146466335 - ${{ if eq(parameters.pool.os, 'windows') }}: diff --git a/src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj b/src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj index d8b8c234fad2..4708b24ea62d 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj +++ b/src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj @@ -122,7 +122,7 @@ - + diff --git a/src/Containers/containerize/containerize.csproj b/src/Containers/containerize/containerize.csproj index 755db03e9218..11916b8c05ef 100644 --- a/src/Containers/containerize/containerize.csproj +++ b/src/Containers/containerize/containerize.csproj @@ -26,11 +26,11 @@ - + - + diff --git a/src/Containers/packaging/package.csproj b/src/Containers/packaging/package.csproj index 57bae47dba8c..86f7e86a352f 100644 --- a/src/Containers/packaging/package.csproj +++ b/src/Containers/packaging/package.csproj @@ -112,14 +112,14 @@ + DestinationFiles="$(TestLayoutDir)Container/package/Microsoft.NET.Build.Containers.$(Version).nupkg" /> + DestinationFiles="$(TestLayoutDir)Container/packaging/Microsoft.NET.Build.Containers.props" /> + DestinationFiles="$(TestLayoutDir)Container/packaging/Microsoft.NET.Build.Containers.targets" /> diff --git a/src/Layout/redist/targets/GenerateTestingGlobalJson.targets b/src/Layout/redist/targets/GenerateTestingGlobalJson.targets index a925ea2241c1..decd3082e2a0 100644 --- a/src/Layout/redist/targets/GenerateTestingGlobalJson.targets +++ b/src/Layout/redist/targets/GenerateTestingGlobalJson.targets @@ -1,14 +1,14 @@ - - - <_TestingGlobalJsonPath>$(ArtifactsDir)global.json - + + <_TestingGlobalJsonPath Include="$(ArtifactsBinDir)global.json" /> + <_TestingGlobalJsonPath Include="$(TestLayoutDir)global.json" /> + + Outputs="@(_TestingGlobalJsonPath)"> <_TestingRedistDotnetPath>$(TestHostDotNetRoot.Replace('\', '\\')) @@ -21,13 +21,13 @@ <_RedistGlobalJsonLines Include=" }" /> <_RedistGlobalJsonLines Include="}" /> - - + diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/Microsoft.DotNet.Common.ItemTemplates.csproj b/template_feed/Microsoft.DotNet.Common.ItemTemplates/Microsoft.DotNet.Common.ItemTemplates.csproj index be96eb81715e..8550409a7588 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/Microsoft.DotNet.Common.ItemTemplates.csproj +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/Microsoft.DotNet.Common.ItemTemplates.csproj @@ -4,7 +4,7 @@ False False False - $(ArtifactsTmpDir) + $(TestLayoutDir) False true true diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/Microsoft.DotNet.Common.ProjectTemplates.10.0.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/Microsoft.DotNet.Common.ProjectTemplates.10.0.csproj index c30423f5ed44..d5ef967f29ce 100644 --- a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/Microsoft.DotNet.Common.ProjectTemplates.10.0.csproj +++ b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/Microsoft.DotNet.Common.ProjectTemplates.10.0.csproj @@ -4,7 +4,7 @@ False False False - $(ArtifactsTmpDir) + $(TestLayoutDir) False true true diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets index 1f51a7c4fd0a..7574c07a19fc 100644 --- a/test/Directory.Build.targets +++ b/test/Directory.Build.targets @@ -19,16 +19,16 @@ true - + - $(ArtifactsTmpDir)$(ToolCommandName)\ - $(ArtifactsTmpDir)$(ToolCommandName)\w - $(ArtifactsTmpDir)DOTNET_CLI_HOME\ + $(TestLayoutDir)$(ToolCommandName)\ + $(TestLayoutDir)$(ToolCommandName)\w + $(TestLayoutDir)DOTNET_CLI_HOME\ @@ -46,11 +46,11 @@ IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(TestLocalToolFolder)" EnvironmentVariables="DOTNET_CLI_HOME=$(DOTNET_CLI_HOME)"/> - + - + diff --git a/test/Microsoft.DotNet.PackageInstall.Tests/TestToolBuilder.cs b/test/Microsoft.DotNet.PackageInstall.Tests/TestToolBuilder.cs index 7e75248f8d34..1ec73acf8e1b 100644 --- a/test/Microsoft.DotNet.PackageInstall.Tests/TestToolBuilder.cs +++ b/test/Microsoft.DotNet.PackageInstall.Tests/TestToolBuilder.cs @@ -19,7 +19,7 @@ public class TestToolBuilderCollection : ICollectionFixture // global packages folder to ensure that the newly built package is used the next time a test tries to install it. // // The main thing this class can't handle is if the way the .NET SDK builds packages changes. In CI runs, we should use a clean test execution folder each time (I think!), so this shouldn't be an issue. - // For local testing, you may need to delete the artifacts\tmp\Debug\TestTools folder if the SDK changes in a way that affects the built package. + // For local testing, you may need to delete the artifacts\tmp\Debug\testing\TestTools folder if the SDK changes in a way that affects the built package. public class TestToolBuilder { public class TestToolSettings diff --git a/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/StaticWebAssets/DefineStaticWebAssetEndpointsTest.cs b/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/StaticWebAssets/DefineStaticWebAssetEndpointsTest.cs index c472511c58db..2ccc58bb77e4 100644 --- a/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/StaticWebAssets/DefineStaticWebAssetEndpointsTest.cs +++ b/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/StaticWebAssets/DefineStaticWebAssetEndpointsTest.cs @@ -438,7 +438,7 @@ public void ResolvesContentType_ForCompressedAssets() ["AssetRole"] = "Alternative", ["AssetTraitValue"] = "gzip", ["AssetTraitName"] = "Content-Encoding", - ["OriginalItemSpec"] = Path.Combine("D:", "work", "dotnet-sdk", "artifacts", "tmp", "Release", "Publish60Host---0200F604", "Client", "bin", "Debug", "net6.0", "wwwroot", "_framework", "dotnet.timezones.blat"), + ["OriginalItemSpec"] = Path.Combine("D:", "work", "dotnet-sdk", "artifacts", "tmp", "Release", "testing", "Publish60Host---0200F604", "Client", "bin", "Debug", "net6.0", "wwwroot", "_framework", "dotnet.timezones.blat"), ["CopyToPublishDirectory"] = "Never", ["FileLength"] = "10", ["LastWriteTime"] = lastWrite.ToString("ddd, dd MMM yyyy HH:mm:ss 'GMT'", CultureInfo.InvariantCulture) diff --git a/test/Microsoft.NET.TestFramework/BuildTestPackages.targets b/test/Microsoft.NET.TestFramework/BuildTestPackages.targets index 139312d8c2af..a78de75f9f5f 100644 --- a/test/Microsoft.NET.TestFramework/BuildTestPackages.targets +++ b/test/Microsoft.NET.TestFramework/BuildTestPackages.targets @@ -1,7 +1,7 @@ - $(ArtifactsTmpDir)testpackages/ + $(TestLayoutDir)testpackages/ - <_CopyDirectoryBuildTestDependenciesOutput Include="$(ArtifactsTmpDir)Directory.Build.props" /> - <_CopyDirectoryBuildTestDependenciesOutput Include="$(ArtifactsTmpDir)Directory.Build.targets" /> - <_CopyDirectoryBuildTestDependenciesOutput Include="$(ArtifactsTmpDir).editorconfig" /> + <_CopyDirectoryBuildTestDependenciesOutput Include="$(TestLayoutDir)Directory.Build.props" /> + <_CopyDirectoryBuildTestDependenciesOutput Include="$(TestLayoutDir)Directory.Build.targets" /> + <_CopyDirectoryBuildTestDependenciesOutput Include="$(TestLayoutDir).editorconfig" /> @@ -18,14 +18,14 @@ Condition="'$(TargetFramework)' == '$(SdkTargetFramework)'"> - - - + diff --git a/test/Microsoft.NET.TestFramework/TestContext.cs b/test/Microsoft.NET.TestFramework/TestContext.cs index 682412fc0b7a..f75e170b195a 100644 --- a/test/Microsoft.NET.TestFramework/TestContext.cs +++ b/test/Microsoft.NET.TestFramework/TestContext.cs @@ -206,7 +206,7 @@ public static void Initialize(TestCommandLine commandLine) string? FindFolder2 = FindFolderInTree(Path.Combine("test", "TestAssets"), AppContext.BaseDirectory); if (FindFolder1 is not null) { - testContext.TestExecutionDirectory = Path.Combine(FindFolder1, "tmp", repoConfiguration); + testContext.TestExecutionDirectory = Path.Combine(FindFolder1, "tmp", repoConfiguration, "testing"); } if (FindFolder2 is not null) { @@ -237,7 +237,7 @@ public static void Initialize(TestCommandLine commandLine) testContext.NuGetExePath = Path.Combine(artifactsDir, ".nuget", $"nuget{Constants.ExeSuffix}"); testContext.NuGetCachePath = Path.Combine(artifactsDir, ".nuget", "packages"); - testContext.TestPackages = Path.Combine(artifactsDir, "tmp", repoConfiguration, "testpackages"); + testContext.TestPackages = Path.Combine(artifactsDir, "tmp", repoConfiguration, "testing", "testpackages"); } else if (runAsTool) { diff --git a/test/Microsoft.NET.TestFramework/ToolsetInfo.cs b/test/Microsoft.NET.TestFramework/ToolsetInfo.cs index f1ef4c287e1d..51e86418651c 100644 --- a/test/Microsoft.NET.TestFramework/ToolsetInfo.cs +++ b/test/Microsoft.NET.TestFramework/ToolsetInfo.cs @@ -346,7 +346,7 @@ public static ToolsetInfo Create(string? repoRoot, string? repoArtifactsDir, str if (repoRoot != null && repoArtifactsDir is not null) { - ret.CliHomePath = Path.Combine(repoArtifactsDir, "tmp", configuration); + ret.CliHomePath = Path.Combine(repoArtifactsDir, "tmp", configuration, "testing"); } return ret; diff --git a/test/UnitTests.proj b/test/UnitTests.proj index b556ec99902c..29d7b8771031 100644 --- a/test/UnitTests.proj +++ b/test/UnitTests.proj @@ -82,21 +82,21 @@ - + - + - + - - - + + + eng/ @@ -105,7 +105,7 @@ eng/ - + diff --git a/test/dotnet-new.IntegrationTests/BaseIntegrationTest.cs b/test/dotnet-new.IntegrationTests/BaseIntegrationTest.cs index d92d182fcea9..4897f4778983 100644 --- a/test/dotnet-new.IntegrationTests/BaseIntegrationTest.cs +++ b/test/dotnet-new.IntegrationTests/BaseIntegrationTest.cs @@ -68,7 +68,7 @@ public static string GetTestTemplateLocation(string templateName) /// /// Creates a temp test directory under test execution folder. - /// Format: artifacts\tmp\Debug\dotnet-new.IntegrationTests\\\date-time-utc-now[optional counter]. + /// Format: artifacts\tmp\Debug\testing\dotnet-new.IntegrationTests\\\date-time-utc-now[optional counter]. /// /// /// Use this method when temp folder should be under location that is aware of repo nuget.config. diff --git a/test/dotnet-new.IntegrationTests/Utilities.cs b/test/dotnet-new.IntegrationTests/Utilities.cs index a02ee235aaa0..cc8497a61f2d 100644 --- a/test/dotnet-new.IntegrationTests/Utilities.cs +++ b/test/dotnet-new.IntegrationTests/Utilities.cs @@ -20,7 +20,7 @@ internal static string GetTestExecutionTempFolder() /// /// Creates a temp folder in location dedicated for dotnet-new.IntegrationTests. - /// Format: artifacts\tmp\Debug\dotnet-new.IntegrationTests\\\date-time-utc-now[optional counter]. + /// Format: artifacts\tmp\Debug\testing\dotnet-new.IntegrationTests\\\date-time-utc-now[optional counter]. /// internal static string CreateTemporaryFolder([CallerMemberName] string caller = "Unnamed", string customName = "") { diff --git a/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj b/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj index 5be8b5f291c0..a5a852ebf2e3 100644 --- a/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj +++ b/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj @@ -68,9 +68,9 @@ namespace Microsoft.DotNet.Cli.New.IntegrationTests - - - + + +