Skip to content

Commit e25ee07

Browse files
author
John Luo
committed
Use produced AspNetCore.App shared framework when building interop website
1 parent d4f9d81 commit e25ee07

File tree

2 files changed

+26
-11
lines changed

2 files changed

+26
-11
lines changed

src/Grpc/test/testassets/InteropWebsite/Directory.Build.targets

+6-11
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,21 @@
11
<Project>
22
<!-- Skip the parent folder to prevent getting test package references. -->
3-
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.targets))\Directory.Build.targets" />
3+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\..\, Directory.Build.targets))\Directory.Build.targets" />
44

55
<PropertyGroup>
6+
<RestoreAdditionalProjectSources>$(RestoreAdditionalProjectSources);$(ArtifactsShippingPackagesDir)</RestoreAdditionalProjectSources>
67
<MicrosoftAspNetCoreAppRefPackageVersion Condition="'$(IsTargetingPackBuilding)' != 'false'">$(TargetingPackVersion)</MicrosoftAspNetCoreAppRefPackageVersion>
78
<MicrosoftAspNetCoreAppRefPackageVersion Condition="'$(IsTargetingPackBuilding)' == 'false'">$(AspNetCoreBaselineVersion)</MicrosoftAspNetCoreAppRefPackageVersion>
8-
9-
<Test_SharedFxVersion>$(SharedFxVersion)</Test_SharedFxVersion>
10-
<Test_MicrosoftAspNetCoreAppRefPackageVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</Test_MicrosoftAspNetCoreAppRefPackageVersion>
11-
<Test_SupportedRuntimeIdentifiers>$(SupportedRuntimeIdentifiers)</Test_SupportedRuntimeIdentifiers>
129
</PropertyGroup>
1310

1411
<!-- Use the shared framework that was produced -->
1512
<ItemGroup>
16-
<KnownFrameworkReference
17-
Update="Microsoft.NETCore.App"
18-
DefaultRuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimeVersion)"
19-
LatestRuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimeVersion)"
20-
TargetingPackVersion="$(MicrosoftNETCoreAppRefPackageVersion)" />
21-
2213
<KnownFrameworkReference
2314
Include="Microsoft.AspNetCore.App"
15+
TargetFramework="$(DefaultNetCoreTargetFramework)"
16+
RuntimeFrameworkName="Microsoft.AspNetCore.App"
17+
TargetingPackName="Microsoft.AspNetCore.App.Ref"
18+
RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**"
2419
DefaultRuntimeFrameworkVersion="$(SharedFxVersion)"
2520
LatestRuntimeFrameworkVersion="$(SharedFxVersion)"
2621
TargetingPackVersion="$(MicrosoftAspNetCoreAppRefPackageVersion)"

src/Grpc/test/testassets/InteropWebsite/InteropWebsite.csproj

+20
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,26 @@
88
<LangVersion>8.0</LangVersion>
99
</PropertyGroup>
1010

11+
<PropertyGroup>
12+
<RestoreAdditionalProjectSources>$(RestoreAdditionalProjectSources);$(ArtifactsShippingPackagesDir)</RestoreAdditionalProjectSources>
13+
<MicrosoftAspNetCoreAppRefPackageVersion Condition="'$(IsTargetingPackBuilding)' != 'false'">$(TargetingPackVersion)</MicrosoftAspNetCoreAppRefPackageVersion>
14+
<MicrosoftAspNetCoreAppRefPackageVersion Condition="'$(IsTargetingPackBuilding)' == 'false'">$(AspNetCoreBaselineVersion)</MicrosoftAspNetCoreAppRefPackageVersion>
15+
</PropertyGroup>
16+
17+
<!-- Use the shared framework that was produced -->
18+
<ItemGroup>
19+
<KnownFrameworkReference
20+
Include="Microsoft.AspNetCore.App"
21+
TargetFramework="$(DefaultNetCoreTargetFramework)"
22+
RuntimeFrameworkName="Microsoft.AspNetCore.App"
23+
TargetingPackName="Microsoft.AspNetCore.App.Ref"
24+
RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**"
25+
DefaultRuntimeFrameworkVersion="$(SharedFxVersion)"
26+
LatestRuntimeFrameworkVersion="$(SharedFxVersion)"
27+
TargetingPackVersion="$(MicrosoftAspNetCoreAppRefPackageVersion)"
28+
RuntimePackRuntimeIdentifiers="$(SupportedRuntimeIdentifiers)" />
29+
</ItemGroup>
30+
1131
<ItemGroup>
1232
<Protobuf Include="..\Proto\grpc\testing\test.proto" GrpcServices="Server" Link="Protos\test.proto" />
1333
<Protobuf Include="..\Proto\grpc\testing\empty.proto" GrpcServices="None" Link="Protos\empty.proto" />

0 commit comments

Comments
 (0)