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.
This commit is contained in:
parent
9dad822199
commit
56d34499f4
7 changed files with 26 additions and 22 deletions
|
@ -9,7 +9,7 @@
|
||||||
<MSBuild Projects="$(MSBuildThisFileDirectory)/SandBoxAndPackageInParallel.proj"
|
<MSBuild Projects="$(MSBuildThisFileDirectory)/SandBoxAndPackageInParallel.proj"
|
||||||
Targets="RunInSandBoxAndPackage"
|
Targets="RunInSandBoxAndPackage"
|
||||||
Properties="RepoRoot=$(RepoRoot);
|
Properties="RepoRoot=$(RepoRoot);
|
||||||
BuildConfiguration=$(BuildConfiguration);
|
BuildConfiguration=$(CONFIGURATION);
|
||||||
InstallerOutputDirectory=$(InstallerOutputDirectory);
|
InstallerOutputDirectory=$(InstallerOutputDirectory);
|
||||||
" />
|
" />
|
||||||
</Target>
|
</Target>
|
||||||
|
@ -27,4 +27,4 @@
|
||||||
<IsBuildingAndPublishingAllLinuxDistrosNativeInstallers>true</IsBuildingAndPublishingAllLinuxDistrosNativeInstallers>
|
<IsBuildingAndPublishingAllLinuxDistrosNativeInstallers>true</IsBuildingAndPublishingAllLinuxDistrosNativeInstallers>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Target>
|
</Target>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -3,9 +3,9 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<DotNetCoreSdkLKGVersion>2.2.100-preview1-008982</DotNetCoreSdkLKGVersion>
|
<DotNetCoreSdkLKGVersion>2.2.100-preview1-008982</DotNetCoreSdkLKGVersion>
|
||||||
<ToolsetVersion>3.0.100-alpha1-009033</ToolsetVersion>
|
<ToolsetVersion>3.0.100-alpha1-009033</ToolsetVersion>
|
||||||
<MicrosoftAspNetCoreAllPackageVersion>3.0.0-alpha1-10049</MicrosoftAspNetCoreAllPackageVersion>
|
<MicrosoftAspNetCoreAllPackageVersion>3.0.0-alpha1-10062</MicrosoftAspNetCoreAllPackageVersion>
|
||||||
<MicrosoftAspNetCoreAppPackageVersion>$(MicrosoftAspNetCoreAllPackageVersion)</MicrosoftAspNetCoreAppPackageVersion>
|
<MicrosoftAspNetCoreAppPackageVersion>$(MicrosoftAspNetCoreAllPackageVersion)</MicrosoftAspNetCoreAppPackageVersion>
|
||||||
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview1-26627-03</MicrosoftNETCoreAppPackageVersion>
|
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview1-26710-03</MicrosoftNETCoreAppPackageVersion>
|
||||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||||
<MicrosoftBuildPackageVersion>15.8.0-preview-000060</MicrosoftBuildPackageVersion>
|
<MicrosoftBuildPackageVersion>15.8.0-preview-000060</MicrosoftBuildPackageVersion>
|
||||||
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
|
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
|
||||||
|
@ -13,7 +13,7 @@
|
||||||
<MicrosoftBuildLocalizationPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildLocalizationPackageVersion>
|
<MicrosoftBuildLocalizationPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildLocalizationPackageVersion>
|
||||||
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
|
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
|
||||||
<MicrosoftFSharpCompilerPackageVersion>10.1.4-rtm-180515-0</MicrosoftFSharpCompilerPackageVersion>
|
<MicrosoftFSharpCompilerPackageVersion>10.1.4-rtm-180515-0</MicrosoftFSharpCompilerPackageVersion>
|
||||||
<MicrosoftCodeAnalysisCSharpPackageVersion>2.8.3-beta6-63026-16</MicrosoftCodeAnalysisCSharpPackageVersion>
|
<MicrosoftCodeAnalysisCSharpPackageVersion>2.8.3-beta6-63029-08</MicrosoftCodeAnalysisCSharpPackageVersion>
|
||||||
<MicrosoftCodeAnalysisBuildTasksPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisBuildTasksPackageVersion>
|
<MicrosoftCodeAnalysisBuildTasksPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisBuildTasksPackageVersion>
|
||||||
<MicrosoftNETCoreCompilersPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftNETCoreCompilersPackageVersion>
|
<MicrosoftNETCoreCompilersPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftNETCoreCompilersPackageVersion>
|
||||||
<MicrosoftCodeAnalysisBuildTasksPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisBuildTasksPackageVersion>
|
<MicrosoftCodeAnalysisBuildTasksPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisBuildTasksPackageVersion>
|
||||||
|
@ -32,8 +32,8 @@
|
||||||
<MicrosoftTemplateEngineCliLocalizationPackageVersion>$(MicrosoftTemplateEngineCliPackageVersion)</MicrosoftTemplateEngineCliLocalizationPackageVersion>
|
<MicrosoftTemplateEngineCliLocalizationPackageVersion>$(MicrosoftTemplateEngineCliPackageVersion)</MicrosoftTemplateEngineCliLocalizationPackageVersion>
|
||||||
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineCliPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
|
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineCliPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
|
||||||
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineCliPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
|
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineCliPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
|
||||||
<MicrosoftDotNetPlatformAbstractionsPackageVersion>3.0.0-preview1-26627-03</MicrosoftDotNetPlatformAbstractionsPackageVersion>
|
<MicrosoftDotNetPlatformAbstractionsPackageVersion>3.0.0-preview1-26710-03</MicrosoftDotNetPlatformAbstractionsPackageVersion>
|
||||||
<MicrosoftExtensionsDependencyModelPackageVersion>3.0.0-preview1-26627-03</MicrosoftExtensionsDependencyModelPackageVersion>
|
<MicrosoftExtensionsDependencyModelPackageVersion>3.0.0-preview1-26710-03</MicrosoftExtensionsDependencyModelPackageVersion>
|
||||||
<MicrosoftDotNetCliCommandLinePackageVersion>0.1.1-rtm-62915-03</MicrosoftDotNetCliCommandLinePackageVersion>
|
<MicrosoftDotNetCliCommandLinePackageVersion>0.1.1-rtm-62915-03</MicrosoftDotNetCliCommandLinePackageVersion>
|
||||||
<MicrosoftDotNetProjectJsonMigrationPackageVersion>1.3.1-rtm-62915-03</MicrosoftDotNetProjectJsonMigrationPackageVersion>
|
<MicrosoftDotNetProjectJsonMigrationPackageVersion>1.3.1-rtm-62915-03</MicrosoftDotNetProjectJsonMigrationPackageVersion>
|
||||||
<MicrosoftDotNetToolsMigrateCommandPackageVersion>$(MicrosoftDotNetProjectJsonMigrationPackageVersion)</MicrosoftDotNetToolsMigrateCommandPackageVersion>
|
<MicrosoftDotNetToolsMigrateCommandPackageVersion>$(MicrosoftDotNetProjectJsonMigrationPackageVersion)</MicrosoftDotNetToolsMigrateCommandPackageVersion>
|
||||||
|
|
|
@ -48,7 +48,7 @@
|
||||||
<Target Name="PackageWithDocker" DependsOnTargets="PrepareSandBox">
|
<Target Name="PackageWithDocker" DependsOnTargets="PrepareSandBox">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<CommandToInvokeBuildScriptInDockerToPackageInSandBox>$(SandBoxRepoRoot)/build.sh</CommandToInvokeBuildScriptInDockerToPackageInSandBox>
|
<CommandToInvokeBuildScriptInDockerToPackageInSandBox>$(SandBoxRepoRoot)/build.sh</CommandToInvokeBuildScriptInDockerToPackageInSandBox>
|
||||||
<CommandToInvokeBuildScriptInDockerToPackageInSandBox>$(CommandToInvokeBuildScriptInDockerToPackageInSandBox) --configuration $(BuildConfiguration)</CommandToInvokeBuildScriptInDockerToPackageInSandBox>
|
<CommandToInvokeBuildScriptInDockerToPackageInSandBox>$(CommandToInvokeBuildScriptInDockerToPackageInSandBox) --configuration $(CONFIGURATION)</CommandToInvokeBuildScriptInDockerToPackageInSandBox>
|
||||||
<CommandToInvokeBuildScriptInDockerToPackageInSandBox>$(CommandToInvokeBuildScriptInDockerToPackageInSandBox) --docker $(DockerFolder)</CommandToInvokeBuildScriptInDockerToPackageInSandBox>
|
<CommandToInvokeBuildScriptInDockerToPackageInSandBox>$(CommandToInvokeBuildScriptInDockerToPackageInSandBox) --docker $(DockerFolder)</CommandToInvokeBuildScriptInDockerToPackageInSandBox>
|
||||||
<CommandToInvokeBuildScriptInDockerToPackageInSandBox>$(CommandToInvokeBuildScriptInDockerToPackageInSandBox) --skip-prereqs</CommandToInvokeBuildScriptInDockerToPackageInSandBox>
|
<CommandToInvokeBuildScriptInDockerToPackageInSandBox>$(CommandToInvokeBuildScriptInDockerToPackageInSandBox) --skip-prereqs</CommandToInvokeBuildScriptInDockerToPackageInSandBox>
|
||||||
<CommandToInvokeBuildScriptInDockerToPackageInSandBox>$(CommandToInvokeBuildScriptInDockerToPackageInSandBox) /t:GenerateInstallersAndCopyOutOfSandBox</CommandToInvokeBuildScriptInDockerToPackageInSandBox>
|
<CommandToInvokeBuildScriptInDockerToPackageInSandBox>$(CommandToInvokeBuildScriptInDockerToPackageInSandBox) /t:GenerateInstallersAndCopyOutOfSandBox</CommandToInvokeBuildScriptInDockerToPackageInSandBox>
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
Properties="RepoRoot=$(RepoRoot);
|
Properties="RepoRoot=$(RepoRoot);
|
||||||
LinuxDistrosNeedNativeInstaller=%(LinuxDistrosNeedNativeInstaller.Identity);
|
LinuxDistrosNeedNativeInstaller=%(LinuxDistrosNeedNativeInstaller.Identity);
|
||||||
DockerFolder=%(LinuxDistrosNeedNativeInstaller.DockerFolder);
|
DockerFolder=%(LinuxDistrosNeedNativeInstaller.DockerFolder);
|
||||||
BuildConfiguration=$(BuildConfiguration);
|
BuildConfiguration=$(CONFIGURATION);
|
||||||
InstallerOutputDirectory=$(InstallerOutputDirectory);
|
InstallerOutputDirectory=$(InstallerOutputDirectory);
|
||||||
BuildInParallel='true'" />
|
BuildInParallel='true'" />
|
||||||
</Target >
|
</Target >
|
||||||
|
|
|
@ -5,17 +5,11 @@
|
||||||
|
|
||||||
<Import Project="Installer.DEB.targets" />
|
<Import Project="Installer.DEB.targets" />
|
||||||
|
|
||||||
<!--
|
|
||||||
https://github.com/dotnet/core-sdk/issues/27
|
|
||||||
|
|
||||||
Add the following back to DependsOnTargets once the aspnetcore base runtime version file is fixed:
|
|
||||||
BuildSdkDeb;
|
|
||||||
TestSdkDeb;
|
|
||||||
-->
|
|
||||||
|
|
||||||
<Target Name="GenerateDebs"
|
<Target Name="GenerateDebs"
|
||||||
DependsOnTargets="SetupDebProps;
|
DependsOnTargets="SetupDebProps;
|
||||||
TestDebuild;"
|
TestDebuild;
|
||||||
|
BuildSdkDeb;
|
||||||
|
TestSdkDeb;"
|
||||||
Condition=" '$(IsDebianBaseDistro)' == 'True' "
|
Condition=" '$(IsDebianBaseDistro)' == 'True' "
|
||||||
Outputs="@(GeneratedInstallers)"/>
|
Outputs="@(GeneratedInstallers)"/>
|
||||||
|
|
||||||
|
@ -25,6 +19,9 @@
|
||||||
<AspNetSimpleVersion>$(AspNetCoreSharedFxBaseRuntimeVersion)</AspNetSimpleVersion>
|
<AspNetSimpleVersion>$(AspNetCoreSharedFxBaseRuntimeVersion)</AspNetSimpleVersion>
|
||||||
<AspNetSimpleVersion Condition=" '$(AspNetVersionPrereleaseSeparator)' != -1 ">$(AspNetCoreSharedFxBaseRuntimeVersion.Substring(0, $(AspNetVersionPrereleaseSeparator)))</AspNetSimpleVersion>
|
<AspNetSimpleVersion Condition=" '$(AspNetVersionPrereleaseSeparator)' != -1 ">$(AspNetCoreSharedFxBaseRuntimeVersion.Substring(0, $(AspNetVersionPrereleaseSeparator)))</AspNetSimpleVersion>
|
||||||
|
|
||||||
|
<AspNetVersionPatchSeparator>$(AspNetSimpleVersion.LastIndexOf('.'))</AspNetVersionPatchSeparator>
|
||||||
|
<AspNetSimpleVersion Condition=" '$(AspNetVersionPatchSeparator)' != -1 ">$(AspNetSimpleVersion.Substring(0, $(AspNetVersionPatchSeparator)))</AspNetSimpleVersion>
|
||||||
|
|
||||||
<!-- dotnet-runtime package may not currently be available -->
|
<!-- dotnet-runtime package may not currently be available -->
|
||||||
<InstallAspNetCoreSharedFxArgs>--ignore-depends=dotnet-runtime-$(AspNetSimpleVersion)</InstallAspNetCoreSharedFxArgs>
|
<InstallAspNetCoreSharedFxArgs>--ignore-depends=dotnet-runtime-$(AspNetSimpleVersion)</InstallAspNetCoreSharedFxArgs>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
|
@ -11,6 +11,7 @@ def branch = GithubBranchName
|
||||||
def isPR = true
|
def isPR = true
|
||||||
|
|
||||||
def platformList = [
|
def platformList = [
|
||||||
|
'AllLinux:x64:Release',
|
||||||
'CentOS7.1:x64:Debug',
|
'CentOS7.1:x64:Debug',
|
||||||
'Debian8.2:x64:Debug',
|
'Debian8.2:x64:Debug',
|
||||||
'fedora.27:x64:Debug',
|
'fedora.27:x64:Debug',
|
||||||
|
@ -83,6 +84,10 @@ set DOTNET_CLI_UI_LANGUAGE=es
|
||||||
osVersionUsedForMachineAffinity = 'latest-docker'
|
osVersionUsedForMachineAffinity = 'latest-docker'
|
||||||
buildCommand = "./build.sh --linux-portable --skip-prereqs --configuration ${configuration} --docker ${os} --targets Default"
|
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 {
|
else {
|
||||||
// Jenkins non-Ubuntu CI machines don't have docker
|
// Jenkins non-Ubuntu CI machines don't have docker
|
||||||
buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --targets Default"
|
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.setMachineAffinity(newJob, osUsedForMachineAffinity, osVersionUsedForMachineAffinity)
|
||||||
Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")
|
Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")
|
||||||
// ARM CI runs are build only.
|
// ARM and AllLinux CI runs are build only.
|
||||||
if ((architecture != 'arm') && (architecture != 'arm64')) {
|
if ((architecture != 'arm') && (architecture != 'arm64') && (os != 'AllLinux')) {
|
||||||
Utilities.addMSTestResults(newJob, '**/*.trx')
|
Utilities.addMSTestResults(newJob, '**/*.trx')
|
||||||
}
|
}
|
||||||
Utilities.addGithubPRTriggerForBranch(newJob, branch, "${os} ${architecture} ${configuration} Build")
|
Utilities.addGithubPRTriggerForBranch(newJob, branch, "${os} ${architecture} ${configuration} Build")
|
||||||
|
|
|
@ -49,7 +49,7 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
|
||||||
done
|
done
|
||||||
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
|
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
|
||||||
REPOROOT="$DIR"
|
REPOROOT="$DIR"
|
||||||
|
CONFIGURATION="debug"
|
||||||
ARCHITECTURE="x64"
|
ARCHITECTURE="x64"
|
||||||
STAGE0_SOURCE_DIR=
|
STAGE0_SOURCE_DIR=
|
||||||
|
|
||||||
|
@ -69,7 +69,7 @@ while [[ $# > 0 ]]; do
|
||||||
lowerI="$(echo $1 | awk '{print tolower($0)}')"
|
lowerI="$(echo $1 | awk '{print tolower($0)}')"
|
||||||
case $lowerI in
|
case $lowerI in
|
||||||
-c|--configuration)
|
-c|--configuration)
|
||||||
export CONFIGURATION=$2
|
CONFIGURATION=$2
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
--nopackage)
|
--nopackage)
|
||||||
|
@ -125,6 +125,8 @@ while [[ $# > 0 ]]; do
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
|
|
||||||
|
export CONFIGURATION=$CONFIGURATION
|
||||||
|
|
||||||
# The first 'pass' call to "dotnet msbuild build.proj" has a hard-coded "WriteDynamicPropsToStaticPropsFiles" target
|
# 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'.
|
# therefore, this call should not have other targets defined. Remove all targets passed in as 'extra parameters'.
|
||||||
argsnotargets=( )
|
argsnotargets=( )
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue