Skip to content

Commit 3a1cd95

Browse files
authored
Fix images used for helix tests in CI (#44850)
2 parents d155b8f + 3c6c645 commit 3a1cd95

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

.vsts-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ extends:
9797
parameters:
9898
pool:
9999
name: $(DncEngInternalBuildPool)
100-
image: 1es-windows-2022
100+
image: windows.vs2022.amd64
101101
os: windows
102102
helixTargetQueue: windows.amd64.vs2022.pre
103103
oneESCompat:

test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs

+4
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,7 @@ public void ItWarnsWhenBuildingAProjectWithUseUwpProperty()
463463
TargetFrameworks = "net9.0-windows10.0.22621.0"
464464
};
465465
testProject.AdditionalProperties["UseUwp"] = "true";
466+
testProject.AdditionalProperties["UseUwpTools"] = "false";
466467

467468
var testAsset = _testAssetsManager.CreateTestProject(testProject);
468469

@@ -484,6 +485,7 @@ public void ItErrorsWhenTargetingBelowNet6WithUseUwpProperty()
484485
TargetFrameworks = "netstandard2.0"
485486
};
486487
testProject.AdditionalProperties["UseUwp"] = "true";
488+
testProject.AdditionalProperties["UseUwpTools"] = "false";
487489

488490
var testAsset = _testAssetsManager.CreateTestProject(testProject);
489491

@@ -505,6 +507,7 @@ public void ItErrorsWhenTransitivelyReferencingWindowsUIXamlReferencesWithoutUse
505507
TargetFrameworks = "net9.0-windows10.0.22621.0"
506508
};
507509
testProjectA.AdditionalProperties["UseUwp"] = "true";
510+
testProjectA.AdditionalProperties["UseUwpTools"] = "false";
508511

509512
TestProject testProjectB = new()
510513
{
@@ -579,6 +582,7 @@ public void ItBuildsWhenReferencingWindowsUIXamlTypesWithUseUwpProperty()
579582
}
580583
};
581584
testProject.AdditionalProperties["UseUwp"] = "true";
585+
testProject.AdditionalProperties["UseUwpTools"] = "false";
582586

583587
// Temporary until new projections flow to tests
584588
testProject.AdditionalProperties["WindowsSdkPackageVersion"] = "10.0.22621.39";

test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorLegacyIntegrationTest60.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public void Publish60Hosted_Works()
5454
ProjectDirectory = CreateAspNetSdkTestAsset(testAsset);
5555

5656
var publish = CreatePublishCommand(ProjectDirectory, "Server");
57-
ExecuteCommand(publish)
57+
ExecuteCommand(publish, "/p:BuildWithNetFrameworkHostedCompiler=true")
5858
.Should()
5959
.Pass()
6060
.And.NotHaveStdOutContaining("warning IL");

test/Microsoft.NET.Sdk.Razor.Tests/BuildWithComponentsIntegrationTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ private void Build_ComponentsWorks([CallerMemberName] string callerName = "")
4040
var projectDirectory = CreateAspNetSdkTestAsset(testAsset, callerName);
4141

4242
var build = new BuildCommand(projectDirectory);
43-
build.Execute().Should().Pass();
43+
build.Execute("/p:BuildWithNetFrameworkHostedCompiler=true").Should().Pass();
4444

4545
string outputPath = build.GetOutputDirectory(DefaultTfm).ToString();
4646

0 commit comments

Comments
 (0)