Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'upstream/release/2.1' into merge-from-2…
Browse files Browse the repository at this point in the history 
….1.1
  • Loading branch information
@mmitche
mmitche committed Jun 12, 2018
2 parents e896368 + 6985b9f commit 210a40d
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 286 deletions.
247 changes: 0 additions & 247 deletions buildpipeline/Core-Setup-Linux-BT.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
32 changes: 8 additions & 24 deletions dir.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -458,22 +449,15 @@
<RuntimeDepsRpmPackageRelease>1</RuntimeDepsRpmPackageRelease>
</PropertyGroup>

<PropertyGroup Condition="'$(BuildUpgradeableLinuxPackages)' == 'true'">
<PropertyGroup Condition="'$(InstallerExtension)' == '.deb' or '$(InstallerExtension)' == '.rpm' ">

<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>

<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>

<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>

</PropertyGroup>

<PropertyGroup Condition="'$(UsingNETSdkCompiler)' != 'true'">
Expand Down
Loading

0 comments on commit 210a40d

Please sign in to comment.