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

File tree

15 files changed

+53
-46
lines changed

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>

0 commit comments

Comments
 (0)