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 40
40
<PackageReference Include =" Internal.AspNetCore.BuildTasks" PrivateAssets =" All" Version =" $(InternalAspNetCoreBuildTasksPackageVersion)" IsImplicitlyDefined =" true" />
41
41
</ItemGroup >
42
42
43
+ <PropertyGroup >
44
+ <KnownAppHostPackOrFrameworkReferenceTfm >$(DefaultNetCoreTargetFramework)</KnownAppHostPackOrFrameworkReferenceTfm >
45
+ <KnownAppHostPackOrFrameworkReferenceTfm Condition =" '$(KnownAppHostPackOrFrameworkReferenceTfm)' == 'net5.0'" >netcoreapp5.0</KnownAppHostPackOrFrameworkReferenceTfm >
46
+ </PropertyGroup >
47
+
43
48
<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 -->
45
50
<KnownAppHostPack
46
- Include =" @(KnownAppHostPack->WithMetadataValue('TargetFramework', 'netcoreapp3.0 '))"
51
+ Include =" @(KnownAppHostPack->WithMetadataValue('TargetFramework', 'netcoreapp3.1 '))"
47
52
TargetFramework =" $(DefaultNetCoreTargetFramework)"
48
- Condition =" @(KnownAppHostPack->Count()) != '0' AND !(@(KnownAppHostPack->AnyHaveMetadataValue('TargetFramework', '$(DefaultNetCoreTargetFramework )')))"
53
+ Condition =" @(KnownAppHostPack->Count()) != '0' AND !(@(KnownAppHostPack->AnyHaveMetadataValue('TargetFramework', '$(KnownAppHostPackOrFrameworkReferenceTfm )')))"
49
54
/>
50
55
<KnownFrameworkReference
51
- Include =" @(KnownFrameworkReference->WithMetadataValue('TargetFramework', 'netcoreapp3.0 '))"
56
+ Include =" @(KnownFrameworkReference->WithMetadataValue('TargetFramework', 'netcoreapp3.1 '))"
52
57
TargetFramework =" $(DefaultNetCoreTargetFramework)"
53
- Condition =" @(KnownFrameworkReference->Count()) != '0' AND !(@(KnownFrameworkReference->AnyHaveMetadataValue('TargetFramework', '$(DefaultNetCoreTargetFramework )')))"
58
+ Condition =" @(KnownFrameworkReference->Count()) != '0' AND !(@(KnownFrameworkReference->AnyHaveMetadataValue('TargetFramework', '$(KnownAppHostPackOrFrameworkReferenceTfm )')))"
54
59
/>
55
60
</ItemGroup >
56
61
Original file line number Diff line number Diff line change 3
3
"version" : " 5.0.100-preview.2.20120.3"
4
4
},
5
5
"tools" : {
6
- "dotnet" : " 5.0.100-preview.2.20120.3 " ,
6
+ "dotnet" : " 5.0.100-preview.2.20163.4 " ,
7
7
"runtimes" : {
8
8
"dotnet/x64" : [
9
9
" $(MicrosoftNETCoreAppInternalPackageVersion)"
Original file line number Diff line number Diff line change 2
2
<Import Project =" $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
3
3
4
4
<PropertyGroup >
5
+ <!-- TODO: Remove this when alls parts of aspnetcore switched to the net5.0 TFM. -->
6
+ <DefaultNetCoreTargetFramework >net5.0</DefaultNetCoreTargetFramework >
7
+
5
8
<!-- The .csproj files in this folder do not actually produce .dll's. They are only present to produce .nupkgs and enable Visual Studio support -->
6
9
<IsProjectReferenceProvider >false</IsProjectReferenceProvider >
7
10
<HasReferenceAssembly >false</HasReferenceAssembly >
Original file line number Diff line number Diff line change 1
1
@ ECHO OFF
2
2
SET 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