-
Notifications
You must be signed in to change notification settings - Fork 10.3k
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.
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
Use the host version that corresponds with the LKG SDK #60888
Conversation
Don't use the live host but the one that is also redistributed in the .NET SDK. Unblocks dotnet/sdk#47480
@@ -9,20 +9,20 @@ | |||
<HostArch Condition="'$(Platform)' == 'Win32'">x86</HostArch> | |||
<HostArch Condition="'$(Platform)' == 'AnyCPU'">x64</HostArch> | |||
<HostArch Condition="'$(DotNetBuild)' == 'true'">$(TargetArchitecture)</HostArch> | |||
<LibNetHostPath>$(NuGetPackageRoot)microsoft.netcore.app.host.win-$(HostArch)\$(MicrosoftNETCoreAppRefVersion)\runtimes\win-$(HostArch)\native</LibNetHostPath> | |||
<LibNetHostPath>$(NuGetPackageRoot)microsoft.netcore.app.host.win-$(HostArch)\$(LibNetHostAppPackVersion)\runtimes\win-$(HostArch)\native</LibNetHostPath> | |||
<!-- This tools version MUST match the same version as runtime uses to compile libnethost.lib --> | |||
<PlatformToolsetVersion>143</PlatformToolsetVersion> | |||
</PropertyGroup> | |||
|
|||
<!-- Platform is different during restore than during build. Therefore, restore everything when not building the product. --> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe we can flow this in via GenerateFiles.csproj too?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You mean the platform that should be used at restore time?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes or restoring the packages in general there
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the problem that required this is that the platform negotiation happens at P2P build time. NuGet doesn't see the agreed upon Platform as it trims out P2P properties. The outer context, i.e. GenerateFiles.csproj or Tools.props wouldn't have more information than the infrastructure in this file.
Don't use the live host but the one that is also redistributed in the .NET SDK. This is a small partial revert of bac31da#diff-8df3cd354bc584349d04ad5675b33c042d8b99b741b8b95af394c55e0f5001bf
Unblocks dotnet/sdk#47480