Skip to content

Build NuGet.Client even if response file is detected #3623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zivkan merged 6 commits into from
Apr 1, 2021
Merged

Build NuGet.Client even if response file is detected #3623

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8461ceb
Always checkout bash files with LF line endings
Nirmal4G Oct 4, 2020
9b767dd
Add error checking to bash scripts
Nirmal4G Oct 4, 2020
f1ebd75
Fix .NET install when an RSP file is encountered
Nirmal4G Oct 4, 2020
c4ec0b5
Match the logic from functional tests script
Nirmal4G Oct 4, 2020
1b7e0cc
Use global and local dotnet CLI properly
Nirmal4G Mar 24, 2021
2070d4e
Fix macOS build failure
Nirmal4G Mar 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use global and local dotnet CLI properly 
Since the test frameworks use copied and patched cli, mismatch can cause tests fail.

One of the failures caused when sometimes "NuGetFallbackFolder" becomes the first directory
to resolve "dotnet.dll" against. It is now fixed by excluding the fallback folder in the resolving logic.
  • Loading branch information
@Nirmal4G
Nirmal4G committed Mar 28, 2021
commit 1b7e0ccf5f83474cbc3c7fa8d1b420749b9820bf
3 changes: 3 additions & 0 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ if (( $? )); then
exit 1
fi

# Disable .NET CLI Install Lookup
DOTNET_MULTILEVEL_LOOKUP=0

DOTNET="$(pwd)/cli/dotnet"

# Let the dotnet cli expand and decompress first if it's a first-run
Expand Down
3 changes: 3 additions & 0 deletions scripts/funcTests/runFuncTests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ if (( $? )); then
exit 1
fi

# Disable .NET CLI Install Lookup
DOTNET_MULTILEVEL_LOOKUP=0

DOTNET="$(pwd)/cli/dotnet"

# Let the dotnet cli expand and decompress first if it's a first-run
Expand Down
5 changes: 4 additions & 1 deletion test/NuGet.Core.FuncTests/Dotnet.Integration.Test/MsbuildIntegrationTestFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ public MsbuildIntegrationTestFixture()
var dotnetExecutableName = RuntimeEnvironmentHelper.IsWindows ? "dotnet.exe" : "dotnet";
TestDotnetCli = Path.Combine(_cliDirectory, dotnetExecutableName);

var sdkPath = Directory.EnumerateDirectories(Path.Combine(_cliDirectory, "sdk")).Single();
var sdkPath = Directory.EnumerateDirectories(Path.Combine(_cliDirectory, "sdk"))
.Where(d => !string.Equals(Path.GetFileName(d), "NuGetFallbackFolder", StringComparison.OrdinalIgnoreCase))
.Single();

MsBuildSdksPath = Path.Combine(sdkPath, "Sdks");

Expand Down Expand Up @@ -442,6 +444,7 @@ private void UpdateCliWithLatestNuGetAssemblies(string cliDirectory)
var artifactsDirectory = DotnetCliUtil.GetArtifactsDirectoryInRepo();
var pathToSdkInCli = Path.Combine(
Directory.EnumerateDirectories(Path.Combine(cliDirectory, "sdk"))
.Where(d => !string.Equals(Path.GetFileName(d), "NuGetFallbackFolder", StringComparison.OrdinalIgnoreCase))
.First());
const string configuration =
#if DEBUG
Expand Down