huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Build runtime specific metapackages" 

This reverts commit ec184bc361.
This commit is contained in:
Justin Kotalik 2018-03-30 12:30:37 -07:00
parent 1186ab688b
commit fd6c217336
8 changed files with 0 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
build/SharedFx.targets
View File

@ -13,9 +13,7 @@
<Target Name="GetMetapackageArtifactInfo"> <Target Name="GetMetapackageArtifactInfo">
<ItemGroup> <ItemGroup>
<_MetapackageProject Include="$(RepositoryRoot)src\Microsoft.AspNetCore.All\Microsoft.AspNetCore.All.csproj" /> <_MetapackageProject Include="$(RepositoryRoot)src\Microsoft.AspNetCore.All\Microsoft.AspNetCore.All.csproj" />
<_MetapackageProject Include="$(RepositoryRoot)src\runtime.win.Microsoft.AspNetCore.All\runtime.win.Microsoft.AspNetCore.All.csproj" />
<_MetapackageProject Include="$(RepositoryRoot)src\Microsoft.AspNetCore.App\Microsoft.AspNetCore.App.csproj" /> <_MetapackageProject Include="$(RepositoryRoot)src\Microsoft.AspNetCore.App\Microsoft.AspNetCore.App.csproj" />
<_MetapackageProject Include="$(RepositoryRoot)src\runtime.win.Microsoft.AspNetCore.App\runtime.win.Microsoft.AspNetCore.App.csproj" />
<_MetapackageProject Include="$(RepositoryRoot)src\Microsoft.AspNetCore.Analyzers\Microsoft.AspNetCore.Analyzers.csproj" /> <_MetapackageProject Include="$(RepositoryRoot)src\Microsoft.AspNetCore.Analyzers\Microsoft.AspNetCore.Analyzers.csproj" />
</ItemGroup> </ItemGroup>
@ -77,13 +75,6 @@
PackageArtifacts="@(PackageArtifact)" PackageArtifacts="@(PackageArtifact)"
ExternalDependencies="@(ExternalDependency)" /> ExternalDependencies="@(ExternalDependency)" />
<!-- Update runtime.json.in -->
<GenerateFileFromTemplate
TemplateFile="$(MetapackageWorkDirectory)runtime.json.in"
OutputPath="$(MetapackageWorkDirectory)runtime.json"
Properties="METAPACKAGE_ID=$(MetapackageName);PACKAGE_VERSION=$(PackageVersion)"
Condition="'$(ProcessRuntimeJson)' == 'true'"/>
<!-- Set _Target=Restore so the project will be re-evaluated to include Internal.AspNetCore.Sdk MSBuild properties on the next step. --> <!-- Set _Target=Restore so the project will be re-evaluated to include Internal.AspNetCore.Sdk MSBuild properties on the next step. -->
<MSBuild Projects="$(MetapackageWorkDirectory)$(MetapackageName).csproj" Targets="Restore" Properties="$(CommonProps);_Target=Restore" /> <MSBuild Projects="$(MetapackageWorkDirectory)$(MetapackageName).csproj" Targets="Restore" Properties="$(CommonProps);_Target=Restore" />
<!-- Pack --> <!-- Pack -->
@ -96,15 +87,6 @@
<AdditionalProperties> <AdditionalProperties>
MetapackageName=Microsoft.AspNetCore.App; MetapackageName=Microsoft.AspNetCore.App;
MetapackageReferenceType=AppMetapackage; MetapackageReferenceType=AppMetapackage;
LockToExactVersions=true;
ProcessRuntimeJson=true
</AdditionalProperties>
</_MetapackageBuilderProject>
<_MetapackageBuilderProject Include="$(MSBuildProjectFullPath)">
<AdditionalProperties>
MetapackageName=runtime.win.Microsoft.AspNetCore.App;
MetapackageReferenceType=WinAppMetapackage;
LockToExactVersions=true LockToExactVersions=true
</AdditionalProperties> </AdditionalProperties>
</_MetapackageBuilderProject> </_MetapackageBuilderProject>
@ -113,15 +95,6 @@
<AdditionalProperties> <AdditionalProperties>
MetapackageName=Microsoft.AspNetCore.All; MetapackageName=Microsoft.AspNetCore.All;
MetapackageReferenceType=AllMetapackage; MetapackageReferenceType=AllMetapackage;
LockToExactVersions=false;
ProcessRuntimeJson=true
</AdditionalProperties>
</_MetapackageBuilderProject>
<_MetapackageBuilderProject Include="$(MSBuildProjectFullPath)">
<AdditionalProperties>
MetapackageName=runtime.win.Microsoft.AspNetCore.All;
MetapackageReferenceType=WinAllMetapackage;
LockToExactVersions=false LockToExactVersions=false
</AdditionalProperties> </AdditionalProperties>
</_MetapackageBuilderProject> </_MetapackageBuilderProject>

6
build/artifacts.props
View File

@ -6,10 +6,6 @@
<AppMetapackage>false</AppMetapackage> <AppMetapackage>false</AppMetapackage>
<!-- When true, this dependency will be included in the Microsoft.AspNetCore.All metapackage. --> <!-- When true, this dependency will be included in the Microsoft.AspNetCore.All metapackage. -->
<AllMetapackage>false</AllMetapackage> <AllMetapackage>false</AllMetapackage>
<!-- When true, this dependency will be included in the runtime.win.Microsoft.AspNetCore.App metapackage. -->
<WinAppMetapackage>false</WinAppMetapackage>
<!-- When true, this dependency will be included in the runtime.win.Microsoft.AspNetCore.All metapackage. -->
<WinAllMetapackage>false</WinAllMetapackage>
<!-- When true, this dependency will be included in the Microsoft.AspNetCore.Analyzers metapackage. --> <!-- When true, this dependency will be included in the Microsoft.AspNetCore.Analyzers metapackage. -->
<Analyzer>false</Analyzer> <Analyzer>false</Analyzer>
<!-- When true, this dependency will be included in the LZMA. --> <!-- When true, this dependency will be included in the LZMA. -->
@ -309,8 +305,6 @@
<PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGenerators.Mvc" Category="ship" LZMA="true" /> <PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGenerators.Mvc" Category="ship" LZMA="true" />
<PackageArtifact Include="Microsoft.Web.Xdt.Extensions" Category="shipoob" /> <PackageArtifact Include="Microsoft.Web.Xdt.Extensions" Category="shipoob" />
<PackageArtifact Include="RazorPageGenerator" Category="noship" /> <PackageArtifact Include="RazorPageGenerator" Category="noship" />
<PackageArtifact Include="runtime.win.Microsoft.AspNetCore.App" Category="ship" />
<PackageArtifact Include="runtime.win.Microsoft.AspNetCore.All" Category="ship" />
<PackageArtifact Include="Internal.AspNetCore.Universe.Lineup" Category="noship" PackageType="Lineup" /> <PackageArtifact Include="Internal.AspNetCore.Universe.Lineup" Category="noship" PackageType="Lineup" />
</ItemGroup> </ItemGroup>

1
src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
View File

@ -15,7 +15,6 @@
<Content Include="build\$(TargetFramework)\*.props" PackagePath="%(Identity)" /> <Content Include="build\$(TargetFramework)\*.props" PackagePath="%(Identity)" />
<Content Include="build\$(TargetFramework)\*.targets" PackagePath="%(Identity)" /> <Content Include="build\$(TargetFramework)\*.targets" PackagePath="%(Identity)" />
<Content Include="lib\$(TargetFramework)\_._" PackagePath="%(Identity)" /> <Content Include="lib\$(TargetFramework)\_._" PackagePath="%(Identity)" />
<Content Include="runtime.json" PackagePath="%(Identity)" />
</ItemGroup> </ItemGroup>
</Project> </Project>

9
src/Microsoft.AspNetCore.All/runtime.json.in
View File

@ -1,9 +0,0 @@
{
"runtimes": {
"win": {
"${METAPACKAGE_ID}": {
"runtime.win.${METAPACKAGE_ID}": "${PACKAGE_VERSION}"
}
}
}
}

1
src/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj
View File

@ -15,7 +15,6 @@
<Content Include="build\$(TargetFramework)\*.props" PackagePath="%(Identity)" /> <Content Include="build\$(TargetFramework)\*.props" PackagePath="%(Identity)" />
<Content Include="build\$(TargetFramework)\*.targets" PackagePath="%(Identity)" /> <Content Include="build\$(TargetFramework)\*.targets" PackagePath="%(Identity)" />
<Content Include="lib\$(TargetFramework)\_._" PackagePath="%(Identity)" /> <Content Include="lib\$(TargetFramework)\_._" PackagePath="%(Identity)" />
<Content Include="runtime.json" PackagePath="%(Identity)" />
</ItemGroup> </ItemGroup>
</Project> </Project>

9
src/Microsoft.AspNetCore.App/runtime.json.in
View File

@ -1,9 +0,0 @@
{
"runtimes": {
"win": {
"${METAPACKAGE_ID}": {
"runtime.win.${METAPACKAGE_ID}": "${PACKAGE_VERSION}"
}
}
}
}

14
src/runtime.win.Microsoft.AspNetCore.All/runtime.win.Microsoft.AspNetCore.All.csproj
View File

@ -1,14 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(DotNetRestoreSourcePropsPath)" Condition="'$(DotNetRestoreSourcePropsPath)' != ''"/>
<PropertyGroup>
<IncludeBuildOutput>false</IncludeBuildOutput>
<IncludeSymbols>false</IncludeSymbols>
<TargetFramework>netcoreapp2.1</TargetFramework>
<PackageTags>aspnetcore</PackageTags>
<Description>runtime.win.Microsoft.AspNetCore.All</Description>
<EnableApiCheck>false</EnableApiCheck>
</PropertyGroup>
</Project>

14
src/runtime.win.Microsoft.AspNetCore.App/runtime.win.Microsoft.AspNetCore.App.csproj
View File

@ -1,14 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(DotNetRestoreSourcePropsPath)" Condition="'$(DotNetRestoreSourcePropsPath)' != ''"/>
<PropertyGroup>
<IncludeBuildOutput>false</IncludeBuildOutput>
<IncludeSymbols>false</IncludeSymbols>
<TargetFramework>netcoreapp2.1</TargetFramework>
<PackageTags>aspnetcore</PackageTags>
<Description>runtime.win.Microsoft.AspNetCore.App</Description>
<EnableApiCheck>false</EnableApiCheck>
</PropertyGroup>
</Project>