|
1 |
| -<Project Sdk="Microsoft.NET.Sdk"> |
| 1 | +<Project> |
| 2 | + <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" /> |
2 | 3 |
|
3 | 4 | <PropertyGroup>
|
4 | 5 | <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
|
|
13 | 14 | <IsProjectReferenceProvider>false</IsProjectReferenceProvider>
|
14 | 15 |
|
15 | 16 | <!--
|
16 |
| - This project compiles against Microsoft.AspNetCore.App from the SDK. |
| 17 | + This project compiles against Microsoft.AspNetCore.App that's just been built, not the one in the SDK. |
17 | 18 | This ensures that it's packaging output is correct and does not include local artifacts.
|
18 | 19 | -->
|
19 | 20 | <UseAspNetCoreSharedRuntime>true</UseAspNetCoreSharedRuntime>
|
20 |
| - <DoNotApplyWorkaroundsToMicrosoftAspNetCoreApp>true</DoNotApplyWorkaroundsToMicrosoftAspNetCoreApp> |
21 | 21 | </PropertyGroup>
|
22 | 22 |
|
23 | 23 | <ItemGroup>
|
24 |
| - <FrameworkReference Include="Microsoft.AspNetCore.App" /> |
25 |
| - |
26 |
| - <ProjectReference |
27 |
| - Include="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj" |
28 |
| - PrivateAssets="All" |
29 |
| - ReferenceOutputAssembly="false" |
30 |
| - SkipGetTargetFrameworkProperties="true" /> |
| 24 | + <!-- Ensure "just been built" is correct. --> |
| 25 | + <ProjectReference Include="$(RepoRoot)src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Runtime.csproj" |
| 26 | + Condition=" ! $(IsTargetingPackBuilding) " |
| 27 | + PrivateAssets="All" |
| 28 | + ReferenceOutputAssembly="false" |
| 29 | + SkipGetTargetFrameworkProperties="true" /> |
| 30 | + <ProjectReference Include="$(RepoRoot)src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj" |
| 31 | + Condition=" $(IsTargetingPackBuilding) " |
| 32 | + PrivateAssets="All" |
| 33 | + ReferenceOutputAssembly="false" |
| 34 | + SkipGetTargetFrameworkProperties="true" /> |
31 | 35 |
|
32 | 36 | <Reference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" />
|
33 | 37 | <Compile Include="$(SharedSourceRoot)CommandLineUtils\**\*.cs" />
|
|
45 | 49 | <NuspecProperty Include="PackageThirdPartyNoticesFile=$(PackageThirdPartyNoticesFile)" />
|
46 | 50 | </ItemGroup>
|
47 | 51 |
|
| 52 | + <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" /> |
48 | 53 |
|
| 54 | + <ItemGroup> |
| 55 | + <!-- Safe to add @(FrameworkReference) item after normal removal is behind us. --> |
| 56 | + <FrameworkReference Include="Microsoft.AspNetCore.App" /> |
| 57 | + </ItemGroup> |
49 | 58 | </Project>
|
0 commit comments