Responding to PR feedback.
Modified the .gitignore also to exclude vim swap files.
This commit is contained in:
parent
ae78068481
commit
810e66b8fd
6 changed files with 17 additions and 7 deletions
5
.gitignore
vendored
5
.gitignore
vendored
|
@ -269,3 +269,8 @@ _Pvt_Extensions
|
|||
# Exceptions
|
||||
# Build Scripts
|
||||
!scripts/build/
|
||||
test/PackagedCommands/Consumers/*/project.json
|
||||
|
||||
# Vim swp files
|
||||
*.swp
|
||||
*.*~
|
||||
|
|
Binary file not shown.
|
@ -17,6 +17,7 @@ _ "$RepoRoot\packaging\nuget\package.ps1" @("$Stage2Dir\bin", "$env:VersionSuffi
|
|||
|
||||
header "Generating version badge"
|
||||
$VersionBadge = "$RepoRoot\resources\images\version_badge.svg"
|
||||
(get-content $VersionBadge).replace("ver_number", "$env:DOTNET_CLI_VERSION") | set-content $VersionBadge
|
||||
$BadgeDestination = "$RepoRoot\artifacts\version_badge.svg"
|
||||
(get-content $VersionBadge).replace("ver_number", "$env:DOTNET_CLI_VERSION") | set-content $BadgeDestination
|
||||
|
||||
& "$RepoRoot\publish\publish.ps1" -file $VersionBadge
|
||||
& "$RepoRoot\publish\publish.ps1" -file $BadgeDestination
|
||||
|
|
|
@ -21,6 +21,7 @@ if [ -z "$DOTNET_CLI_VERSION" ]; then
|
|||
fi
|
||||
|
||||
$VERSION_BADGE="$REPOROOT/resources/images/version_badge.svg"
|
||||
$BADGE_DESTINATION="$REPOROOT/artifacts/version_badge.svg"
|
||||
|
||||
header "Generating tarball"
|
||||
$DIR/package-dnvm.sh
|
||||
|
@ -29,8 +30,8 @@ header "Generating Native Installer"
|
|||
$DIR/package-native.sh
|
||||
|
||||
header "Generating version badge"
|
||||
sed -i "s/ver_number/$DOTNET_CLI_VERSION/g" $VERSION_BADGE
|
||||
sed "s/ver_number/$DOTNET_CLI_VERSION/g" $VERSION_BADGE > $BADGE_DESTINATION
|
||||
|
||||
header "Publishing version badge"
|
||||
$REPOROOT/scripts/publish/publish.sh $VERSION_BADGE
|
||||
$REPOROOT/scripts/publish/publish.sh $BADGE_DESTINATION
|
||||
|
||||
|
|
|
@ -144,6 +144,8 @@ function UploadVersionBadge($badgeFile)
|
|||
|
||||
Write-Host "Uploading the version badge to $env:DOTNET_CLI_VERSION"
|
||||
UploadFile "dev/Binaries/$env:DOTNET_CLI_VERSION/$filename" $badgeFile
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
if(!(CheckRequiredVariables))
|
||||
|
@ -169,8 +171,7 @@ elseif([System.IO.Path]::GetExtension($file).ToLower() -eq ".msi")
|
|||
}
|
||||
elseif ([System.IO.Path]::GetExtension($file).ToLower() -eq ".svg")
|
||||
{
|
||||
UploadVersionBadge $file
|
||||
$result = $true
|
||||
$result = UploadVersionBadge $file
|
||||
}
|
||||
|
||||
exit $result
|
||||
|
|
|
@ -48,7 +48,7 @@ execute(){
|
|||
result=$?
|
||||
elif [[ $UPLOAD_FILE == *.svg ]]; then
|
||||
upload_version_badge $UPLOAD_FILE
|
||||
result=0
|
||||
result=$?
|
||||
fi
|
||||
|
||||
exit $result
|
||||
|
@ -198,6 +198,8 @@ upload_version_badge(){
|
|||
|
||||
echo "Uploading the version badge to $DOTNET_CLI_VERSION"
|
||||
upload_file_to_blob_storage_azure_cli "dev/Binaries/$DOTNET_CLI_VERSION/$filename" $badgefile
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue