Skip to content

Commit 562992c

Browse files
authored
Update stage 0 to fix cppcli tests (#42806)
1 parent 777deae commit 562992c

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

build/RunTestsOnHelix.cmd

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ set DOTNET_ROOT=%HELIX_CORRELATION_PAYLOAD%\d
99
set PATH=%DOTNET_ROOT%;%PATH%
1010
set DOTNET_MULTILEVEL_LOOKUP=0
1111
set TestFullMSBuild=%1
12+
set BuildWithNetFrameworkHostedCompiler=false
1213

1314
set TestExecutionDirectory=%CD%\testExecutionDirectory
1415
mkdir %TestExecutionDirectory%
@@ -48,4 +49,4 @@ dotnet nuget remove source dotnet-libraries-transport --configfile %TestExecutio
4849
dotnet nuget remove source dotnet-tools-transport --configfile %TestExecutionDirectory%\nuget.config
4950
dotnet nuget remove source dotnet-libraries --configfile %TestExecutionDirectory%\nuget.config
5051
dotnet nuget remove source dotnet-eng --configfile %TestExecutionDirectory%\nuget.config
51-
dotnet nuget list source --configfile %TestExecutionDirectory%\nuget.config
52+
dotnet nuget list source --configfile %TestExecutionDirectory%\nuget.config

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.100-preview.5.24307.3",
3+
"dotnet": "9.0.100-preview.7.24407.12",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"

test/Microsoft.NET.Restore.Tests/GivenThatWeWantToUseFrameworkRoslyn.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void It_downloads_Microsoft_Net_Compilers_Toolset_Framework_when_requeste
4444
.HaveStdOutContaining(Path.Combine(toolsetPackageDir, toolsetPackageVersion, "csc.exe") + " /noconfig");
4545
}
4646

47-
[FullMSBuildOnlyFact]
47+
[FullMSBuildOnlyFact(Skip = "Skip until we can figure out how to fix the test with the package off globally")]
4848
public void It_downloads_Microsoft_Net_Compilers_Toolset_Framework_when_MSBuild_is_torn()
4949
{
5050
const string testProjectName = "NetCoreApp";
@@ -66,7 +66,7 @@ public void It_downloads_Microsoft_Net_Compilers_Toolset_Framework_when_MSBuild_
6666

6767
testAsset.GetRestoreCommand(Log, relativePath: testProjectName)
6868
.WithEnvironmentVariable("NUGET_PACKAGES", "")
69-
.WithEnvironmentVariable("BuildWithNetFrameworkHostedCompiler", customPackagesDir)
69+
.WithEnvironmentVariable("BuildWithNetFrameworkHostedCompiler", "")
7070
.Execute().Should().Pass();
7171

7272
var toolsetPackageDir = Path.Combine(customPackagesDir, "microsoft.net.sdk.compilers.toolset");

0 commit comments

Comments
 (0)