File tree Expand file tree Collapse file tree 3 files changed +12
-12
lines changed
Expand file tree Collapse file tree 3 files changed +12
-12
lines changed Original file line number Diff line number Diff line change @@ -96,7 +96,7 @@ function build_runtime {
9696 if [ " $runtime_version_label " = servicing ]; then
9797 cp " artifacts/packages/$runtime_conf /NonShipping/Microsoft.NETCore.ILAsm.$runtime_version_prefix -" @ (dev| ci)* " .nupkg" " $OUTPUTDIR "
9898 cp " artifacts/packages/$runtime_conf /NonShipping/Microsoft.NETCore.ILDAsm.$runtime_version_prefix -" @ (dev| ci)** " .nupkg" " $OUTPUTDIR "
99- cp " artifacts/packages/$runtime_conf /NonShipping/runtime.linux-$ARCH .Microsoft.NETCore.ILAsm.$runtime_version_prefix -" @ (dev| ci)* " .nupkg" " $OUTPUTDIR "
99+ cp " artifacts/packages/$runtime_conf /NonShipping/runtime.linux-$ARCH .Microsoft.NETCore.ILAsm.$runtime_version_prefix -" @ (dev| ci)* " .nupkg" " $OUTPUTDIR "
100100 cp " artifacts/packages/$runtime_conf /NonShipping/runtime.linux-$ARCH .Microsoft.NETCore.ILDAsm.$runtime_version_prefix -" @ (dev| ci)* " .nupkg" " $OUTPUTDIR "
101101 else
102102 cp " artifacts/packages/$runtime_conf /Shipping/runtime.linux-$ARCH .Microsoft.NETCore.ILAsm.$runtime_version .nupkg" " $OUTPUTDIR "
@@ -216,10 +216,10 @@ function build_aspnetcore {
216216 # aspnetcore no longer supports downloading runtime from custom URLs.
217217 mkdir -p artifacts/obj/Microsoft.AspNetCore.App.Runtime
218218 cp " $DOWNLOADDIR /Runtime/$runtime_version /dotnet-runtime-$runtime_version -linux-$ARCH .tar.gz" \
219- artifacts/obj/Microsoft.AspNetCore.App.Runtime/
219+ artifacts/obj/Microsoft.AspNetCore.App.Runtime/
220220 if [ " $runtime_version " != " $aspnetcore_runtime_version " ]; then
221- cp " $DOWNLOADDIR /Runtime/$aspnetcore_transport_version /dotnet-runtime-$aspnetcore_runtime_version -linux-$ARCH .tar.gz" \
222- artifacts/obj/Microsoft.AspNetCore.App.Runtime/
221+ cp " $DOWNLOADDIR /Runtime/$aspnetcore_transport_version /dotnet-runtime-$aspnetcore_runtime_version -linux-$ARCH .tar.gz" \
222+ artifacts/obj/Microsoft.AspNetCore.App.Runtime/
223223 fi
224224 # Run build script multiple times to work around yarn race condition
225225 for i in $( seq 1 3) ; do
Original file line number Diff line number Diff line change @@ -41,7 +41,7 @@ function echo_property {
4141
4242 value=$( xmllint --xpath " /Project/PropertyGroup/${property} /text()" " $path " )
4343 # shellcheck disable=SC2016
44- if [ " ${value: 0: 2} " = ' $(' ] && [ " ${value: ${# value} - 1} " = ' )' ]; then
44+ if [ " ${value: 0: 2} " = ' $(' ] && [ " ${value: ${# value} - 1} " = ' )' ]; then
4545 echo_property " $name " " $path " " ${value: 2:- 1} "
4646 else
4747 echo " $name =$value "
7575manifest=$( curl -L " $url " )
7676# installer:e0c95ad21e5eac311e454c65335008161b3e4763, 7.0.103
7777# installer_commit="c8d103ed3c46cca9bb78098da723037e2be73bce" installer_version="8.0.100-alpha.1.23061.8"
78- if [[ " $manifest " =~ installer:([0-9a-f]+),\ ([^[:space:]]+) ]] || \
79- [[ " $manifest " =~ installer_commit= \" ([0-9a-f]+)\"\ installer_version= \" ([^\" ]+)\" ]]; then
78+ if [[ " $manifest " =~ installer:([0-9a-f]+),\ ([^[:space:]]+) ]] ||
79+ [[ " $manifest " =~ installer_commit= \" ([0-9a-f]+)\"\ installer_version= \" ([^\" ]+)\" ]]; then
8080 installer_sha=${BASH_REMATCH[1]}
8181 installer_version=${BASH_REMATCH[2]}
8282 git fetch --tags
9898echo_version installer " $installer_version " > dotnet-versions
9999git add installer
100100for repo in " ${repos[@]} " ; do
101- IFS=: read -r -a path_name <<< " $repo"
101+ IFS=: read -r -a path_name <<< " $repo"
102102 xpath=" string(/Dependencies/ProductDependencies/Dependency[@Name=\" ${path_name[2]} \" ]/@Version)"
103103 version=$( xmllint --xpath " $xpath " " ${path_name[1]} " /eng/Version.Details.xml)
104104 if " ${path_name[3]} " ; then
Original file line number Diff line number Diff line change @@ -45,10 +45,10 @@ function backport {
4545 fi
4646 for commitid in $commitids ; do
4747 if [ -e " $commitid " ]; then
48- continue
48+ continue
4949 fi
5050 if git merge-base --is-ancestor " $commitid " HEAD; then
51- return
51+ return
5252 fi
5353 done
5454 for commitid in $commitids ; do
@@ -123,8 +123,8 @@ function prepare_msbuild {
123123 # downloaded binaries are good enough.
124124 fi
125125 # https://github.com/dotnet/msbuild/pull/7731
126- if git merge-base --is-ancestor 67deba37040a HEAD && \
127- ! git merge-base --is-ancestor 486a4599f4a5 HEAD; then
126+ if git merge-base --is-ancestor 67deba37040a HEAD &&
127+ ! git merge-base --is-ancestor 486a4599f4a5 HEAD; then
128128 git cherry-pick 486a4599f4a5
129129 need_msbuild=1
130130 fi
You can’t perform that action at this time.
0 commit comments