don't unnecessarily require windows app ref package #11540
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
brettfo
force-pushed
the
dev/brettfo/nuget-without-windows-package
branch
from
4f53c1d to
d7adcb6
Compare
brettfo
commented
Feb 11, 2025
| @@ -2,7 +2,7 @@ | |||
| <!-- The following properties enable target framework and dependency discovery when OS-specific workloads are required --> | |||
| <PropertyGroup> | |||
| <DesignTimeBuild>true</DesignTimeBuild> | |||
| <EnableWindowsTargeting>true</EnableWindowsTargeting> | |||
| <EnableWindowsTargeting Condition="$(TargetFramework.Contains('-windows'))">true</EnableWindowsTargeting> | |||
There was a problem hiding this comment.
this is the core of the fix
brettfo
commented
Feb 11, 2025
| @@ -784,11 +784,11 @@ internal static async Task<ImmutableArray<string>> GetTargetFrameworkValuesFromP | |||
| var targetsHelperPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!, "TargetFrameworkReporter.targets"); | |||
| var (exitCode, stdOut, stdErr) = await ProcessEx.RunDotnetWithoutMSBuildEnvironmentVariablesAsync( | |||
| [ | |||
| "build", | |||
| "msbuild", | |||
There was a problem hiding this comment.
this does a much simpler msbuild evaluation
brettfo
commented
Feb 11, 2025
| if (framework.Framework == "_") | ||
| { | ||
| // error/default value | ||
| return null; |
There was a problem hiding this comment.
with the simpler msbuild eval, we need to explicitly handle an edge case
brettfo
force-pushed
the
dev/brettfo/nuget-without-windows-package
branch
from
d7adcb6 to
57fb8c0
Compare
sebasgomez238
approved these changes
Feb 11, 2025
sachin-sandhu
force-pushed
the
dev/brettfo/nuget-without-windows-package
branch
from
57fb8c0 to
57cde45
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A private package source might not contain the
Microsoft.Windows.App.Refpackage so only setEnbleWindowsTargetingwhen the TFM explicitly contains the string-windows.