File tree Expand file tree Collapse file tree 2 files changed +2
-2
lines changed
eng/scripts/ArtifactAssemblerHelpers
src/Cli/ArtifactAssembler Expand file tree Collapse file tree 2 files changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ $defaultArtifactName = $env:DEFAULT_ARTIFACT_NAME
10
10
$artifactPath = Join-Path - Path $CurrentDirectory - ChildPath " $defaultArtifactAlias \$defaultArtifactName "
11
11
12
12
# Define the regex pattern to match the nupkg file (digit.digit.4digits)
13
- $regexPattern = " ^Microsoft\.Azure\.Functions\.CoreTools\.\d+\.\d+\.\d{4}\.nupkg$"
13
+ $regexPattern = " ^Microsoft\.Azure\.Functions\.CoreTools\.\d+\.\d+\.\d{4}(?:-[\w\d\-]+)? \.nupkg$"
14
14
15
15
# Look for the first nupkg file that matches the pattern in the constructed path
16
16
$fileToMove = Get-ChildItem - Path $artifactPath - Filter " *.nupkg" | Where-Object { $_.Name -match $regexPattern } | Select-Object - First 1
Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ internal static class Constants
11
11
internal const string CoreToolsHostDirectoryName = "host" ;
12
12
internal const string VisualStudioOutputArtifactDirectoryName = "coretools-visualstudio" ;
13
13
internal const string InProcOutputArtifactNameSuffix = "_inproc" ;
14
- internal const string CoreToolsProductVersionPattern = @"(\d+\.\d+\.\d+)$" ;
14
+ internal const string CoreToolsProductVersionPattern = @"(\d+\.\d+\.\d+(?:-[\w\d\-]+)? )$" ;
15
15
internal const string ArtifactNameRegexPattern = @"^(.*?)(\d+\.\d+\.\d+)$" ;
16
16
internal const string OutOfProcDirectoryName = "default" ;
17
17
internal const string CliOutputArtifactDirectoryName = "coretools-cli" ;
You can’t perform that action at this time.
0 commit comments