Skip to content

Commit f45f4e3

Browse files
committed
Default templates to net5.0
1 parent 19379d2 commit f45f4e3

File tree

4 files changed

+15
-7
lines changed

4 files changed

+15
-7
lines changed

eng/Workarounds.targets

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,22 @@
4040
<PackageReference Include="Internal.AspNetCore.BuildTasks" PrivateAssets="All" Version="$(InternalAspNetCoreBuildTasksPackageVersion)" IsImplicitlyDefined="true" />
4141
</ItemGroup>
4242

43+
<PropertyGroup>
44+
<KnownAppHostPackOrFrameworkReferenceTfm>$(DefaultNetCoreTargetFramework)</KnownAppHostPackOrFrameworkReferenceTfm>
45+
<KnownAppHostPackOrFrameworkReferenceTfm Condition="'$(KnownAppHostPackOrFrameworkReferenceTfm)' == 'net5.0'">netcoreapp5.0</KnownAppHostPackOrFrameworkReferenceTfm>
46+
</PropertyGroup>
47+
4348
<ItemGroup>
44-
<!-- Workaround when there is no vNext SDK available, copy known apphost/framework reference info from 3.0 -->
49+
<!-- Workaround when there is no vNext SDK available, copy known apphost/framework reference info from 3.1 -->
4550
<KnownAppHostPack
46-
Include="@(KnownAppHostPack->WithMetadataValue('TargetFramework', 'netcoreapp3.0'))"
51+
Include="@(KnownAppHostPack->WithMetadataValue('TargetFramework', 'netcoreapp3.1'))"
4752
TargetFramework="$(DefaultNetCoreTargetFramework)"
48-
Condition="@(KnownAppHostPack->Count()) != '0' AND !(@(KnownAppHostPack->AnyHaveMetadataValue('TargetFramework', '$(DefaultNetCoreTargetFramework)')))"
53+
Condition="@(KnownAppHostPack->Count()) != '0' AND !(@(KnownAppHostPack->AnyHaveMetadataValue('TargetFramework', '$(KnownAppHostPackOrFrameworkReferenceTfm)')))"
4954
/>
5055
<KnownFrameworkReference
51-
Include="@(KnownFrameworkReference->WithMetadataValue('TargetFramework', 'netcoreapp3.0'))"
56+
Include="@(KnownFrameworkReference->WithMetadataValue('TargetFramework', 'netcoreapp3.1'))"
5257
TargetFramework="$(DefaultNetCoreTargetFramework)"
53-
Condition="@(KnownFrameworkReference->Count()) != '0' AND !(@(KnownFrameworkReference->AnyHaveMetadataValue('TargetFramework', '$(DefaultNetCoreTargetFramework)')))"
58+
Condition="@(KnownFrameworkReference->Count()) != '0' AND !(@(KnownFrameworkReference->AnyHaveMetadataValue('TargetFramework', '$(KnownAppHostPackOrFrameworkReferenceTfm)')))"
5459
/>
5560
</ItemGroup>
5661

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "5.0.100-preview.2.20120.3"
44
},
55
"tools": {
6-
"dotnet": "5.0.100-preview.2.20120.3",
6+
"dotnet": "5.0.100-preview.2.20163.4",
77
"runtimes": {
88
"dotnet/x64": [
99
"$(MicrosoftNETCoreAppInternalPackageVersion)"

src/ProjectTemplates/Directory.Build.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
33

44
<PropertyGroup>
5+
<!-- TODO: Remove this when alls parts of aspnetcore switched to the net5.0 TFM. -->
6+
<DefaultNetCoreTargetFramework>net5.0</DefaultNetCoreTargetFramework>
7+
58
<!-- The .csproj files in this folder do not actually produce .dll's. They are only present to produce .nupkgs and enable Visual Studio support -->
69
<IsProjectReferenceProvider>false</IsProjectReferenceProvider>
710
<HasReferenceAssembly>false</HasReferenceAssembly>

src/ProjectTemplates/build.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@ECHO OFF
22
SET RepoRoot=%~dp0..\..
3-
%RepoRoot%\build.cmd -projects %~dp0*\*.*proj "/p:EnforceE2ETestPrerequisites=true" %*
3+
%RepoRoot%\build.cmd -projects %~dp0*\*.*proj -ForceCoreMsbuild "/p:EnforceE2ETestPrerequisites=true" %*

0 commit comments

Comments
 (0)