File tree Expand file tree Collapse file tree 4 files changed +15
-7
lines changed Expand file tree Collapse file tree 4 files changed +15
-7
lines changed Original file line number Diff line number Diff line change 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
Original file line number Diff line number Diff line change 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)"
Original file line number Diff line number Diff line change 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 >
Original file line number Diff line number Diff line change 11@ ECHO OFF
22SET RepoRoot = %~dp0 ..\..
3- %RepoRoot% \build.cmd -projects %~dp0 *\*.*proj " /p:EnforceE2ETestPrerequisites=true" %*
3+ %RepoRoot% \build.cmd -projects %~dp0 *\*.*proj -ForceCoreMsbuild " /p:EnforceE2ETestPrerequisites=true" %*
You can’t perform that action at this time.
0 commit comments