Skip to content

Commit 2b30484

Browse files
committed
Use <Reference />
1 parent 4acee8d commit 2b30484

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

eng/ProjectReferences.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
-->
66
<Project>
77
<ItemGroup>
8+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Assets.Pack" ProjectPath="$(RepoRoot)src\Assets\Pack\Microsoft.AspNetCore.Assets.Pack.csproj" />
89
<ProjectReferenceProvider Include="Microsoft.Extensions.Caching.SqlServer" ProjectPath="$(RepoRoot)src\Caching\SqlServer\src\Microsoft.Extensions.Caching.SqlServer.csproj" />
910
<ProjectReferenceProvider Include="Microsoft.Extensions.Caching.StackExchangeRedis" ProjectPath="$(RepoRoot)src\Caching\StackExchangeRedis\src\Microsoft.Extensions.Caching.StackExchangeRedis.csproj" />
1011
<ProjectReferenceProvider Include="Microsoft.AspNetCore" ProjectPath="$(RepoRoot)src\DefaultBuilder\src\Microsoft.AspNetCore.csproj" />

eng/ShippingAssemblies.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@
105105
<AspNetCoreShippingAssembly Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" />
106106
<AspNetCoreShippingAssembly Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
107107
<AspNetCoreShippingAssembly Include="Microsoft.Extensions.Features" />
108+
<AspNetCoreShippingAssembly Include="Microsoft.AspNetCore.Assets.Pack" />
108109
<AspNetCoreShippingAssembly Include="Microsoft.Extensions.Caching.SqlServer" />
109110
<AspNetCoreShippingAssembly Include="Microsoft.Extensions.Caching.StackExchangeRedis" />
110111
<AspNetCoreShippingAssembly Include="Microsoft.AspNetCore.JsonPatch" />

src/Assets/Pack/Microsoft.AspNetCore.Assets.Pack.proj renamed to src/Assets/Pack/Microsoft.AspNetCore.Assets.Pack.csproj

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.Web" DefaultTargets="Pack">
22

33
<PropertyGroup>
44
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
@@ -99,6 +99,7 @@
9999
Condition="'@(_AssetCandidates->Count())' != '0'"
100100
CandidateAssets="@(_AssetCandidates)"
101101
ContentRoot="_framework"
102+
AssetKind="All"
102103
SourceId="$(PackageId)"
103104
SourceType="Discovered"
104105
FingerprintCandidates="true"
@@ -131,6 +132,10 @@
131132
StaticWebAssetEndpoints="@(_PackFrameworkAssetEndpoints)"
132133
TargetPropsFilePath="$(IntermediateOutputPath)StaticWebAssets.endpoints.targets" />
133134

135+
<ComputeStaticWebAssetsTargetPaths Assets="@(_FrameworkAssets)" PathPrefix="staticwebassets" AdjustPathsForPack="true">
136+
<Output TaskParameter="AssetsWithTargetPath" ItemName="_PackStaticWebAssetWithTargetPath" />
137+
</ComputeStaticWebAssetsTargetPaths>
138+
134139
<ItemGroup>
135140
<StaticWebAssetPackageFile Include="$(IntermediateOutputPath)StaticWebAssets.targets">
136141
<PackagePath>build\Microsoft.AspNetCore.StaticWebAssets.targets</PackagePath>
@@ -142,7 +147,4 @@
142147

143148
</Target>
144149

145-
<Target Name="CreateManifestResourceNames" />
146-
<Target Name="CoreCompile" />
147-
148150
</Project>

src/Components/test/testassets/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<ItemGroup>
1717
<!-- Temporary: Remove after package is provided by the SDK -->
18-
<ProjectReference Include="$(RepoRoot)src\Assets\Pack\Microsoft.AspNetCore.Assets.Pack.proj" ReferenceOutputAssembly="false" />
18+
<Reference Include="Microsoft.AspNetCore.Assets.Pack" ReferenceOutputAssembly="false" />
1919
</ItemGroup>
2020

2121
<ItemGroup>

0 commit comments

Comments
 (0)