Skip to content

Commit 30573c9

Browse files
committed
Adjust testing framework to account for new paths
1 parent 999fa1f commit 30573c9

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

test/Microsoft.NET.Sdk.StaticWebAssets.Tests/StaticWebAssets/DefineStaticWebAssetEndpointsTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ public void ResolvesContentType_ForCompressedAssets()
438438
["AssetRole"] = "Alternative",
439439
["AssetTraitValue"] = "gzip",
440440
["AssetTraitName"] = "Content-Encoding",
441-
["OriginalItemSpec"] = Path.Combine("D:", "work", "dotnet-sdk", "artifacts", "tmp", "Release", "Publish60Host---0200F604", "Client", "bin", "Debug", "net6.0", "wwwroot", "_framework", "dotnet.timezones.blat"),
441+
["OriginalItemSpec"] = Path.Combine("D:", "work", "dotnet-sdk", "artifacts", "tmp", "Release", "testing", "Publish60Host---0200F604", "Client", "bin", "Debug", "net6.0", "wwwroot", "_framework", "dotnet.timezones.blat"),
442442
["CopyToPublishDirectory"] = "Never",
443443
["FileLength"] = "10",
444444
["LastWriteTime"] = lastWrite.ToString("ddd, dd MMM yyyy HH:mm:ss 'GMT'", CultureInfo.InvariantCulture)

test/Microsoft.NET.TestFramework/TestContext.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ public static void Initialize(TestCommandLine commandLine)
206206
string? FindFolder2 = FindFolderInTree(Path.Combine("test", "TestAssets"), AppContext.BaseDirectory);
207207
if (FindFolder1 is not null)
208208
{
209-
testContext.TestExecutionDirectory = Path.Combine(FindFolder1, "tmp", repoConfiguration);
209+
testContext.TestExecutionDirectory = Path.Combine(FindFolder1, "tmp", repoConfiguration, "testing");
210210
}
211211
if (FindFolder2 is not null)
212212
{
@@ -237,7 +237,7 @@ public static void Initialize(TestCommandLine commandLine)
237237
testContext.NuGetExePath = Path.Combine(artifactsDir, ".nuget", $"nuget{Constants.ExeSuffix}");
238238
testContext.NuGetCachePath = Path.Combine(artifactsDir, ".nuget", "packages");
239239

240-
testContext.TestPackages = Path.Combine(artifactsDir, "tmp", repoConfiguration, "testpackages");
240+
testContext.TestPackages = Path.Combine(artifactsDir, "tmp", repoConfiguration, "testing", "testpackages");
241241
}
242242
else if (runAsTool)
243243
{

test/Microsoft.NET.TestFramework/ToolsetInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ public static ToolsetInfo Create(string? repoRoot, string? repoArtifactsDir, str
346346

347347
if (repoRoot != null && repoArtifactsDir is not null)
348348
{
349-
ret.CliHomePath = Path.Combine(repoArtifactsDir, "tmp", configuration);
349+
ret.CliHomePath = Path.Combine(repoArtifactsDir, "tmp", configuration, "testing");
350350
}
351351

352352
return ret;

0 commit comments

Comments
 (0)