huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update buildtools, add --env parameter to dockerbuild.sh, and allow overriding KOREBUILD_SKIP_INSTALL_NETFX

This commit is contained in:
Nate McMaster 2019-01-18 16:33:30 -08:00
parent 9e959fc9cb
commit dea1950bdc
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
6 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sh
View File

@ -278,7 +278,7 @@ msbuild_args[${#msbuild_args[*]}]="-p:_RunPack=$run_pack"
msbuild_args[${#msbuild_args[*]}]="-p:_RunTests=$run_tests" msbuild_args[${#msbuild_args[*]}]="-p:_RunTests=$run_tests"
# Disable downloading ref assemblies as a tarball. Use netfx refs from the Microsoft.NETFramework.ReferenceAssemblies NuGet package instead. # Disable downloading ref assemblies as a tarball. Use netfx refs from the Microsoft.NETFramework.ReferenceAssemblies NuGet package instead.
KOREBUILD_SKIP_INSTALL_NETFX=1 [ -z "${KOREBUILD_SKIP_INSTALL_NETFX:-}" ] && KOREBUILD_SKIP_INSTALL_NETFX=1
set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$repo_path" "$config_file" "$ci" set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$repo_path" "$config_file" "$ci"

4
build/repo.props
View File

@ -15,8 +15,8 @@
<SubmoduleRoot>$(RepositoryRoot)src\</SubmoduleRoot> <SubmoduleRoot>$(RepositoryRoot)src\</SubmoduleRoot>
<ArtifactsShippingPackagesDir>$(ArtifactsDir)\packages\$(Configuration)\Shipping\</ArtifactsShippingPackagesDir> <ArtifactsShippingPackagesDir>$(ArtifactsDir)packages\$(Configuration)\Shipping\</ArtifactsShippingPackagesDir>
<ArtifactsNonShippingPackagesDir>$(ArtifactsDir)\packages\$(Configuration)\NonShipping\</ArtifactsNonShippingPackagesDir> <ArtifactsNonShippingPackagesDir>$(ArtifactsDir)packages\$(Configuration)\NonShipping\</ArtifactsNonShippingPackagesDir>
<InstallersOutputPath>$(ArtifactsDir)installers\$(Configuration)\</InstallersOutputPath> <InstallersOutputPath>$(ArtifactsDir)installers\$(Configuration)\</InstallersOutputPath>
<SignCheckExclusionsFile>$(RepositoryRoot)eng\signcheck.exclusions.txt</SignCheckExclusionsFile> <SignCheckExclusionsFile>$(RepositoryRoot)eng\signcheck.exclusions.txt</SignCheckExclusionsFile>

8
dockerbuild.sh
View File

@ -26,6 +26,7 @@ __usage() {
echo "" echo ""
echo "Options:" echo "Options:"
echo " -v, --volume <VOLUME> An additional volume mount to add to the build container" echo " -v, --volume <VOLUME> An additional volume mount to add to the build container"
echo " -e, --env <NAME=VAL> Additional environment variables to add to the build container"
echo "" echo ""
echo "Description:" echo "Description:"
echo " This will run build.sh inside the dockerfile as defined in build/docker/\$image.Dockerfile." echo " This will run build.sh inside the dockerfile as defined in build/docker/\$image.Dockerfile."
@ -69,6 +70,13 @@ while [[ $# -gt 0 ]]; do
docker_args[${#docker_args[*]}]="--volume" docker_args[${#docker_args[*]}]="--volume"
docker_args[${#docker_args[*]}]="$volume_spec" docker_args[${#docker_args[*]}]="$volume_spec"
;; ;;
-e|--env)
shift
env_var="${1:-}"
[ -z "$env_var" ] && __error "Missing value for parameter --env" && __usage
docker_args[${#docker_args[*]}]="-e"
docker_args[${#docker_args[*]}]="$env_var"
;;
*) *)
build_args[${#build_args[*]}]="$1" build_args[${#build_args[*]}]="$1"
;; ;;

2
eng/Versions.props
View File

@ -110,7 +110,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="Build tool dependencies"> <PropertyGroup Label="Build tool dependencies">
<InternalAspNetCoreSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSdkPackageVersion> <InternalAspNetCoreSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSdkPackageVersion>
<InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">3.0.0-build-20190118.3</InternalAspNetCoreSdkPackageVersion> <InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">3.0.0-build-20190118.4</InternalAspNetCoreSdkPackageVersion>
<MicrosoftNETFrameworkReferenceAssembliesPackageVersion>1.0.0-alpha-004</MicrosoftNETFrameworkReferenceAssembliesPackageVersion> <MicrosoftNETFrameworkReferenceAssembliesPackageVersion>1.0.0-alpha-004</MicrosoftNETFrameworkReferenceAssembliesPackageVersion>
<MicrosoftNETTestSdkPackageVersion>15.9.0</MicrosoftNETTestSdkPackageVersion> <MicrosoftNETTestSdkPackageVersion>15.9.0</MicrosoftNETTestSdkPackageVersion>
</PropertyGroup> </PropertyGroup>

2
global.json
View File

@ -3,6 +3,6 @@
"version": "3.0.100-preview-009750" "version": "3.0.100-preview-009750"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Internal.AspNetCore.Sdk": "3.0.0-build-20190118.3" "Internal.AspNetCore.Sdk": "3.0.0-build-20190118.4"
} }
} }

4
korebuild-lock.txt
View File

@ -1,2 +1,2 @@
version:3.0.0-build-20190118.3 version:3.0.0-build-20190118.4
commithash:27bad0e40ebbb1b8f1d4b7143edc600974fbe3db commithash:dc060235e4056a2a5ec0141fa89da9e490544268