Skip to content

Update to 5.0 SDK #1276

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 7 commits into from
Sep 23, 2019
Merged

Update to 5.0 SDK #1276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9878050
Update to 5.0 SDK
wtgodbe Sep 19, 2019
98e53cc
Add logic back for Known-stuff, conditional
wtgodbe Sep 19, 2019
f72dc91
Merge branch 'master' into 50SDK
wtgodbe Sep 19, 2019
570e7de
Fix typo
wtgodbe Sep 19, 2019
fb6df8e
Merge branch '50SDK' of https://github.com/aspnet/entityframework6 in…
wtgodbe Sep 19, 2019
6f6df4b
Fix another typo
wtgodbe Sep 19, 2019
4d533fe
Update comment
wtgodbe Sep 20, 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
10 changes: 6 additions & 4 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,22 @@
</PropertyGroup>

<ItemGroup>
<!-- Workaround while there is no 5.0 SDK available, copy known apphost/framework reference info from 3.0 -->
<!-- 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="netcoreapp5.0"
TargetFramework="$(DefaultNetCoreTargetFramework)"
Condition="!(@(KnownAppHostPack->AnyHaveMetadataValue('TargetFramework', '$(DefaultNetCoreTargetFramework)')))"
/>
<KnownFrameworkReference
Include="@(KnownFrameworkReference->WithMetadataValue('TargetFramework', 'netcoreapp3.0'))"
TargetFramework="netcoreapp5.0"
TargetFramework="$(DefaultNetCoreTargetFramework)"
Condition="!(@(KnownFrameworkReference->AnyHaveMetadataValue('TargetFramework', '$(DefaultNetCoreTargetFramework)')))"
/>
</ItemGroup>
Copy link
Contributor

@dougbu dougbu Sep 19, 2019

Choose a reason for hiding this comment

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

Instead make this logic conditional on lack of %(TargetFramework) == $(DefaultNetCoreTargetFramework) items


<ItemGroup>
<!-- Reference base shared framework at incoming dependency flow version, not bundled sdk version. -->
<FrameworkReference
<KnownFrameworkReference
Update="Microsoft.NETCore.App"
Condition="'$(TargetFramework)' == 'netcoreapp5.0'"
RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimeVersion)"
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,14 +1,14 @@
{
"tools": {
"dotnet": "3.1.100-preview1-014024",
"dotnet": "5.0.100-alpha1-014696",
"runtimes": {
"dotnet": [
"$(MicrosoftNETCoreAppRuntimeVersion)"
]
}
},
"sdk": {
"version": "3.1.100-preview1-014024"
"version": "5.0.100-alpha1-014696"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19461.7"
Expand Down