Skip to content

Commit 238c12d

Browse files
ShreyaLaxminarayangiritrivedi
authored andcommitted
syntax changes to get rid of linter errors
Signed-off-by: shreya <[email protected]>
1 parent a30a62a commit 238c12d

File tree

3 files changed

+21
-22
lines changed

3 files changed

+21
-22
lines changed

dotnet

Submodule dotnet updated 9905 files

dotnet-build

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -185,16 +185,15 @@ function build_sdk {
185185
fi
186186
pushd sdk
187187
if git merge-base --is-ancestor e6ec23d HEAD; then
188-
sdk_build_flags+=("/p:TargetArchitecture=$ARCH")
188+
sdk_build_flags+=("/p:TargetArchitecture=$ARCH")
189189
else
190-
sdk_build_flags+=("/p:Architecture=$ARCH")
190+
sdk_build_flags+=("/p:Architecture=$ARCH")
191191
fi
192192
if git merge-base --is-ancestor 5a42929 HEAD; then
193-
sdk_build_flags+=("/p:MicrosoftAspNetCoreAppRefPackageVersion=$aspnetcore_version"
194-
"/p:MicrosoftNETCoreAppRefPackageVersion=$runtime_version"
195-
"/p:MicrosoftAspNetCoreAppRefInternalPackageVersion=$aspnetcore_internal_version"
196-
"/p:MicrosoftNETCorePlatformsPackageVersion=$runtime_version")
197-
193+
sdk_build_flags+=("/p:MicrosoftAspNetCoreAppRefPackageVersion=$aspnetcore_version"
194+
"/p:MicrosoftNETCoreAppRefPackageVersion=$runtime_version"
195+
"/p:MicrosoftAspNetCoreAppRefInternalPackageVersion=$aspnetcore_internal_version"
196+
"/p:MicrosoftNETCorePlatformsPackageVersion=$runtime_version")
198197
fi
199198
if [ -z ${SKIP_BUILD_SDK+x} ] && [ ! -e .skip-build ]; then
200199
./build.sh "${sdk_build_flags[@]}"

dotnet-bump

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,14 @@ function echo_property {
5151
platform=10.0.1xx
5252
while [ $# -gt 0 ]; do
5353
case "$1" in
54-
--platform)
55-
shift
56-
platform=$1
57-
;;
58-
*)
59-
break
60-
;;
54+
--platform)
55+
shift
56+
platform=$1
57+
;;
58+
*)
59+
break
60+
;;
61+
6162
esac
6263
shift
6364
done
@@ -128,11 +129,11 @@ if $all_dotnet_component_versions_same; then
128129
git checkout --force "$commit_sha"
129130
cd ..
130131

131-
echo_version sdk "$sdk_version" > dotnet-versions
132+
echo_version sdk "$sdk_version" >dotnet-versions
132133
git add sdk
133-
134+
#shellcheck disable=SC2034
134135
for repo in "${repos[@]}"; do
135-
IFS=: read -r path name dep should_checkout <<< "$repo"
136+
IFS=: read -r path name dep should_checkout <<<"$repo"
136137
if $should_checkout; then
137138
sha=$(grep -A3 "\"path\": \"$path\"" dotnet/src/source-manifest.json | grep '"commitSha"' | awk -F'"' '{print $4}')
138139
cd "$path"
@@ -142,14 +143,14 @@ if $all_dotnet_component_versions_same; then
142143
git add "$path"
143144
fi
144145
version_var="${path}_version"
145-
echo_version "$path" "${!version_var}" >> dotnet-versions
146+
echo_version "$path" "${!version_var}" >>dotnet-versions
146147
done
147148
else
148149
cd sdk
149150
# installer:e0c95ad21e5eac311e454c65335008161b3e4763, 7.0.103
150151
# installer_commit="c8d103ed3c46cca9bb78098da723037e2be73bce" installer_version="8.0.100-alpha.1.23061.8"
151152
if [[ "$manifest" =~ sdk:([0-9a-f]+),\ ([^[:space:]]+) ]] ||
152-
[[ "$manifest" =~ sdk_commit=\"([0-9a-f]+)\"\ sdk_version=\"([^\"]+)\" ]]; then
153+
[[ "$manifest" =~ sdk_commit=\"([0-9a-f]+)\"\ sdk_version=\"([^\"]+)\" ]]; then
153154
sdk_sha=${BASH_REMATCH[1]}
154155
sdk_version=${BASH_REMATCH[2]}
155156
git fetch --tags
@@ -159,7 +160,7 @@ else
159160
git checkout --force "v$sdk_version"
160161
fi
161162
cd ..
162-
echo_version sdk "$sdk_version" > dotnet-versions
163+
echo_version sdk "$sdk_version" >dotnet-versions
163164
git add sdk
164165
for repo in "${repos[@]}"; do
165166
IFS=: read -r -a path_name <<<"$repo"
@@ -204,4 +205,3 @@ fi
204205
git add dotnet-versions
205206
git commit --allow-empty --message="v$sdk_version" --signoff
206207
git tag "v$sdk_version"
207-

0 commit comments

Comments
 (0)