From 56d34499f4ddfcde122e947013204769d1af1a19 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Thu, 12 Jul 2018 16:20:39 -0700 Subject: [PATCH] Update ASP.NET version; Core-SDK (#30) * Add an 'AllLinux' build and package CI leg. * Update ASP.NET version. * Remove the 'patch' number for the parameter: "sudo dpkg --ignore-depends=dotnet-runtime-X.X" * Update variable name. * Update coresetup, coresetup, coresetup, roslyn versions. * Use "CONFIGURATION" not "BuildConfiguration"; "CONFIGURATION" has a "debug" default. * 'AllLinux' CI legs and build only; no tests. --- ...PublishAllLinuxDistrosNativeInstallers.targets | 4 ++-- build/DependencyVersions.props | 10 +++++----- build/SandBoxAndPackage.proj | 2 +- build/SandBoxAndPackageInParallel.proj | 2 +- build/package/Installer.DEB.proj | 15 ++++++--------- netci.groovy | 9 +++++++-- run-build.sh | 6 ++++-- 7 files changed, 26 insertions(+), 22 deletions(-) diff --git a/build/BuildAndPublishAllLinuxDistrosNativeInstallers.targets b/build/BuildAndPublishAllLinuxDistrosNativeInstallers.targets index a38343a30..28d2c8b2d 100644 --- a/build/BuildAndPublishAllLinuxDistrosNativeInstallers.targets +++ b/build/BuildAndPublishAllLinuxDistrosNativeInstallers.targets @@ -9,7 +9,7 @@ @@ -27,4 +27,4 @@ true - \ No newline at end of file + diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 4ca2d5767..9492044da 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -3,9 +3,9 @@ 2.2.100-preview1-008982 3.0.100-alpha1-009033 - 3.0.0-alpha1-10049 + 3.0.0-alpha1-10062 $(MicrosoftAspNetCoreAllPackageVersion) - 3.0.0-preview1-26627-03 + 3.0.0-preview1-26710-03 $(MicrosoftNETCoreAppPackageVersion) 15.8.0-preview-000060 $(MicrosoftBuildPackageVersion) @@ -13,7 +13,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) 10.1.4-rtm-180515-0 - 2.8.3-beta6-63026-16 + 2.8.3-beta6-63029-08 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) @@ -32,8 +32,8 @@ $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) - 3.0.0-preview1-26627-03 - 3.0.0-preview1-26627-03 + 3.0.0-preview1-26710-03 + 3.0.0-preview1-26710-03 0.1.1-rtm-62915-03 1.3.1-rtm-62915-03 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) diff --git a/build/SandBoxAndPackage.proj b/build/SandBoxAndPackage.proj index 1387402eb..54b0b7d9d 100644 --- a/build/SandBoxAndPackage.proj +++ b/build/SandBoxAndPackage.proj @@ -48,7 +48,7 @@ $(SandBoxRepoRoot)/build.sh - $(CommandToInvokeBuildScriptInDockerToPackageInSandBox) --configuration $(BuildConfiguration) + $(CommandToInvokeBuildScriptInDockerToPackageInSandBox) --configuration $(CONFIGURATION) $(CommandToInvokeBuildScriptInDockerToPackageInSandBox) --docker $(DockerFolder) $(CommandToInvokeBuildScriptInDockerToPackageInSandBox) --skip-prereqs $(CommandToInvokeBuildScriptInDockerToPackageInSandBox) /t:GenerateInstallersAndCopyOutOfSandBox diff --git a/build/SandBoxAndPackageInParallel.proj b/build/SandBoxAndPackageInParallel.proj index 43a8300fc..735ecf99a 100644 --- a/build/SandBoxAndPackageInParallel.proj +++ b/build/SandBoxAndPackageInParallel.proj @@ -9,7 +9,7 @@ Properties="RepoRoot=$(RepoRoot); LinuxDistrosNeedNativeInstaller=%(LinuxDistrosNeedNativeInstaller.Identity); DockerFolder=%(LinuxDistrosNeedNativeInstaller.DockerFolder); - BuildConfiguration=$(BuildConfiguration); + BuildConfiguration=$(CONFIGURATION); InstallerOutputDirectory=$(InstallerOutputDirectory); BuildInParallel='true'" /> diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj index a95d886a6..5de34c5d4 100644 --- a/build/package/Installer.DEB.proj +++ b/build/package/Installer.DEB.proj @@ -5,17 +5,11 @@ - - @@ -25,6 +19,9 @@ $(AspNetCoreSharedFxBaseRuntimeVersion) $(AspNetCoreSharedFxBaseRuntimeVersion.Substring(0, $(AspNetVersionPrereleaseSeparator))) + $(AspNetSimpleVersion.LastIndexOf('.')) + $(AspNetSimpleVersion.Substring(0, $(AspNetVersionPatchSeparator))) + --ignore-depends=dotnet-runtime-$(AspNetSimpleVersion) diff --git a/netci.groovy b/netci.groovy index dcf07e91d..117c07b5b 100644 --- a/netci.groovy +++ b/netci.groovy @@ -11,6 +11,7 @@ def branch = GithubBranchName def isPR = true def platformList = [ + 'AllLinux:x64:Release', 'CentOS7.1:x64:Debug', 'Debian8.2:x64:Debug', 'fedora.27:x64:Debug', @@ -83,6 +84,10 @@ set DOTNET_CLI_UI_LANGUAGE=es osVersionUsedForMachineAffinity = 'latest-docker' buildCommand = "./build.sh --linux-portable --skip-prereqs --configuration ${configuration} --docker ${os} --targets Default" } + else if (os == 'AllLinux') { + osUsedForMachineAffinity = 'Ubuntu16.04' + buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --targets Default /t:BuildAndPublishAllLinuxDistrosNativeInstallers" + } else { // Jenkins non-Ubuntu CI machines don't have docker buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --targets Default" @@ -104,8 +109,8 @@ set DOTNET_CLI_UI_LANGUAGE=es Utilities.setMachineAffinity(newJob, osUsedForMachineAffinity, osVersionUsedForMachineAffinity) Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}") - // ARM CI runs are build only. - if ((architecture != 'arm') && (architecture != 'arm64')) { + // ARM and AllLinux CI runs are build only. + if ((architecture != 'arm') && (architecture != 'arm64') && (os != 'AllLinux')) { Utilities.addMSTestResults(newJob, '**/*.trx') } Utilities.addGithubPRTriggerForBranch(newJob, branch, "${os} ${architecture} ${configuration} Build") diff --git a/run-build.sh b/run-build.sh index a87710eae..fec9640da 100755 --- a/run-build.sh +++ b/run-build.sh @@ -49,7 +49,7 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli done DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" REPOROOT="$DIR" - +CONFIGURATION="debug" ARCHITECTURE="x64" STAGE0_SOURCE_DIR= @@ -69,7 +69,7 @@ while [[ $# > 0 ]]; do lowerI="$(echo $1 | awk '{print tolower($0)}')" case $lowerI in -c|--configuration) - export CONFIGURATION=$2 + CONFIGURATION=$2 shift ;; --nopackage) @@ -125,6 +125,8 @@ while [[ $# > 0 ]]; do shift done +export CONFIGURATION=$CONFIGURATION + # The first 'pass' call to "dotnet msbuild build.proj" has a hard-coded "WriteDynamicPropsToStaticPropsFiles" target # therefore, this call should not have other targets defined. Remove all targets passed in as 'extra parameters'. argsnotargets=( )