Set correct SharedFrameworkName property value #764
Merged
Conversation
This file contains hidden or 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
dagood
approved these changes
May 6, 2020
| @@ -65,7 +65,7 @@ | |||
| </PropertyGroup> | |||
|
|
|||
| <PropertyGroup> | |||
| <SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName> | |||
| <SharedFrameworkName>Microsoft.WindowsDesktop.App</SharedFrameworkName> | |||
| <NETCoreAppFrameworkIdentifier>.NETCoreApp</NETCoreAppFrameworkIdentifier> | |||
| <NETCoreAppFrameworkMoniker>$(NETCoreAppFrameworkIdentifier),Version=v$(NETCoreAppFrameworkVersion)</NETCoreAppFrameworkMoniker> | |||
| <NETCoreAppFrameworkBrandName>.NET Core $(NETCoreAppFrameworkVersion)</NETCoreAppFrameworkBrandName> | |||
There was a problem hiding this comment.
Might be good to fix these too. I don't know off the top of my head all usages, but at least NETCoreAppFrameworkIdentifier is ending up in the framework list, e.g. microsoft.windowsdesktop.app.ref.5.0.0-preview.3.20214.2.nupkg\data\FrameworkList.xml first line:
<FileList Name="Windows Desktop 5.0" TargetFrameworkIdentifier=".NETCoreApp" TargetFrameworkVersion="5.0" FrameworkName="Microsoft.WindowsDesktop.App">There was a problem hiding this comment.
<FileList Name="Windows Desktop 5.0" TargetFrameworkIdentifier=".NETCoreApp" TargetFrameworkVersion="5.0" FrameworkName="Microsoft.WindowsDesktop.App">
Does this need to change? I see the same in ASP.NET:
<FileList Name="ASP.NET Core 3.0" TargetFrameworkIdentifier=".NETCoreApp" TargetFrameworkVersion="3.0" FrameworkName="Microsoft.AspNetCore.App">
In both cases FrameworkName is correct.
There was a problem hiding this comment.
Oh, right, duh, TFM doesn't change per sharedfx. I think maybe the specific prop NETCoreAppFrameworkBrandName could be removed (since this repo doesn't depend on the brand name of the base shared framework) but it does generally seem good as is.
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.
Fixes #541
This change corrects the setup registry key name, from
SOFTWARE\dotnet\Setup\InstalledVersions\x64\sharedfx\Microsoft.NETCore.App, toSOFTWARE\dotnet\Setup\InstalledVersions\x64\sharedfx\Microsoft.WindowsDesktop.App