Create Linux installers for the aspnetcore targeting pack

.azure/pipelines/ci.yml

@@ -164,9 +164,11 @@ jobs:
           --arch x64 \
           -e KOREBUILD_SKIP_INSTALL_NETFX=0 \
           --no-restore \
+          --no-build-deps \
           /t:BuildSharedFx  \
           /p:BuildRuntimeArchive=false \
-          /p:LinuxInstallerType=deb
+          /p:LinuxInstallerType=deb \
+          /bl:artifacts/logs/build.deb.binlog
       displayName: Build Debian installers
     - script: |
         rm -rf .dotnet/
@@ -175,9 +177,12 @@ jobs:
           --ci --pack --all --no-build-nodejs --no-build-java \
           --arch x64 \
           -e KOREBUILD_SKIP_INSTALL_NETFX=0 \
+          --no-restore \
+          --no-build-deps \
           /t:BuildSharedFx  \
           /p:BuildRuntimeArchive=false \
-          /p:LinuxInstallerType=rpm
+          /p:LinuxInstallerType=rpm \
+          /bl:artifacts/logs/build.rpm.binlog
       displayName: Build RPM installers
     afterBuild:
     # Remove packages that are not rid-specific.

.gitignore

@@ -17,6 +17,7 @@ StyleCop.Cache
 node_modules/
 *.snk
 .nuget
+.packages/
 .r
 .w
 .deps

Directory.Build.props

@@ -6,7 +6,6 @@
 
     <Authors>Microsoft</Authors>
     <Company>Microsoft Corporation.</Company>
-    <RpmPackageVendor>.NET Foundation</RpmPackageVendor>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
 

build/SharedFx.targets

@@ -12,8 +12,8 @@
     <FxProjectToBuild Include="$(UnitTestFxProject)" />
     <FxProjectToBuild Condition=" '$(BuildRuntimeArchive)' != 'false' " Include="$(RepositoryRoot)src\Installers\Archive\*.*proj" />
 
-    <FxProjectToBuild Condition=" '$(TargetRuntimeIdentifier)' == 'linux-x64' AND '$(LinuxInstallerType)' == 'deb' " Include="$(RepositoryRoot)src\Installers\Debian\*.*proj" />
-    <FxProjectToBuild Condition=" '$(TargetRuntimeIdentifier)' == 'linux-x64' AND '$(LinuxInstallerType)' == 'rpm' " Include="$(RepositoryRoot)src\Installers\Rpm\*.*proj" />
+    <FxProjectToBuild Condition=" '$(TargetRuntimeIdentifier)' == 'linux-x64' AND '$(LinuxInstallerType)' == 'deb' " Include="$(RepositoryRoot)src\Installers\Debian\**\*.*proj" />
+    <FxProjectToBuild Condition=" '$(TargetRuntimeIdentifier)' == 'linux-x64' AND '$(LinuxInstallerType)' == 'rpm' " Include="$(RepositoryRoot)src\Installers\Rpm\**\*.*proj" />
 
     <FxProjectToBuild Condition=" '$(BuildSiteExtensions)' == 'true' " Include="$(RepositoryRoot)src\SiteExtensions\Runtime\Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj" />
     <FxProjectToBuild Condition=" '$(BuildSiteExtensions)' == 'true' " Include="$(RepositoryRoot)src\SiteExtensions\LoggingBranch\LoggingBranch.csproj" />

dockerbuild.sh

@@ -104,6 +104,22 @@ fi
 dockerfile="$DIR/build/docker/$image.Dockerfile"
 tagname="aspnetcore-build-$image"
 
+# Use docker pull with retries to pre-pull the image need by the dockerfile
+# docker build regularly fails with TLS handshake issues for unclear reasons.
+base_imagename="$(grep -E -o 'FROM (.*)' $dockerfile | cut -c 6-)"
+pull_retries=3
+while [ $pull_retries -gt 0 ]; do
+    failed=false
+    docker pull $base_imagename || failed=true
+    if [ "$failed" = true ]; then
+        let pull_retries=pull_retries-1
+        echo -e "${YELLOW}Failed to pull $base_imagename Retries left: $pull_retries.${RESET}"
+        sleep 1
+    else
+        pull_retries=0
+    fi
+done
+
 docker build "$(dirname "$dockerfile")" \
     --build-arg "USER=$(whoami)" \
     --build-arg "USER_ID=$(id -u)" \

eng/scripts/KillProcesses.ps1

@@ -21,6 +21,10 @@ _kill git.exe
 _kill vctip.exe
 _kill chrome.exe
 _kill h2spec.exe
-iisreset /restart
+_kill WerFault.exe
+if (Get-Command iisreset -ErrorAction ignore) {
+    iisreset /restart
+}
+Stop-Service w3svc -NoWait -ErrorAction Ignore
 
 exit 0

src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj

@@ -12,6 +12,10 @@
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <IsShippingPackage>true</IsShippingPackage>
     <IsPackable>true</IsPackable>
+    <IsPackable Condition="'$(IsTargetingPackBuilding)' == 'false'">false</IsPackable>
+    <PackageId>$(TargetingPackName)</PackageId>
+    <PackageVersion>$(TargetingPackVersion)</PackageVersion>
+
     <PackageDescription>Provides a default set of APIs for building an ASP.NET Core application. Contains reference assemblies, documentation, and other design-time assets.
 
 This package is an internal implementation of the .NET Core SDK and is not meant to be used as a normal PackageReference.</PackageDescription>
@@ -22,7 +26,8 @@ This package is an internal implementation of the .NET Core SDK and is not meant
     <RefAssemblyPackagePath>ref/$(TargetFramework)/</RefAssemblyPackagePath>
 
     <LayoutTargetDir>$(TargetingPackLayoutRoot)packs/Microsoft.AspNetCore.App.Ref/$(PackageVersion)/</LayoutTargetDir>
-    <ArchiveOutputFileName>aspnetcore-targeting-pack-$(PackageVersion).zip</ArchiveOutputFileName>
+    <ArchiveOutputFileName Condition="'$(TargetRuntimeIdentifier)' == 'win-x64'">aspnetcore-targeting-pack-$(PackageVersion).zip</ArchiveOutputFileName>
+    <ArchiveOutputFileName Condition="'$(TargetRuntimeIdentifier)' == 'linux-x64'">aspnetcore-targeting-pack-$(PackageVersion).tar.gz</ArchiveOutputFileName>
     <ArchiveOutputPath>$(InstallersOutputPath)$(ArchiveOutputFileName)</ArchiveOutputPath>
 
     <!-- There are no symbols for reference assemblies. -->
@@ -54,7 +59,8 @@ This package is an internal implementation of the .NET Core SDK and is not meant
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-    <BuildDependsOn>
+    <!-- If this project won't produce a package, don't bother building anything. -->
+    <BuildDependsOn Condition="'$(IsPackable)' != 'false'">
       $(BuildDependsOn);
       GeneratePackageConflictManifest;
       _ResolveTargetingPackContent;
@@ -65,9 +71,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
 
   <!-- Override the default MSBuild targets so that nothing is returned from the project since it represents a collection of assemblies. -->
   <Target Name="GetTargetPath" />
-  <Target Name="Build" DependsOnTargets="$(BuildDependsOn)">
-    <Message Importance="High" Text="$(MSBuildProjectName) -> $(TargetDir)" />
-  </Target>
+  <Target Name="Build" DependsOnTargets="$(BuildDependsOn)" />
 
   <!-- This project doesn't compile anything. -->
   <Target Name="CoreCompile" />
@@ -115,20 +119,25 @@ This package is an internal implementation of the .NET Core SDK and is not meant
           DependsOnTargets="_ResolveTargetingPackContent"
           Inputs="@(RefPackContent)"
           Outputs="@(RefPackContent->'$(LayoutTargetDir)%(PackagePath)%(FileName)%(Extension)')">
-
     <Copy SourceFiles="@(RefPackContent)"
           DestinationFiles="@(RefPackContent->'$(LayoutTargetDir)%(PackagePath)%(FileName)%(Extension)')"
           UseHardlinksIfPossible="true" />
+    <Message Importance="High" Text="$(MSBuildProjectName) -> $(LayoutTargetDir)" />
   </Target>
 
   <Target Name="_CreateTargetingPackArchive"
           Inputs="@(RefPackContent)"
-          Outputs="$(ArchiveOutputPath)"
-          Condition="'$(IsPackable)' != 'false'">
+          Outputs="$(ArchiveOutputPath)">
     <ZipDirectory
       SourceDirectory="$(TargetingPackLayoutRoot)"
       DestinationFile="$(ArchiveOutputPath)"
-      Overwrite="true" />
+      Overwrite="true"
+      Condition="'$(TargetRuntimeIdentifier)' == 'win-x64'" />
+    <Exec
+      Command="tar -czf $(ArchiveOutputPath) ."
+      WorkingDirectory="$(TargetingPackLayoutRoot)"
+      Condition="'$(TargetRuntimeIdentifier)' == 'linux-x64'" />
+    <Message Importance="High" Text="$(MSBuildProjectName) -> $(ArchiveOutputPath)" />
   </Target>
 
 </Project>

src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj

@@ -12,7 +12,6 @@
     <RuntimeIdentifier>$(TargetRuntimeIdentifier)</RuntimeIdentifier>
     <!-- Even though RuntimeIdentifier is set, shared framework projects are not self-contained projects -->
     <SelfContained>false</SelfContained>
-    <SharedFxName>Microsoft.AspNetCore.App</SharedFxName>
     <PackageId>$(MSBuildProjectName).$(RuntimeIdentifier)</PackageId>
     <IsShippingPackage>true</IsShippingPackage>
     <HasReferenceAssembly>false</HasReferenceAssembly>

src/Installers/Debian/Directory.Build.props

@@ -0,0 +1,23 @@
+<Project>
+  <PropertyGroup>
+    <OutputInRepoRoot>true</OutputInRepoRoot>
+  </PropertyGroup>
+
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
+
+  <UsingTask Condition=" '$(BuildToolsTaskAssembly)' != '' AND Exists('$(BuildToolsTaskAssembly)') " TaskName="Microsoft.AspNetCore.BuildTools.GenerateFileFromTemplate" AssemblyFile="$(BuildToolsTaskAssembly)" />
+
+  <PropertyGroup>
+    <OutputPath>$(InstallersOutputPath)</OutputPath>
+    <IntermediateOutputPath>$(IntermediateOutputPath)$(TargetRuntimeIdentifier)\</IntermediateOutputPath>
+    <!-- Must be named "package_root/". This is expected by the build.sh script in the tools folder. -->
+    <IntermediatePackageRoot>$(IntermediateOutputPath)package_root\</IntermediatePackageRoot>
+
+    <!-- Installer settings -->
+    <DebianPackageInstallRoot>/usr/share/dotnet</DebianPackageInstallRoot>
+
+    <DebianPackageArch Condition=" '$(TargetArchitecture)' == 'x64' ">amd64</DebianPackageArch>
+
+    <DebianBuildScript>$(MSBuildThisFileDirectory)tools/build.sh</DebianBuildScript>
+  </PropertyGroup>
+</Project>

src/Installers/Debian/Directory.Build.targets

@@ -0,0 +1,58 @@
+<Project>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.targets))\Directory.Build.targets" />
+
+  <PropertyGroup>
+    <TargetPath>$(OutputPath)$(TargetFileName)</TargetPath>
+    <DebBuildDependsOn>
+      $(DebBuildDependsOn);
+      PrepareForBuild;
+      ResolveProjectReferences;
+      GetTargetPath;
+    </DebBuildDependsOn>
+  </PropertyGroup>
+
+  <Target Name="PrepareForBuild">
+    <Error Text="Currently only linux-x64 is supported by Debian installers." Condition=" '$(TargetRuntimeIdentifier)' != 'linux-x64' " />
+
+    <MakeDir Directories="$(IntermediateOutputPath);$(IntermediatePackageRoot);$(OutputPath)" />
+  </Target>
+
+  <Target Name="GetTargetPath" Returns="$(TargetPath)" />
+
+  <Target Name="Build" DependsOnTargets="DebBuild" />
+
+  <Target Name="DebBuild" DependsOnTargets="$(DebBuildDependsOn)">
+    <!-- Generate debian_config.json. We can't simply use WriteLinesToFile because of https://github.com/Microsoft/msbuild/issues/1622. Use our custom GenerateFileFromTemplate task instead -->
+    <PropertyGroup>
+      <DebianConfigProperties>
+        $(DebianConfigProperties);
+        AspNetCoreMajorVersion=$(AspNetCoreMajorVersion);
+        AspNetCoreMinorVersion=$(AspNetCoreMinorVersion);
+        Authors=$(Authors);
+        DebianPackageInstallRoot=$(DebianPackageInstallRoot);
+        MaintainerEmail=$(MaintainerEmail);
+        PackageId=$(PackageId);
+        PackageLicenseType=$(PackageLicenseType);
+        PackageProjectUrl=$(PackageProjectUrl);
+        PackageRevision=$(PackageRevision);
+        PackageVersion=$(PackageVersion);
+        PackageSummary=$(PackageSummary);
+        PackageDescription=$(PackageDescription);
+      </DebianConfigProperties>
+    </PropertyGroup>
+
+    <GenerateFileFromTemplate TemplateFile="debian_config.json.in"
+      Properties="$(DebianConfigProperties)"
+      OutputPath="$(IntermediateOutputPath)debian_config.json" />
+
+    <!-- Build SharedFx Bundle Deb package -->
+
+    <Exec Command="$(DebianBuildScript) -i '$(IntermediateOutputPath)' -o '$(IntermediateOutputPath)out/'" />
+
+    <PropertyGroup>
+      <BuildScriptOutputFileName>$(PackageId)_$(PackageVersion)-$(PackageRevision)_$(DebianPackageArch).deb</BuildScriptOutputFileName>
+    </PropertyGroup>
+
+    <Copy SourceFiles="$(IntermediateOutputPath)out/$(BuildScriptOutputFileName)" DestinationFiles="$(TargetPath)" />
+  </Target>
+</Project>