Skip to content

Commit

Permalink
Revert "Avoid using unset NuGetPackageRoot"
Browse files Browse the repository at this point in the history
This reverts commit b0acfed.
  • Loading branch information
jjonescz committed Aug 22, 2024
1 parent b0acfed commit d265037
Showing 1 changed file with 1 addition and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,6 @@ Copyright (c) .NET Foundation. All rights reserved.
<PropertyGroup Condition="'$(BuildWithNetFrameworkHostedCompiler)' == 'true' and '$(OS)' == 'Windows_NT'">
<RoslynTargetsPath>$(NuGetPackageRoot)\microsoft.net.sdk.compilers.toolset\$(NETCoreSdkVersion)</RoslynTargetsPath>
<_NeedToDownloadMicrosoftNetSdkCompilersToolsetPackage>true</_NeedToDownloadMicrosoftNetSdkCompilersToolsetPackage>
<_SkipCheckMicrosoftNetSdkCompilersToolsetPackageExists Condition="'$(NuGetPackageRoot)' == ''">true</_SkipCheckMicrosoftNetSdkCompilersToolsetPackageExists>
</PropertyGroup>

<!-- NOTE: Keep in sync with https://github.com/dotnet/msbuild/blob/main/src/Tasks/Microsoft.Common.tasks -->
Expand All @@ -255,7 +254,7 @@ Copyright (c) .NET Foundation. All rights reserved.
</Target>

<Target Name="_CheckMicrosoftNetSdkCompilersToolsetPackageExists"
Condition="'$(_NeedToDownloadMicrosoftNetSdkCompilersToolsetPackage)' == 'true' and '$(DesignTimeBuild)' != 'true' and '$(_SkipCheckMicrosoftNetSdkCompilersToolsetPackageExists)' != 'true'"
Condition="'$(_NeedToDownloadMicrosoftNetSdkCompilersToolsetPackage)' == 'true' and '$(DesignTimeBuild)' != 'true'"
BeforeTargets="CoreCompile">
<!-- If users did not run restore or it failed to download the Microsoft.Net.Sdk.Compilers.Toolset package
(but they proceeded to build, e.g., in Visual Studio), display an error with suggestions how to fix the problem. -->
Expand Down

0 comments on commit d265037

Please sign in to comment.