Skip to content

Update to 5.0 SDK #17945

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
wtgodbe merged 3 commits into from
Sep 25, 2019
Merged

Update to 5.0 SDK #17945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
19ab68b
Update to 5.0 SDK
wtgodbe Sep 19, 2019
cac7707
Add vNext SDK Workaround, remove ref to AspNetCore.App
wtgodbe Sep 20, 2019
8a600a8
NoWarn NU5048
wtgodbe Sep 24, 2019
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
2 changes: 2 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

<!-- Working around https://github.com/NuGet/Home/issues/8467 -->
<NoWarn>$(NoWarn);NU5131</NoWarn>
<!-- TODO - remove this line once we use embedded package icons -->
<NoWarn>$(NoWarn);NU5048</NoWarn>
</PropertyGroup>

<PropertyGroup>
Expand Down
23 changes: 16 additions & 7 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,32 @@
</PropertyGroup>

<ItemGroup>
<!-- Workaround while there is no 5.0 SDK available, copy known apphost/framework reference info from 3.0. -->
<KnownAppHostPack Include="@(KnownAppHostPack->WithMetadataValue('TargetFramework', 'netcoreapp3.0'))"
TargetFramework="netcoreapp5.0" />
<KnownFrameworkReference Include="@(KnownFrameworkReference->WithMetadataValue('TargetFramework', 'netcoreapp3.0'))"
TargetFramework="netcoreapp5.0" />

@dougbu dougbu Sep 19, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't remove this logic; it'll help to have around the next time we deal w/ a new TFM before an SDK is ready. Instead, make this conditional on lack of '%(TargetFramework) == $(DefaultNetCoreTargetFramework)` items in each group.

<!-- Workaround when there is no vNext SDK available, copy known apphost/framework reference info from 3.0 -->
<KnownAppHostPack
Include="@(KnownAppHostPack->WithMetadataValue('TargetFramework', 'netcoreapp3.0'))"
TargetFramework="$(DefaultNetCoreTargetFramework)"
Condition="!(@(KnownAppHostPack->AnyHaveMetadataValue('TargetFramework', '$(DefaultNetCoreTargetFramework)')))"
/>
<KnownFrameworkReference
Include="@(KnownFrameworkReference->WithMetadataValue('TargetFramework', 'netcoreapp3.0'))"
TargetFramework="$(DefaultNetCoreTargetFramework)"
Condition="!(@(KnownFrameworkReference->AnyHaveMetadataValue('TargetFramework', '$(DefaultNetCoreTargetFramework)')))"
/>

<!-- Reference base shared framework at incoming dependency flow version, not bundled sdk version. -->
<FrameworkReference Update="Microsoft.NETCore.App"
<KnownFrameworkReference Update="Microsoft.NETCore.App"
Condition="'$(TargetFramework)' == 'netcoreapp5.0'"
RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimeVersion)"
TargetingPackVersion="$(MicrosoftNETCoreAppRefPackageVersion)" />

<!-- Reference netstandard library at incoming dependency flow version, not bundled sdk version. -->
<FrameworkReference Update="NETStandard.Library"
<KnownFrameworkReference Update="NETStandard.Library"
Condition="'$(TargetFramework)' == 'netstandard2.1'"
TargetingPackVersion="$(NETStandardLibraryRefPackageVersion)" />

<!-- Remove unneeded reference to AspNetCore.App -->
<KnownFrameworkReference Remove="Microsoft.AspNetCore.App" />

<!-- Workaround for netstandard2.1 projects until we can get a 5.0 SDK containing https://github.com/dotnet/sdk/pull/3463 fix. -->
<KnownFrameworkReference Update="NETStandard.Library">
<RuntimeFrameworkName>NETStandard.Library</RuntimeFrameworkName>
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "3.0.100-preview8-013656",
"dotnet": "5.0.100-alpha1-014696",
"runtimes": {
"dotnet": [
"2.0.9",
Expand All @@ -9,7 +9,7 @@
}
},
"sdk": {
"version": "3.0.100-preview8-013656"
"version": "5.0.100-alpha1-014696"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19461.7"
Expand Down
2 changes: 1 addition & 1 deletion src/dotnet-ef/dotnet-ef.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<packageType name="$packageType$" />
</packageTypes>
<dependencies>
<group targetFramework=".NETCoreApp3.1" />
<group targetFramework=".NETCoreApp5.0" />
Comment thread
JunTaoLuo marked this conversation as resolved.
</dependencies>
</metadata>

Expand Down