Stop building old style linux packages and rename *-upgrade.{deb|rpm} packages to the original package name. (#4184)

2018-06-01 12:47:38 -07:00 · 2018-06-01 12:47:38 -07:00 · 6985b9f684
--- a/buildpipeline/Core-Setup-Linux-BT.json
+++ b/buildpipeline/Core-Setup-Linux-BT.json
@ -272,25 +272,6 @@
        "failOnStandardError": "false"
      }
    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Package Runtime packages and Runtime Dep - Ubuntu 14.04 - Upgradeable",
-      "timeoutInMinutes": 0,
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1404) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildPackagingArguments) $(DistroSpecificMSBuildArguments) $(PB_AdditionalMSBuildArguments) /p:BuildUpgradeableLinuxPackages=true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
    {
      "environment": {},
      "enabled": true,
@ -329,25 +310,6 @@
        "failOnStandardError": "false"
      }
    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Package Runtime Dep - Ubuntu 16.04 - Upgradeable",
-      "timeoutInMinutes": 0,
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "$(CommonDockerCommandToBuildRuntimeDepDebPackage) /p:OutputRid=ubuntu.16.04-$(PB_TargetArchitecture) $(PB_AdditionalMSBuildArguments) /p:BuildUpgradeableLinuxPackages=true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
    {
      "environment": {},
      "enabled": true,
@ -386,25 +348,6 @@
        "failOnStandardError": "false"
      }
    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Package Runtime Dep - Ubuntu 17.10 - Upgradeable",
-      "timeoutInMinutes": 0,
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "$(CommonDockerCommandToBuildRuntimeDepDebPackage) /p:OutputRid=ubuntu.17.10-$(PB_TargetArchitecture) $(PB_AdditionalMSBuildArguments) /p:BuildUpgradeableLinuxPackages=true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
    {
      "environment": {},
      "enabled": true,
@ -443,25 +386,6 @@
        "failOnStandardError": "false"
      }
    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Package Runtime Dep - Ubuntu 18.04 - Upgradeable",
-      "timeoutInMinutes": 0,
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "$(CommonDockerCommandToBuildRuntimeDepDebPackage) /p:OutputRid=ubuntu.18.04-$(PB_TargetArchitecture) $(PB_AdditionalMSBuildArguments) /p:BuildUpgradeableLinuxPackages=true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
    {
      "environment": {},
      "enabled": true,
@ -500,25 +424,6 @@
        "failOnStandardError": "false"
      }
    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Package Runtime Dep - Debian 8 - Upgradeable",
-      "timeoutInMinutes": 0,
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "$(CommonDockerCommandToBuildRuntimeDepDebPackage) /p:OutputRid=debian.8-$(PB_TargetArchitecture) $(PB_AdditionalMSBuildArguments) /p:BuildUpgradeableLinuxPackages=true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
    {
      "environment": {},
      "enabled": true,
@ -557,25 +462,6 @@
        "failOnStandardError": "false"
      }
    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Package Runtime Dep - Debian 9 - Upgradeable",
-      "timeoutInMinutes": 0,
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "$(CommonDockerCommandToBuildRuntimeDepDebPackage) /p:OutputRid=debian.9-$(PB_TargetArchitecture) $(PB_AdditionalMSBuildArguments) /p:BuildUpgradeableLinuxPackages=true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
    {
      "environment": {},
      "enabled": true,
@ -671,25 +557,6 @@
        "failOnStandardError": "false"
      }
    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Package Runtime Dep - Rhel7 - Upgradeable",
-      "timeoutInMinutes": 0,
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "run --rm $(DockerCommonRunArgs_Rhel7) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildPackagingArguments) $(DistroSpecificMSBuildArguments) $(PB_AdditionalMSBuildArguments) /p:BuildUpgradeableLinuxPackages=true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
    {
      "environment": {},
      "enabled": true,
@ -728,25 +595,6 @@
        "failOnStandardError": "false"
      }
    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Package Runtime Dep - OpenSuse - Upgradeable",
-      "timeoutInMinutes": 0,
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "$(CommonDockerCommandToBuildRuntimeDepRPMPackage) /p:OutputRid=opensuse.42-$(PB_TargetArchitecture) $(PB_AdditionalMSBuildArguments) /p:BuildUpgradeableLinuxPackages=true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
    {
      "environment": {},
      "enabled": true,
@ -785,25 +633,6 @@
        "failOnStandardError": "false"
      }
    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Package Runtime Dep - Fedora 26 - Upgradeable",
-      "timeoutInMinutes": 0,
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "$(CommonDockerCommandToBuildRuntimeDepRPMPackage) /p:OutputRid=fedora.26-$(PB_TargetArchitecture) $(PB_AdditionalMSBuildArguments) /p:BuildUpgradeableLinuxPackages=true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
    {
      "environment": {},
      "enabled": true,
@ -842,25 +671,6 @@
        "failOnStandardError": "false"
      }
    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Package Runtime Dep - Fedora 27 - Upgradeable",
-      "timeoutInMinutes": 0,
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "$(CommonDockerCommandToBuildRuntimeDepRPMPackage) /p:OutputRid=fedora.27-$(PB_TargetArchitecture) $(PB_AdditionalMSBuildArguments) /p:BuildUpgradeableLinuxPackages=true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
    {
      "environment": {},
      "enabled": true,
@ -899,25 +709,6 @@
        "failOnStandardError": "false"
      }
    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Package Runtime Dep - Centos 7 - Upgradeable",
-      "timeoutInMinutes": 0,
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "$(CommonDockerCommandToBuildRuntimeDepRPMPackage) /p:OutputRid=centos.7-$(PB_TargetArchitecture) $(PB_AdditionalMSBuildArguments) /p:BuildUpgradeableLinuxPackages=true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
    {
      "environment": {},
      "enabled": true,
@ -956,25 +747,6 @@
        "failOnStandardError": "false"
      }
    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Package Runtime Dep - Oracle Linux 7 - Upgradeable",
-      "timeoutInMinutes": 0,
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "$(CommonDockerCommandToBuildRuntimeDepRPMPackage) /p:OutputRid=oraclelinux.7-$(PB_TargetArchitecture) $(PB_AdditionalMSBuildArguments) /p:BuildUpgradeableLinuxPackages=true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
    {
      "environment": {},
      "enabled": true,
@ -1013,25 +785,6 @@
        "failOnStandardError": "false"
      }
    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": false,
-      "alwaysRun": false,
-      "displayName": "Package Runtime Dep - SLES - Upgradeable",
-      "timeoutInMinutes": 0,
-      "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
-        "versionSpec": "1.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "filename": "docker",
-        "arguments": "$(CommonDockerCommandToBuildRuntimeDepRPMPackage) /p:OutputRid=sles.12-$(PB_TargetArchitecture) $(PB_AdditionalMSBuildArguments) /p:BuildUpgradeableLinuxPackages=true",
-        "workingFolder": "",
-        "failOnStandardError": "false"
-      }
-    },
    {
      "environment": {},
      "enabled": true,
--- a/dir.props
+++ b/dir.props
@ -437,15 +437,6 @@
  </PropertyGroup>

  <PropertyGroup>
-    <SharedHostDebPkgName>dotnet-host</SharedHostDebPkgName>
-    <SharedHostDebPkgName>$(SharedHostDebPkgName.ToLower())</SharedHostDebPkgName>
-    <HostFxrDebPkgName>$(DotnetHostFxrString)$(HostResolverVersion)</HostFxrDebPkgName>
-    <HostFxrDebPkgName>$(HostFxrDebPkgName.ToLower())</HostFxrDebPkgName>
-    <SharedFxDebPkgName>$(DotnetRuntimeString)$(SharedFrameworkNugetVersion)</SharedFxDebPkgName>
-    <SharedFxDebPkgName>$(SharedFxDebPkgName.ToLower())</SharedFxDebPkgName>
-    <RuntimeDependenciesDebPkgName>$(DotnetRuntimeDependenciesPackageString)$(ProductVersion)</RuntimeDependenciesDebPkgName>
-    <RuntimeDependenciesDebPkgName>$(RuntimeDependenciesDebPkgName.ToLower())</RuntimeDependenciesDebPkgName>
-
   <HostPackageVersion>$(HostVersion)</HostPackageVersion>
   <HostPackageRelease>1</HostPackageRelease>
   <HostResolverPackageVersion>$(HostResolverVersion)</HostResolverPackageVersion>
@ -458,22 +449,15 @@
   <RuntimeDepsRpmPackageRelease>1</RuntimeDepsRpmPackageRelease>
  </PropertyGroup>
  
-  <PropertyGroup Condition="'$(BuildUpgradeableLinuxPackages)' == 'true'">
-    <PackageNameSuffix>$(MajorVersion).$(MinorVersion)</PackageNameSuffix>
-    <InstallerNameSuffix>-upgrade</InstallerNameSuffix>
-    
-    <SharedHostInstallerFile Condition="'$(InstallerExtension)' == '.deb' or '$(InstallerExtension)' == '.rpm' ">$(SharedHostInstallerStart)$(SharedFrameworkNugetVersion)-$(TargetArchitecture)$(InstallerNameSuffix)$(InstallerExtension)</SharedHostInstallerFile>
-    <HostFxrInstallerFile Condition="'$(InstallerExtension)' == '.deb' or '$(InstallerExtension)' == '.rpm'">$(HostFxrInstallerStart)$(HostResolverVersion)-$(TargetArchitecture)$(InstallerNameSuffix)$(InstallerExtension)</HostFxrInstallerFile>
-    <SharedFrameworkInstallerFile Condition="'$(InstallerExtension)' == '.deb' or '$(InstallerExtension)' == '.rpm'">$(SharedFrameworkInstallerStart)$(SharedFrameworkNugetVersion)-$(TargetArchitecture)$(InstallerNameSuffix)$(InstallerExtension)</SharedFrameworkInstallerFile>
+  <PropertyGroup Condition="'$(InstallerExtension)' == '.deb' or '$(InstallerExtension)' == '.rpm' ">
+
+    <PackageNameSuffix>$(MajorVersion).$(MinorVersion)</PackageNameSuffix>
+
+    <SharedHostInstallerFile Condition="'$(InstallerExtension)' == '.deb' or '$(InstallerExtension)' == '.rpm' ">$(SharedHostInstallerStart)$(SharedFrameworkNugetVersion)-$(TargetArchitecture)$(InstallerExtension)</SharedHostInstallerFile>
+    <HostFxrInstallerFile Condition="'$(InstallerExtension)' == '.deb' or '$(InstallerExtension)' == '.rpm'">$(HostFxrInstallerStart)$(HostResolverVersion)-$(TargetArchitecture)$(InstallerExtension)</HostFxrInstallerFile>
+    <SharedFrameworkInstallerFile Condition="'$(InstallerExtension)' == '.deb' or '$(InstallerExtension)' == '.rpm'">$(SharedFrameworkInstallerStart)$(SharedFrameworkNugetVersion)-$(TargetArchitecture)$(InstallerExtension)</SharedFrameworkInstallerFile>
+    <DotnetRuntimeDependenciesPackageInstallerFile>$(DotnetRuntimeDependenciesPackageInstallerStart)$(ProductMoniker)$(InstallerExtension)</DotnetRuntimeDependenciesPackageInstallerFile>

-    <DotnetRuntimeDependenciesPackageInstallerFile>$(DotnetRuntimeDependenciesPackageInstallerStart)$(ProductMoniker)$(InstallerNameSuffix)$(InstallerExtension)</DotnetRuntimeDependenciesPackageInstallerFile>
-    
-    <HostFxrDebPkgName>$(DotnetHostFxrString)$(PackageNameSuffix)</HostFxrDebPkgName>
-    <HostFxrDebPkgName>$(HostFxrDebPkgName.ToLower())</HostFxrDebPkgName>
-    <SharedFxDebPkgName>$(DotnetRuntimeString)$(PackageNameSuffix)</SharedFxDebPkgName>
-    <SharedFxDebPkgName>$(SharedFxDebPkgName.ToLower())</SharedFxDebPkgName>
-    <RuntimeDependenciesDebPkgName>$(DotnetRuntimeDependenciesPackageString)$(PackageNameSuffix)</RuntimeDependenciesDebPkgName>
-    <RuntimeDependenciesDebPkgName>$(RuntimeDependenciesDebPkgName.ToLower())</RuntimeDependenciesDebPkgName>
  </PropertyGroup>

  <PropertyGroup Condition="'$(UsingNETSdkCompiler)' != 'true'">
--- a/src/pkg/packaging/deb/package.props
+++ b/src/pkg/packaging/deb/package.props
@ -6,8 +6,16 @@
    <toolConsumerProjectName>dotnet-deb-tool-consumer.csproj</toolConsumerProjectName>
    <consumingProjectDirectory>$(IntermediateOutputRootPath)$(toolConsumerProjectName)</consumingProjectDirectory>
    <debPackaginfConfigPath>$(PackagingRoot)deb/</debPackaginfConfigPath>
+    <SharedHostDebPkgName>dotnet-host</SharedHostDebPkgName>
+    <SharedHostDebPkgName>$(SharedHostDebPkgName.ToLower())</SharedHostDebPkgName>  
+    <HostFxrDebPkgName>$(DotnetHostFxrString)$(PackageNameSuffix)</HostFxrDebPkgName>
+    <HostFxrDebPkgName>$(HostFxrDebPkgName.ToLower())</HostFxrDebPkgName>
+    <SharedFxDebPkgName>$(DotnetRuntimeString)$(PackageNameSuffix)</SharedFxDebPkgName>
+    <SharedFxDebPkgName>$(SharedFxDebPkgName.ToLower())</SharedFxDebPkgName>
+    <RuntimeDependenciesDebPkgName>$(DotnetRuntimeDependenciesPackageString)$(PackageNameSuffix)</RuntimeDependenciesDebPkgName>
+    <RuntimeDependenciesDebPkgName>$(RuntimeDependenciesDebPkgName.ToLower())</RuntimeDependenciesDebPkgName>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(BuildUpgradeableLinuxPackages)' == 'true' AND '$(InstallerExtension)' == '.deb'">
+  <PropertyGroup Condition="'$(InstallerExtension)' == '.deb'">
    
    <HostPackageVersion Condition="'$(UseShippedHostPackage)' != 'true'">$(ProductionVersion)</HostPackageVersion>
    <HostPackageVersion Condition="'$(IncludePreReleaseLabelInPackageVersion)' == 'true' AND '$(VersionSuffix)' !=''">$(ProductionVersion)~$(VersionSuffix)</HostPackageVersion>
--- a/src/pkg/packaging/rpm/package.props
+++ b/src/pkg/packaging/rpm/package.props
@ -5,28 +5,19 @@
    <rpmPackagingConfigPath>$(PackagingRoot)rpm/</rpmPackagingConfigPath>
    <SharedHostRpmPkgName>dotnet-host</SharedHostRpmPkgName>
    <SharedHostRpmPkgName>$(SharedHostRpmPkgName.ToLower())</SharedHostRpmPkgName>
-    <HostFxrRpmPkgName>dotnet-hostfxr-$(HostResolverVersion)</HostFxrRpmPkgName>
-    <HostFxrRpmPkgName>$(HostFxrRpmPkgName.ToLower())</HostFxrRpmPkgName>
-    <SharedFxRpmPkgName>dotnet-runtime-$(SharedFrameworkNugetVersion)</SharedFxRpmPkgName>
-    <SharedFxRpmPkgName>$(SharedFxRpmPkgName.ToLower())</SharedFxRpmPkgName>
-    <RuntimeDependenciesRpmPkgName>$(DotnetRuntimeDependenciesPackageString)$(ProductVersion)</RuntimeDependenciesRpmPkgName>
-    <RuntimeDependenciesRpmPkgName>$(RuntimeDependenciesRpmPkgName.ToLower())</RuntimeDependenciesRpmPkgName>
-    <TemplatesDir>$(MSBuildThisFileDirectory)/templates</TemplatesDir>
-    <ScriptsDir>$(MSBuildThisFileDirectory)/scripts</ScriptsDir>
-
-  </PropertyGroup>
-  
-  
-  
-  <PropertyGroup Condition="'$(BuildUpgradeableLinuxPackages)' == 'true' AND '$(InstallerExtension)' == '.rpm'">
-    <PackageNameSuffix>$(MajorVersion).$(MinorVersion)</PackageNameSuffix>
-    
    <HostFxrRpmPkgName>dotnet-hostfxr-$(PackageNameSuffix)</HostFxrRpmPkgName>
    <HostFxrRpmPkgName>$(HostFxrRpmPkgName.ToLower())</HostFxrRpmPkgName>
    <SharedFxRpmPkgName>dotnet-runtime-$(PackageNameSuffix)</SharedFxRpmPkgName>
    <SharedFxRpmPkgName>$(SharedFxRpmPkgName.ToLower())</SharedFxRpmPkgName>
    <RuntimeDependenciesRpmPkgName>$(DotnetRuntimeDependenciesPackageString)$(PackageNameSuffix)</RuntimeDependenciesRpmPkgName>
    <RuntimeDependenciesRpmPkgName>$(RuntimeDependenciesRpmPkgName.ToLower())</RuntimeDependenciesRpmPkgName>
+
+    <TemplatesDir>$(MSBuildThisFileDirectory)/templates</TemplatesDir>
+    <ScriptsDir>$(MSBuildThisFileDirectory)/scripts</ScriptsDir>
+
+  </PropertyGroup>
+  
+  <PropertyGroup Condition="'$(InstallerExtension)' == '.rpm'">
    
    <HostPackageVersion Condition="'$(UseShippedHostPackage)' != 'true'">$(ProductionVersion)</HostPackageVersion>