Skip to content

Commit 99e90f5

Browse files
wtgodbewtgodbe
authored
Produce non-stable version of targeting pack (#22372)
* Produce non-stable version of targeting pack * Fix tag * Fix indentation * Fixup proj file * Move Internal proj to separate folder * Remove redundant proj * Start moving files * finish moving files * Set IsReferenceAssemblyProject=true in targeting pack proj
1 parent d23d695 commit 99e90f5

15 files changed

+53
-46
lines changed

‎eng/Build.props

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,9 @@
126126
the entire pattern will silently fail to evaluate correctly.
127127
-->
128128
<DotNetProjects Include="
129-
$(RepoRoot)src\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj;
130-
$(RepoRoot)src\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj;
129+
$(RepoRoot)src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj;
130+
$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj;
131+
$(RepoRoot)src\Framework\App.Ref.Internal\src\Microsoft.AspNetCore.App.Ref.Internal.csproj;
131132
$(RepoRoot)src\Framework\test\Microsoft.AspNetCore.App.UnitTests.csproj;
132133
$(RepoRoot)src\DefaultBuilder\**\*.*proj;
133134
$(RepoRoot)src\Features\JsonPatch\**\*.*proj;

‎src/Framework/App.Ref.Internal/src/Microsoft.AspNetCore.App.Ref.Internal.csproj

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
5+
<IsShippingPackage>false</IsShippingPackage>
6+
<IsPackable>true</IsPackable>
7+
<IsPackable Condition="'$(IsTargetingPackBuilding)' == 'false'">false</IsPackable>
8+
<PackageId>$(TargetingPackName).Internal</PackageId>
9+
<VersionPrefix>$(TargetingPackVersionPrefix)</VersionPrefix>
10+
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
11+
<GenerateDocumentationFile>false</GenerateDocumentationFile>
12+
<IncludeBuildOutput>false</IncludeBuildOutput>
13+
<IncludeSymbols>false</IncludeSymbols>
14+
<NoPackageAnalysis>true</NoPackageAnalysis>
15+
</PropertyGroup>
16+
17+
</Project>

‎src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj renamed to ‎src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
<IsShippingPackage>true</IsShippingPackage>
77
<IsPackable>true</IsPackable>
88
<IsPackable Condition="'$(IsTargetingPackBuilding)' == 'false'">false</IsPackable>
9+
<!-- This is typically based on whether the project sits in a folder named `ref`, which this one does not - but we want it to resolve references like a ref project -->
10+
<IsReferenceAssemblyProject>true</IsReferenceAssemblyProject>
911
<PackageId>$(TargetingPackName)</PackageId>
1012
<VersionPrefix>$(TargetingPackVersionPrefix)</VersionPrefix>
1113
<!-- This is a reference package and does not include any dependencies. -->
@@ -62,7 +64,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
6264
<!-- Note: do not add _TransitiveExternalAspNetCoreAppReference to this list. This is intentionally not listed as a direct package reference. -->
6365
<Reference Include="@(AspNetCoreAppReference);@(AspNetCoreAppReferenceAndPackage);@(ExternalAspNetCoreAppReference)" />
6466
<!-- Enforce build order. Targeting pack needs to bundle information about the runtime. -->
65-
<ProjectReference Include="..\src\Microsoft.AspNetCore.App.Runtime.csproj">
67+
<ProjectReference Include="..\..\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj">
6668
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
6769
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
6870
</ProjectReference>

‎src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj renamed to ‎src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj

File renamed without changes.

‎src/Framework/src/runtimeconfig.template.json renamed to ‎src/Framework/App.Runtime/src/runtimeconfig.template.json

File renamed without changes.

‎src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,33 +51,33 @@
5151
</ItemGroup>
5252

5353
<ItemGroup>
54-
<ProjectReference Include="..\ref\Microsoft.AspNetCore.App.Ref.csproj">
54+
<ProjectReference Include="..\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj">
5555
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
5656
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
5757
</ProjectReference>
58-
<ProjectReference Include="..\src\Microsoft.AspNetCore.App.Runtime.csproj">
58+
<ProjectReference Include="..\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj">
5959
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
6060
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
6161
</ProjectReference>
6262
</ItemGroup>
6363

6464
<Target Name="GenerateTestData" BeforeTargets="GetAssemblyAttributes" DependsOnTargets="InitializeSourceControlInformation">
6565
<!-- Use the ref pack logic to compute the list of expected targeting pack content -->
66-
<MSBuild Projects="$(RepoRoot)src\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj"
66+
<MSBuild Projects="$(RepoRoot)src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj"
6767
Targets="_ResolveTargetingPackContent"
6868
SkipNonexistentProjects="false">
6969
<Output TaskParameter="TargetOutputs" ItemName="_TargetingPackDependencies" />
7070
</MSBuild>
7171

7272
<!-- This target is defined in eng/targets/Packaging.targets and included in every C# and F# project. -->
73-
<MSBuild Projects="$(RepoRoot)src\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj"
73+
<MSBuild Projects="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj"
7474
Targets="_GetPackageVersionInfo"
7575
SkipNonexistentProjects="false">
7676
<Output TaskParameter="TargetOutputs" ItemName="_RuntimePackageVersionInfo" />
7777
</MSBuild>
7878

7979
<!-- Runtime and Ref packs may have separate versions. -->
80-
<MSBuild Projects="$(RepoRoot)src\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj"
80+
<MSBuild Projects="$(RepoRoot)src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj"
8181
Targets="_GetPackageVersionInfo"
8282
SkipNonexistentProjects="false">
8383
<Output TaskParameter="TargetOutputs" ItemName="_TargetingPackVersionInfo" />

‎src/Installers/Debian/Runtime/Debian.Runtime.debproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</PropertyGroup>
2323

2424
<ItemGroup>
25-
<ProjectReference Include="..\..\..\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj">
25+
<ProjectReference Include="..\..\..\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj">
2626
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
2727
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
2828
</ProjectReference>

‎src/Installers/Debian/TargetingPack/Debian.TargetingPack.debproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</PropertyGroup>
2727

2828
<ItemGroup>
29-
<ProjectReference Include="..\..\..\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj">
29+
<ProjectReference Include="..\..\..\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj">
3030
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
3131
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
3232
</ProjectReference>

‎src/Installers/Rpm/Rpm.Runtime.Common.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<ProjectReference Include="$(RepoRoot)src\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj">
21+
<ProjectReference Include="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj">
2222
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
2323
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
2424
</ProjectReference>

‎src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</PropertyGroup>
1616

1717
<ItemGroup>
18-
<ProjectReference Include="..\..\..\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj">
18+
<ProjectReference Include="..\..\..\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj">
1919
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
2020
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
2121
</ProjectReference>

‎src/ProjectTemplates/ProjectTemplates.sln

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjectTemplates.Tests", "t
1515
EndProject
1616
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetToolsInstaller", "testassets\DotNetToolsInstaller\DotNetToolsInstaller.csproj", "{4B971DBF-6B07-4DC5-914D-4D5681F220CC}"
1717
EndProject
18-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.App.Runtime", "..\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj", "{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}"
19-
EndProject
2018
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IntegrationTesting", "..\Hosting\Server.IntegrationTesting\src\Microsoft.AspNetCore.Server.IntegrationTesting.csproj", "{E6B319D0-6A92-47D8-BC46-904DA44664A5}"
2119
EndProject
2220
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.Abstractions", "..\Hosting\Abstractions\src\Microsoft.AspNetCore.Hosting.Abstractions.csproj", "{05291368-373F-48AA-84FC-5B1E4606641A}"
@@ -177,6 +175,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ApiAut
177175
EndProject
178176
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SpaServices.Extensions", "..\Middleware\SpaServices.Extensions\src\Microsoft.AspNetCore.SpaServices.Extensions.csproj", "{06D0D7B2-EDA3-45A2-A060-AB791ED1DB80}"
179177
EndProject
178+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.App.Runtime", "..\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj", "{E4AF72F9-9F63-4965-ADEE-A67147E5FC31}"
179+
EndProject
180180
Global
181181
GlobalSection(SolutionConfigurationPlatforms) = preSolution
182182
Debug|Any CPU = Debug|Any CPU
@@ -259,18 +259,6 @@ Global
259259
{4B971DBF-6B07-4DC5-914D-4D5681F220CC}.Release|x64.Build.0 = Release|Any CPU
260260
{4B971DBF-6B07-4DC5-914D-4D5681F220CC}.Release|x86.ActiveCfg = Release|Any CPU
261261
{4B971DBF-6B07-4DC5-914D-4D5681F220CC}.Release|x86.Build.0 = Release|Any CPU
262-
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
263-
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
264-
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Debug|x64.ActiveCfg = Debug|Any CPU
265-
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Debug|x64.Build.0 = Debug|Any CPU
266-
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Debug|x86.ActiveCfg = Debug|Any CPU
267-
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Debug|x86.Build.0 = Debug|Any CPU
268-
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
269-
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Release|Any CPU.Build.0 = Release|Any CPU
270-
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Release|x64.ActiveCfg = Release|Any CPU
271-
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Release|x64.Build.0 = Release|Any CPU
272-
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Release|x86.ActiveCfg = Release|Any CPU
273-
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Release|x86.Build.0 = Release|Any CPU
274262
{E6B319D0-6A92-47D8-BC46-904DA44664A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
275263
{E6B319D0-6A92-47D8-BC46-904DA44664A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
276264
{E6B319D0-6A92-47D8-BC46-904DA44664A5}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1207,18 +1195,6 @@ Global
12071195
{6012D544-32B4-4F5C-B335-A224AA4F661D}.Release|x64.Build.0 = Release|Any CPU
12081196
{6012D544-32B4-4F5C-B335-A224AA4F661D}.Release|x86.ActiveCfg = Release|Any CPU
12091197
{6012D544-32B4-4F5C-B335-A224AA4F661D}.Release|x86.Build.0 = Release|Any CPU
1210-
{706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1211-
{706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
1212-
{706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Debug|x64.ActiveCfg = Debug|Any CPU
1213-
{706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Debug|x64.Build.0 = Debug|Any CPU
1214-
{706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Debug|x86.ActiveCfg = Debug|Any CPU
1215-
{706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Debug|x86.Build.0 = Debug|Any CPU
1216-
{706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
1217-
{706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Release|Any CPU.Build.0 = Release|Any CPU
1218-
{706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Release|x64.ActiveCfg = Release|Any CPU
1219-
{706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Release|x64.Build.0 = Release|Any CPU
1220-
{706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Release|x86.ActiveCfg = Release|Any CPU
1221-
{706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Release|x86.Build.0 = Release|Any CPU
12221198
{06D0D7B2-EDA3-45A2-A060-AB791ED1DB80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
12231199
{06D0D7B2-EDA3-45A2-A060-AB791ED1DB80}.Debug|Any CPU.Build.0 = Debug|Any CPU
12241200
{06D0D7B2-EDA3-45A2-A060-AB791ED1DB80}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1231,13 +1207,24 @@ Global
12311207
{06D0D7B2-EDA3-45A2-A060-AB791ED1DB80}.Release|x64.Build.0 = Release|Any CPU
12321208
{06D0D7B2-EDA3-45A2-A060-AB791ED1DB80}.Release|x86.ActiveCfg = Release|Any CPU
12331209
{06D0D7B2-EDA3-45A2-A060-AB791ED1DB80}.Release|x86.Build.0 = Release|Any CPU
1210+
{E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1211+
{E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Debug|Any CPU.Build.0 = Debug|Any CPU
1212+
{E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Debug|x64.ActiveCfg = Debug|Any CPU
1213+
{E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Debug|x64.Build.0 = Debug|Any CPU
1214+
{E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Debug|x86.ActiveCfg = Debug|Any CPU
1215+
{E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Debug|x86.Build.0 = Debug|Any CPU
1216+
{E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Release|Any CPU.ActiveCfg = Release|Any CPU
1217+
{E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Release|Any CPU.Build.0 = Release|Any CPU
1218+
{E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Release|x64.ActiveCfg = Release|Any CPU
1219+
{E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Release|x64.Build.0 = Release|Any CPU
1220+
{E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Release|x86.ActiveCfg = Release|Any CPU
1221+
{E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Release|x86.Build.0 = Release|Any CPU
12341222
EndGlobalSection
12351223
GlobalSection(SolutionProperties) = preSolution
12361224
HideSolutionNode = FALSE
12371225
EndGlobalSection
12381226
GlobalSection(NestedProjects) = preSolution
12391227
{4B971DBF-6B07-4DC5-914D-4D5681F220CC} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
1240-
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
12411228
{E6B319D0-6A92-47D8-BC46-904DA44664A5} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
12421229
{05291368-373F-48AA-84FC-5B1E4606641A} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
12431230
{4BA90E96-EFFC-40CD-B101-054F492F77BE} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
@@ -1316,8 +1303,8 @@ Global
13161303
{EEB670DC-9FE2-45A2-B7E9-9BCF7D1056E4} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
13171304
{81B96508-D920-45F6-9534-0D348B11DFAB} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
13181305
{6012D544-32B4-4F5C-B335-A224AA4F661D} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
1319-
{706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
13201306
{06D0D7B2-EDA3-45A2-A060-AB791ED1DB80} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
1307+
{E4AF72F9-9F63-4965-ADEE-A67147E5FC31} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
13211308
EndGlobalSection
13221309
GlobalSection(ExtensibilityGlobals) = postSolution
13231310
SolutionGuid = {D2F122BA-928C-4179-B503-6744DB64BA13}

‎src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Condition="$(DesignTimeBuild) != true">
66
<!-- The version of the shared framework. This is used in tests to ensure they run against the shared framework version we just built. -->
77
<!-- If we aren't building the targeting pack, use the baseline version -->
8-
<MSBuild Projects="$(RepoRoot)src\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj"
8+
<MSBuild Projects="$(RepoRoot)src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj"
99
Targets="_GetPackageVersionInfo"
1010
SkipNonexistentProjects="false"
1111
Condition="'$(IsTargetingPackBuilding)' != 'false'">
@@ -19,7 +19,7 @@
1919
</PropertyGroup>
2020

2121
<!-- Runtime and Ref packs may have separate versions. -->
22-
<MSBuild Projects="$(RepoRoot)src\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj"
22+
<MSBuild Projects="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj"
2323
Targets="_GetPackageVersionInfo"
2424
SkipNonexistentProjects="false">
2525
<Output TaskParameter="TargetOutputs" ItemName="_RuntimePackageVersionInfo" />

‎src/ProjectTemplates/test/ProjectTemplates.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</ItemGroup>
3838

3939
<ItemGroup>
40-
<ProjectReference Include="$(RepoRoot)src\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj">
40+
<ProjectReference Include="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj">
4141
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
4242
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
4343
</ProjectReference>

‎src/SiteExtensions/LoggingBranch/LB.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
<ItemGroup>
2222
<HostingStartupRuntimeStoreTargets Include="$(DefaultNetCoreTargetFramework)" Runtime="$(TargetRuntimeIdentifier)" />
2323

24-
<ProjectReference Include="..\..\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj">
24+
<ProjectReference Include="..\..\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj">
2525
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
2626
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
2727
</ProjectReference>
28-
<ProjectReference Include="..\..\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj">
28+
<ProjectReference Include="..\..\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj">
2929
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
3030
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
3131
</ProjectReference>

‎src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<ItemGroup>
2727
<ProjectReference Include="..\Microsoft.Web.Xdt.Extensions\src\Microsoft.Web.Xdt.Extensions.csproj" PrivateAssets="All" ReferenceOutputAssembly="False"/>
2828
<!-- Make sure redist folder is built and ready -->
29-
<ProjectReference Include="..\..\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj">
29+
<ProjectReference Include="..\..\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj">
3030
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
3131
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
3232
</ProjectReference>

0 commit comments

Comments
 (0)