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
This commit is contained in:
William Godbe 2020-06-09 16:40:00 -07:00 committed by GitHub
parent d23d69570d
commit 99e90f5782
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 53 additions and 46 deletions

View File

@ -126,8 +126,9 @@
the entire pattern will silently fail to evaluate correctly.
-->
<DotNetProjects Include="
$(RepoRoot)src\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj;
$(RepoRoot)src\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj;
$(RepoRoot)src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj;
$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj;
$(RepoRoot)src\Framework\App.Ref.Internal\src\Microsoft.AspNetCore.App.Ref.Internal.csproj;
$(RepoRoot)src\Framework\test\Microsoft.AspNetCore.App.UnitTests.csproj;
$(RepoRoot)src\DefaultBuilder\**\*.*proj;
$(RepoRoot)src\Features\JsonPatch\**\*.*proj;

View File

@ -0,0 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<IsShippingPackage>false</IsShippingPackage>
<IsPackable>true</IsPackable>
<IsPackable Condition="'$(IsTargetingPackBuilding)' == 'false'">false</IsPackable>
<PackageId>$(TargetingPackName).Internal</PackageId>
<VersionPrefix>$(TargetingPackVersionPrefix)</VersionPrefix>
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
<IncludeBuildOutput>false</IncludeBuildOutput>
<IncludeSymbols>false</IncludeSymbols>
<NoPackageAnalysis>true</NoPackageAnalysis>
</PropertyGroup>
</Project>

View File

@ -6,6 +6,8 @@
<IsShippingPackage>true</IsShippingPackage>
<IsPackable>true</IsPackable>
<IsPackable Condition="'$(IsTargetingPackBuilding)' == 'false'">false</IsPackable>
<!-- 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 -->
<IsReferenceAssemblyProject>true</IsReferenceAssemblyProject>
<PackageId>$(TargetingPackName)</PackageId>
<VersionPrefix>$(TargetingPackVersionPrefix)</VersionPrefix>
<!-- 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
<!-- Note: do not add _TransitiveExternalAspNetCoreAppReference to this list. This is intentionally not listed as a direct package reference. -->
<Reference Include="@(AspNetCoreAppReference);@(AspNetCoreAppReferenceAndPackage);@(ExternalAspNetCoreAppReference)" />
<!-- Enforce build order. Targeting pack needs to bundle information about the runtime. -->
<ProjectReference Include="..\src\Microsoft.AspNetCore.App.Runtime.csproj">
<ProjectReference Include="..\..\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
</ProjectReference>

View File

@ -51,11 +51,11 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ref\Microsoft.AspNetCore.App.Ref.csproj">
<ProjectReference Include="..\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
</ProjectReference>
<ProjectReference Include="..\src\Microsoft.AspNetCore.App.Runtime.csproj">
<ProjectReference Include="..\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
</ProjectReference>
@ -63,21 +63,21 @@
<Target Name="GenerateTestData" BeforeTargets="GetAssemblyAttributes" DependsOnTargets="InitializeSourceControlInformation">
<!-- Use the ref pack logic to compute the list of expected targeting pack content -->
<MSBuild Projects="$(RepoRoot)src\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj"
<MSBuild Projects="$(RepoRoot)src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj"
Targets="_ResolveTargetingPackContent"
SkipNonexistentProjects="false">
<Output TaskParameter="TargetOutputs" ItemName="_TargetingPackDependencies" />
</MSBuild>
<!-- This target is defined in eng/targets/Packaging.targets and included in every C# and F# project. -->
<MSBuild Projects="$(RepoRoot)src\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj"
<MSBuild Projects="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj"
Targets="_GetPackageVersionInfo"
SkipNonexistentProjects="false">
<Output TaskParameter="TargetOutputs" ItemName="_RuntimePackageVersionInfo" />
</MSBuild>
<!-- Runtime and Ref packs may have separate versions. -->
<MSBuild Projects="$(RepoRoot)src\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj"
<MSBuild Projects="$(RepoRoot)src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj"
Targets="_GetPackageVersionInfo"
SkipNonexistentProjects="false">
<Output TaskParameter="TargetOutputs" ItemName="_TargetingPackVersionInfo" />

View File

@ -22,7 +22,7 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj">
<ProjectReference Include="..\..\..\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
</ProjectReference>

View File

@ -26,7 +26,7 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj">
<ProjectReference Include="..\..\..\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
</ProjectReference>

View File

@ -18,7 +18,7 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="$(RepoRoot)src\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj">
<ProjectReference Include="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
</ProjectReference>

View File

@ -15,7 +15,7 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj">
<ProjectReference Include="..\..\..\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
</ProjectReference>

View File

@ -15,8 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjectTemplates.Tests", "t
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetToolsInstaller", "testassets\DotNetToolsInstaller\DotNetToolsInstaller.csproj", "{4B971DBF-6B07-4DC5-914D-4D5681F220CC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.App.Runtime", "..\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj", "{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IntegrationTesting", "..\Hosting\Server.IntegrationTesting\src\Microsoft.AspNetCore.Server.IntegrationTesting.csproj", "{E6B319D0-6A92-47D8-BC46-904DA44664A5}"
EndProject
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
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SpaServices.Extensions", "..\Middleware\SpaServices.Extensions\src\Microsoft.AspNetCore.SpaServices.Extensions.csproj", "{06D0D7B2-EDA3-45A2-A060-AB791ED1DB80}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.App.Runtime", "..\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj", "{E4AF72F9-9F63-4965-ADEE-A67147E5FC31}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -259,18 +259,6 @@ Global
{4B971DBF-6B07-4DC5-914D-4D5681F220CC}.Release|x64.Build.0 = Release|Any CPU
{4B971DBF-6B07-4DC5-914D-4D5681F220CC}.Release|x86.ActiveCfg = Release|Any CPU
{4B971DBF-6B07-4DC5-914D-4D5681F220CC}.Release|x86.Build.0 = Release|Any CPU
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Debug|x64.ActiveCfg = Debug|Any CPU
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Debug|x64.Build.0 = Debug|Any CPU
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Debug|x86.ActiveCfg = Debug|Any CPU
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Debug|x86.Build.0 = Debug|Any CPU
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Release|Any CPU.Build.0 = Release|Any CPU
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Release|x64.ActiveCfg = Release|Any CPU
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Release|x64.Build.0 = Release|Any CPU
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Release|x86.ActiveCfg = Release|Any CPU
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5}.Release|x86.Build.0 = Release|Any CPU
{E6B319D0-6A92-47D8-BC46-904DA44664A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E6B319D0-6A92-47D8-BC46-904DA44664A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E6B319D0-6A92-47D8-BC46-904DA44664A5}.Debug|x64.ActiveCfg = Debug|Any CPU
@ -1207,18 +1195,6 @@ Global
{6012D544-32B4-4F5C-B335-A224AA4F661D}.Release|x64.Build.0 = Release|Any CPU
{6012D544-32B4-4F5C-B335-A224AA4F661D}.Release|x86.ActiveCfg = Release|Any CPU
{6012D544-32B4-4F5C-B335-A224AA4F661D}.Release|x86.Build.0 = Release|Any CPU
{706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Debug|x64.ActiveCfg = Debug|Any CPU
{706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Debug|x64.Build.0 = Debug|Any CPU
{706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Debug|x86.ActiveCfg = Debug|Any CPU
{706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Debug|x86.Build.0 = Debug|Any CPU
{706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Release|Any CPU.Build.0 = Release|Any CPU
{706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Release|x64.ActiveCfg = Release|Any CPU
{706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Release|x64.Build.0 = Release|Any CPU
{706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Release|x86.ActiveCfg = Release|Any CPU
{706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2}.Release|x86.Build.0 = Release|Any CPU
{06D0D7B2-EDA3-45A2-A060-AB791ED1DB80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{06D0D7B2-EDA3-45A2-A060-AB791ED1DB80}.Debug|Any CPU.Build.0 = Debug|Any CPU
{06D0D7B2-EDA3-45A2-A060-AB791ED1DB80}.Debug|x64.ActiveCfg = Debug|Any CPU
@ -1231,13 +1207,24 @@ Global
{06D0D7B2-EDA3-45A2-A060-AB791ED1DB80}.Release|x64.Build.0 = Release|Any CPU
{06D0D7B2-EDA3-45A2-A060-AB791ED1DB80}.Release|x86.ActiveCfg = Release|Any CPU
{06D0D7B2-EDA3-45A2-A060-AB791ED1DB80}.Release|x86.Build.0 = Release|Any CPU
{E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Debug|x64.ActiveCfg = Debug|Any CPU
{E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Debug|x64.Build.0 = Debug|Any CPU
{E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Debug|x86.ActiveCfg = Debug|Any CPU
{E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Debug|x86.Build.0 = Debug|Any CPU
{E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Release|Any CPU.Build.0 = Release|Any CPU
{E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Release|x64.ActiveCfg = Release|Any CPU
{E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Release|x64.Build.0 = Release|Any CPU
{E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Release|x86.ActiveCfg = Release|Any CPU
{E4AF72F9-9F63-4965-ADEE-A67147E5FC31}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{4B971DBF-6B07-4DC5-914D-4D5681F220CC} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
{4D91ADAC-7CE2-4738-B6C5-986626F14EB5} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
{E6B319D0-6A92-47D8-BC46-904DA44664A5} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
{05291368-373F-48AA-84FC-5B1E4606641A} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
{4BA90E96-EFFC-40CD-B101-054F492F77BE} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
@ -1316,8 +1303,8 @@ Global
{EEB670DC-9FE2-45A2-B7E9-9BCF7D1056E4} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
{81B96508-D920-45F6-9534-0D348B11DFAB} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
{6012D544-32B4-4F5C-B335-A224AA4F661D} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
{706DBAF7-0BB4-4B4F-9B44-E7C3372ECDF2} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
{06D0D7B2-EDA3-45A2-A060-AB791ED1DB80} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
{E4AF72F9-9F63-4965-ADEE-A67147E5FC31} = {D64F966A-B33B-4554-BA8C-A1AF91265996}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {D2F122BA-928C-4179-B503-6744DB64BA13}

View File

@ -5,7 +5,7 @@
Condition="$(DesignTimeBuild) != true">
<!-- The version of the shared framework. This is used in tests to ensure they run against the shared framework version we just built. -->
<!-- If we aren't building the targeting pack, use the baseline version -->
<MSBuild Projects="$(RepoRoot)src\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj"
<MSBuild Projects="$(RepoRoot)src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj"
Targets="_GetPackageVersionInfo"
SkipNonexistentProjects="false"
Condition="'$(IsTargetingPackBuilding)' != 'false'">
@ -19,7 +19,7 @@
</PropertyGroup>
<!-- Runtime and Ref packs may have separate versions. -->
<MSBuild Projects="$(RepoRoot)src\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj"
<MSBuild Projects="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj"
Targets="_GetPackageVersionInfo"
SkipNonexistentProjects="false">
<Output TaskParameter="TargetOutputs" ItemName="_RuntimePackageVersionInfo" />

View File

@ -37,7 +37,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(RepoRoot)src\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj">
<ProjectReference Include="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
</ProjectReference>

View File

@ -21,11 +21,11 @@
<ItemGroup>
<HostingStartupRuntimeStoreTargets Include="$(DefaultNetCoreTargetFramework)" Runtime="$(TargetRuntimeIdentifier)" />
<ProjectReference Include="..\..\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj">
<ProjectReference Include="..\..\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
</ProjectReference>
<ProjectReference Include="..\..\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj">
<ProjectReference Include="..\..\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
</ProjectReference>

View File

@ -26,7 +26,7 @@
<ItemGroup>
<ProjectReference Include="..\Microsoft.Web.Xdt.Extensions\src\Microsoft.Web.Xdt.Extensions.csproj" PrivateAssets="All" ReferenceOutputAssembly="False"/>
<!-- Make sure redist folder is built and ready -->
<ProjectReference Include="..\..\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj">
<ProjectReference Include="..\..\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
</ProjectReference>