From fd6c217336c6252a597f4d31a37ef928a17e62f2 Mon Sep 17 00:00:00 2001
From: Justin Kotalik <jukotali@microsoft.com>
Date: Fri, 30 Mar 2018 12:30:37 -0700
Subject: [PATCH] Revert "Build runtime specific metapackages"

This reverts commit ec184bc361e9e52e1c21f0fd1a7d09aa6acb78a9.
---
 build/SharedFx.targets                        | 27 -------------------
 build/artifacts.props                         |  6 -----
 .../Microsoft.AspNetCore.All.csproj           |  1 -
 src/Microsoft.AspNetCore.All/runtime.json.in  |  9 -------
 .../Microsoft.AspNetCore.App.csproj           |  1 -
 src/Microsoft.AspNetCore.App/runtime.json.in  |  9 -------
 ...untime.win.Microsoft.AspNetCore.All.csproj | 14 ----------
 ...untime.win.Microsoft.AspNetCore.App.csproj | 14 ----------
 8 files changed, 81 deletions(-)
 delete mode 100644 src/Microsoft.AspNetCore.All/runtime.json.in
 delete mode 100644 src/Microsoft.AspNetCore.App/runtime.json.in
 delete mode 100644 src/runtime.win.Microsoft.AspNetCore.All/runtime.win.Microsoft.AspNetCore.All.csproj
 delete mode 100644 src/runtime.win.Microsoft.AspNetCore.App/runtime.win.Microsoft.AspNetCore.App.csproj

diff --git a/build/SharedFx.targets b/build/SharedFx.targets
index 9dd5423bf4..fd696721b7 100644
--- a/build/SharedFx.targets
+++ b/build/SharedFx.targets
@@ -13,9 +13,7 @@
   <Target Name="GetMetapackageArtifactInfo">
     <ItemGroup>
       <_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\runtime.win.Microsoft.AspNetCore.App\runtime.win.Microsoft.AspNetCore.App.csproj" />
       <_MetapackageProject Include="$(RepositoryRoot)src\Microsoft.AspNetCore.Analyzers\Microsoft.AspNetCore.Analyzers.csproj" />
     </ItemGroup>
 
@@ -77,13 +75,6 @@
       PackageArtifacts="@(PackageArtifact)"
       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. -->
     <MSBuild Projects="$(MetapackageWorkDirectory)$(MetapackageName).csproj" Targets="Restore" Properties="$(CommonProps);_Target=Restore" />
     <!-- Pack -->
@@ -96,15 +87,6 @@
         <AdditionalProperties>
           MetapackageName=Microsoft.AspNetCore.App;
           MetapackageReferenceType=AppMetapackage;
-          LockToExactVersions=true;
-          ProcessRuntimeJson=true
-        </AdditionalProperties>
-      </_MetapackageBuilderProject>
-
-      <_MetapackageBuilderProject Include="$(MSBuildProjectFullPath)">
-        <AdditionalProperties>
-          MetapackageName=runtime.win.Microsoft.AspNetCore.App;
-          MetapackageReferenceType=WinAppMetapackage;
           LockToExactVersions=true
         </AdditionalProperties>
       </_MetapackageBuilderProject>
@@ -113,15 +95,6 @@
         <AdditionalProperties>
           MetapackageName=Microsoft.AspNetCore.All;
           MetapackageReferenceType=AllMetapackage;
-          LockToExactVersions=false;
-          ProcessRuntimeJson=true
-        </AdditionalProperties>
-      </_MetapackageBuilderProject>
-
-      <_MetapackageBuilderProject Include="$(MSBuildProjectFullPath)">
-        <AdditionalProperties>
-          MetapackageName=runtime.win.Microsoft.AspNetCore.All;
-          MetapackageReferenceType=WinAllMetapackage;
           LockToExactVersions=false
         </AdditionalProperties>
       </_MetapackageBuilderProject>
diff --git a/build/artifacts.props b/build/artifacts.props
index fed98a6fd2..4ce16f50d1 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -6,10 +6,6 @@
       <AppMetapackage>false</AppMetapackage>
       <!-- When true, this dependency will be included in the Microsoft.AspNetCore.All metapackage. -->
       <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. -->
       <Analyzer>false</Analyzer>
       <!-- 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.Web.Xdt.Extensions" Category="shipoob" />
     <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" />
   </ItemGroup>
diff --git a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
index 285e42eb7c..6df70d6f22 100644
--- a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
+++ b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
@@ -15,7 +15,6 @@
     <Content Include="build\$(TargetFramework)\*.props" PackagePath="%(Identity)" />
     <Content Include="build\$(TargetFramework)\*.targets" PackagePath="%(Identity)" />
     <Content Include="lib\$(TargetFramework)\_._" PackagePath="%(Identity)" />
-    <Content Include="runtime.json" PackagePath="%(Identity)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.AspNetCore.All/runtime.json.in b/src/Microsoft.AspNetCore.All/runtime.json.in
deleted file mode 100644
index 58bf9bf176..0000000000
--- a/src/Microsoft.AspNetCore.All/runtime.json.in
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "runtimes": {
-    "win": {
-      "${METAPACKAGE_ID}": {
-        "runtime.win.${METAPACKAGE_ID}": "${PACKAGE_VERSION}"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj b/src/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj
index dba8a26764..d87e940d0c 100644
--- a/src/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj
+++ b/src/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj
@@ -15,7 +15,6 @@
     <Content Include="build\$(TargetFramework)\*.props" PackagePath="%(Identity)" />
     <Content Include="build\$(TargetFramework)\*.targets" PackagePath="%(Identity)" />
     <Content Include="lib\$(TargetFramework)\_._" PackagePath="%(Identity)" />
-    <Content Include="runtime.json" PackagePath="%(Identity)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.AspNetCore.App/runtime.json.in b/src/Microsoft.AspNetCore.App/runtime.json.in
deleted file mode 100644
index 58bf9bf176..0000000000
--- a/src/Microsoft.AspNetCore.App/runtime.json.in
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "runtimes": {
-    "win": {
-      "${METAPACKAGE_ID}": {
-        "runtime.win.${METAPACKAGE_ID}": "${PACKAGE_VERSION}"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/runtime.win.Microsoft.AspNetCore.All/runtime.win.Microsoft.AspNetCore.All.csproj b/src/runtime.win.Microsoft.AspNetCore.All/runtime.win.Microsoft.AspNetCore.All.csproj
deleted file mode 100644
index 6345c02e40..0000000000
--- a/src/runtime.win.Microsoft.AspNetCore.All/runtime.win.Microsoft.AspNetCore.All.csproj
+++ /dev/null
@@ -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>
diff --git a/src/runtime.win.Microsoft.AspNetCore.App/runtime.win.Microsoft.AspNetCore.App.csproj b/src/runtime.win.Microsoft.AspNetCore.App/runtime.win.Microsoft.AspNetCore.App.csproj
deleted file mode 100644
index 53c20bb691..0000000000
--- a/src/runtime.win.Microsoft.AspNetCore.App/runtime.win.Microsoft.AspNetCore.App.csproj
+++ /dev/null
@@ -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>