Skip to content

Commit 122520f

Browse files
baronfelbaronfel
authored
Merge pull request #953 from baronfel/fcs-july-2020
2 parents 726f133 + ad3c79f commit 122520f

File tree

162 files changed

+9046
-6020
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

162 files changed

+9046
-6020
lines changed

‎.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ scripts/*.patch
5353
/src/fsharp/FSharp.LanguageService.Compiler/pplex.fs
5454
/src/fsharp/FSharp.LanguageService.Compiler/pppars.fs
5555
/src/fsharp/FSharp.LanguageService.Compiler/pppars.fsi
56+
/src/fsharp/*/Properties/launchSettings.json
5657
/vsintegration/src/unittests/Unittests.fsi
5758
/tests/*FSharp_Failures.env
5859
/tests/*FSharp_Failures.lst
@@ -239,3 +240,7 @@ msbuild.binlog
239240
/tests/fsharp/regression/5531/compilation.output.test.txt
240241
/tests/fsharp/core/fsfromfsviacs/compilation.langversion.old.output.txt
241242
/tests/fsharp/core/fsfromfsviacs/compilation.errors.output.txt
243+
*ncrunch*.user
244+
_NCrunch_*
245+
.*crunch*.local.xml
246+
nCrunchTemp_*

‎FSharp.Profiles.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<DefineConstants>$(DefineConstants);FX_NO_WINFORMS</DefineConstants>
2020
<DefineConstants>$(DefineConstants);FX_NO_INDENTED_TEXT_WRITER</DefineConstants>
2121
<DefineConstants>$(DefineConstants);FX_RESHAPED_REFEMIT</DefineConstants>
22-
<DefineConstants>$(DefineConstants);FX_RESHAPED_MSBUILD</DefineConstants>
2322
<OtherFlags>$(OtherFlags) --simpleresolution</OtherFlags>
2423
</PropertyGroup>
2524

‎FSharpBuild.Directory.Build.targets

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<_ReplacementText>$([System.IO.File]::ReadAllText('%(NoneSubstituteText.FullPath)'))</_ReplacementText>
2020
<_ReplacementText Condition="'%(NoneSubstituteText.Pattern1)' != ''">$(_ReplacementText.Replace('%(NoneSubstituteText.Pattern1)', '%(NoneSubstituteText.Replacement1)'))</_ReplacementText>
2121
<_ReplacementText Condition="'%(NoneSubstituteText.Pattern2)' != ''">$(_ReplacementText.Replace('%(NoneSubstituteText.Pattern2)', '%(NoneSubstituteText.Replacement2)'))</_ReplacementText>
22+
<_ReplacementText Condition="'%(NoneSubstituteText.Pattern3)' != ''">$(_ReplacementText.Replace('%(NoneSubstituteText.Pattern3)', '%(NoneSubstituteText.Replacement3)'))</_ReplacementText>
2223

2324
<_CopyToOutputDirectory Condition="'%(NoneSubstituteText.CopyToOutputDirectory)' != ''">%(NoneSubstituteText.CopyToOutputDirectory)</_CopyToOutputDirectory>
2425
<_CopyToOutputDirectory Condition="'%(NoneSubstituteText.CopyToOutputDirectory)' == ''">Never</_CopyToOutputDirectory>
@@ -69,24 +70,49 @@
6970
<Target Name="BeforeResGen"
7071
Inputs="@(EmbeddedResource->'$(IntermediateOutputPath)%(Filename)%(Extension)')"
7172
Outputs="@(EmbeddedResource->'$(IntermediateOutputPath)resources\%(Filename)%(Extension)')"
72-
DependsOnTargets="CopyVsixResources"
7373
Condition="'$(Configuration)' != 'Proto' and '$(Language)'=='F#' and '$(DisableCompilerRedirection)' != 'true' ">
7474

75-
<!-- <SubstituteText EmbeddedResources="@(EmbeddedResource)">
75+
<MakeDir Directories="$(IntermediateOutputPath)" Condition="!Exists('$(IntermediateOutputPath)')" />
76+
<MakeDir Directories="$(IntermediateOutputPath)resources\" Condition="!Exists('$(IntermediateOutputPath)resources\')" />
77+
78+
<SubstituteText EmbeddedResources="@(EmbeddedResource)">
7679
<Output TaskParameter="CopiedFiles" ItemName="CopiedFiles" />
77-
</SubstituteText> -->
80+
</SubstituteText>
7881

7982
<ItemGroup>
83+
<IntermediateFiles Include="$(IntermediateOutputPath)\*.resx" />
84+
<IntermediateResourcesFiles Include="$(IntermediateOutputPath)resources\*.resx" />
85+
</ItemGroup>
86+
87+
<!-- IntermediateFiles Hashes -->
88+
<GetFileHash Files="@(IntermediateFiles)">
89+
<Output
90+
TaskParameter="Items"
91+
ItemName="IntermediateFilesHashes" />
92+
</GetFileHash>
93+
94+
<Hash ItemsToHash="@(IntermediateFilesHashes->'%(FileHash)')">
95+
<Output TaskParameter="HashResult" PropertyName="IntermediateFilesHash" />
96+
</Hash>
97+
98+
<!-- CopiedFilesForHash Hashes -->
99+
<GetFileHash Files="@(IntermediateResourceFilesForHash)">
100+
<Output
101+
TaskParameter="Items"
102+
ItemName="IntermediateResourceFilesHashes" />
103+
</GetFileHash>
104+
105+
<Hash ItemsToHash="@(IntermediateResourceFilesHashes->'%(FileHash)')">
106+
<Output TaskParameter="HashResult" PropertyName="IntermediateResourceFilesHash" />
107+
</Hash>
108+
109+
<!-- Update EmbeddedResources -->
110+
<ItemGroup Condition="'$(IntermediateFilesHash)' != '$(IntermediateResourceFilesHash)'">
80111
<EmbeddedResource Remove="@(EmbeddedResource)"/>
81112
<!-- <EmbeddedResource Include="@(CopiedFiles)"/> -->
82113
</ItemGroup>
83114

84-
<MakeDir Directories="$(IntermediateOutputPath)" Condition="!Exists('$(IntermediateOutputPath)')" />
85-
<MakeDir Directories="$(IntermediateOutputPath)resources\" Condition="!Exists('$(IntermediateOutputPath)resources\')" />
86-
</Target>
87-
88-
<Target Name="CopyVsixResources">
89-
<Copy SourceFiles="@(CopyVsixResources)" DestinationFolder="$(IntermediateOutputPath)\resources\Resources" />
115+
<Copy SourceFiles="@(CopyVsixResources)" DestinationFolder="$(IntermediateOutputPath)\resources\Resources" Condition="'$(IntermediateFilesHash)' != '$(IntermediateResourceFilesHash)'" />
90116
</Target>
91117

92118
</Project>

‎clean.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
DEAD_DIRS=(
44
"azure-pipelines.yml"
55
"DEVGUIDE.md"
6+
"eng/common"
67
"eng/common/templates"
78
"eng/common/tools.ps1"
89
"FSharp.sln"
@@ -11,10 +12,11 @@ DEAD_DIRS=(
1112
"src/fsharp/FSharp.Build"
1213
"src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuspec"
1314
"src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj"
15+
"src/fsharp/fsi/xlf"
1416
"src/fsharp/fsi/fsi.fsproj"
1517
"src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj"
16-
"src/fsharp/Microsoft.DotNet.DependencyManager/xlf"
1718
"src/fsharp/Interactive.DependencyManager/xlf"
19+
"src/fsharp/Microsoft.DotNet.DependencyManager/xlf"
1820
"src/fsharp/xlf"
1921
"TESTGUIDE.md"
2022
"tests/EndToEndBuildTests"
@@ -23,12 +25,14 @@ DEAD_DIRS=(
2325
"tests/FSharp.Compiler.Private.Scripting.UnitTests"
2426
"tests/FSharp.Compiler.UnitTests"
2527
"tests/FSharp.Core.UnitTests"
28+
"tests/FSharp.Test.Utilities"
2629
"tests/fsharp/*.fs"
2730
"tests/fsharp/Compiler"
2831
"tests/fsharp/conformance"
2932
"tests/fsharp/core"
3033
"tests/fsharp/FSharpSuite.Tests.fsproj"
3134
"tests/fsharp/regression"
35+
"tests/fsharp/SDKTests"
3236
"tests/fsharp/test-framework.fs"
3337
"tests/fsharp/tests.fs"
3438
"tests/fsharp/typecheck"

‎eng/Build.ps1

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ param (
3737
[string]$bootstrapConfiguration = "Proto",
3838
[string]$bootstrapTfm = "net472",
3939
[switch][Alias('bl')]$binaryLog,
40+
[switch][Alias('nobl')]$excludeCIBinaryLog,
4041
[switch]$ci,
4142
[switch]$official,
4243
[switch]$procdump,
@@ -69,6 +70,7 @@ function Print-Usage() {
6970
Write-Host " -verbosity <value> Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]"
7071
Write-Host " -deployExtensions Deploy built vsixes"
7172
Write-Host " -binaryLog Create MSBuild binary log (short: -bl)"
73+
Write-Host " -excludeCIBinaryLog When running on CI, allow no binary log (short: -nobl)"
7274
Write-Host ""
7375
Write-Host "Actions:"
7476
Write-Host " -restore Restore packages (short: -r)"
@@ -173,7 +175,12 @@ function BuildSolution() {
173175

174176
Write-Host "$($solution):"
175177

178+
if ($binaryLog -and $excludeCIBinaryLog) {
179+
Write-Host "Invalid argument -binarylog(-bl) and -excludeCIBinaryLog(-nobl) cannot be set at the same time"
180+
ExitWithExitCode 1
181+
}
176182
$bl = if ($binaryLog) { "/bl:" + (Join-Path $LogDir "Build.binlog") } else { "" }
183+
177184
$projects = Join-Path $RepoRoot $solution
178185
$officialBuildId = if ($official) { $env:BUILD_BUILDNUMBER } else { "" }
179186
$toolsetBuildProj = InitializeToolset
@@ -498,8 +505,10 @@ try {
498505

499506
if ($testCompiler) {
500507
if (-not $noVisualStudio) {
508+
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.ComponentTests\FSharp.Compiler.ComponentTests.fsproj" -targetFramework $desktopTargetFramework
501509
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" -targetFramework $desktopTargetFramework
502510
}
511+
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.ComponentTests\FSharp.Compiler.ComponentTests.fsproj" -targetFramework $coreclrTargetFramework
503512
TestUsingNUnit -testProject "$RepoRoot\tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj" -targetFramework $coreclrTargetFramework
504513
}
505514

‎eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20302.3">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20374.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>9b71be0663493cd0e111b55536a2e1eeb272f54c</Sha>
8+
<Sha>f6192d1e284a08ac05041d05fa6e60dec74b24f5</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎eng/Versions.props

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
<!-- Version number computation -->
1313
<PropertyGroup>
1414
<PreReleaseVersionLabel>beta</PreReleaseVersionLabel>
15-
<FSLanguageVersion>4.7</FSLanguageVersion>
15+
<FSLanguageVersion>5.0</FSLanguageVersion>
1616
<FSCoreMajorVersion>$(FSLanguageVersion)</FSCoreMajorVersion>
17-
<FSCorePackageVersion>$(FSCoreMajorVersion).3</FSCorePackageVersion>
17+
<FSCorePackageVersion>$(FSCoreMajorVersion).0</FSCorePackageVersion>
1818
<FSCoreVersionPrefix>$(FSCoreMajorVersion).0</FSCoreVersionPrefix>
1919
<FSCoreVersion>$(FSCoreVersionPrefix).0</FSCoreVersion>
2020
<!-- The current published nuget package -->
@@ -23,14 +23,14 @@
2323
<FSharpCorePreviewPackageVersion>$(FSCorePackageVersion)-$(PreReleaseVersionLabel).*</FSharpCorePreviewPackageVersion>
2424
</PropertyGroup>
2525
<PropertyGroup>
26-
<FSPackageMajorVersion>10.10</FSPackageMajorVersion>
26+
<FSPackageMajorVersion>11.0</FSPackageMajorVersion>
2727
<FSPackageVersion>$(FSPackageMajorVersion).0</FSPackageVersion>
2828
<FSProductVersionPrefix>$(FSPackageVersion)</FSProductVersionPrefix>
2929
<FSProductVersion>$(FSPackageVersion).0</FSProductVersion>
3030
</PropertyGroup>
3131
<PropertyGroup>
3232
<VSMajorVersion>16</VSMajorVersion>
33-
<VSMinorVersion>6</VSMinorVersion>
33+
<VSMinorVersion>7</VSMinorVersion>
3434
<VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
3535
<VSAssemblyVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).0</VSAssemblyVersionPrefix>
3636
<VSAssemblyVersion>$(VSAssemblyVersionPrefix).0</VSAssemblyVersion>
@@ -106,7 +106,7 @@
106106
<MicrosoftCodeAnalysisTestResourcesProprietaryVersion>2.0.17</MicrosoftCodeAnalysisTestResourcesProprietaryVersion>
107107
<MicrosoftVisualStudioLanguageServicesVersion>$(RoslynVersion)</MicrosoftVisualStudioLanguageServicesVersion>
108108
<!-- Microsoft Build packages -->
109-
<MicrosoftBuildOverallPackagesVersion>16.4</MicrosoftBuildOverallPackagesVersion>
109+
<MicrosoftBuildOverallPackagesVersion>16.6</MicrosoftBuildOverallPackagesVersion>
110110
<MicrosoftBuildVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildVersion>
111111
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildFrameworkVersion>
112112
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildTasksCoreVersion>
@@ -174,6 +174,7 @@
174174
<MicrosoftCompositionVersion>1.0.30</MicrosoftCompositionVersion>
175175
<MicrosoftMSXMLVersion>8.0.0-alpha</MicrosoftMSXMLVersion>
176176
<MicrosoftNetCompilersVersion>2.7.0</MicrosoftNetCompilersVersion>
177+
<MicrosoftNETCoreAppRefVersion>3.1.0</MicrosoftNETCoreAppRefVersion>
177178
<MicrosoftNETCoreILDAsmVersion>3.0.0-preview-27318-01</MicrosoftNETCoreILDAsmVersion>
178179
<MicrosoftNETCoreILAsmVersion>3.0.0-preview-27318-01</MicrosoftNETCoreILAsmVersion>
179180
<MicrosoftNETTestSdkVersion>16.6.1</MicrosoftNETTestSdkVersion>

‎eng/build.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,14 +201,14 @@ function BuildSolution {
201201

202202
InitializeToolset
203203
local toolset_build_proj=$_InitializeToolset
204-
204+
205205
local bl=""
206206
if [[ "$binary_log" = true ]]; then
207207
bl="/bl:\"$log_dir/Build.binlog\""
208208
fi
209-
210-
local projects="$repo_root/$solution"
211-
209+
210+
local projects="$repo_root/$solution"
211+
212212
# https://github.com/dotnet/roslyn/issues/23736
213213
local enable_analyzers=!$skip_analyzers
214214
UNAME="$(uname)"
@@ -294,6 +294,7 @@ BuildSolution
294294

295295
if [[ "$test_core_clr" == true ]]; then
296296
coreclrtestframework=netcoreapp3.1
297+
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj" --targetframework $coreclrtestframework
297298
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj" --targetframework $coreclrtestframework
298299
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharp.Compiler.Private.Scripting.UnitTests.fsproj" --targetframework $coreclrtestframework
299300
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj" --targetframework $coreclrtestframework

‎eng/release/scripts/GetPublishUrls.ps1

Lines changed: 84 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,37 @@ param (
88
Set-StrictMode -version 2.0
99
$ErrorActionPreference = "Stop"
1010

11-
try {
12-
# build map of all *.vsman files to their `info.buildVersion` values
13-
$manifestVersionMap = @{}
14-
Get-ChildItem -Path "$insertionDir\*" -Filter "*.vsman" | ForEach-Object {
15-
$manifestName = Split-Path $_ -Leaf
16-
$vsmanContents = Get-Content $_ | ConvertFrom-Json
17-
$buildVersion = $vsmanContents.info.buildVersion
18-
$manifestVersionMap.Add($manifestName, $buildVersion)
19-
}
11+
$dropUrlRegex = "(https://vsdrop\.corp\.microsoft\.com/[^\r\n;]+);([^\r\n]+)\r?\n"
2012

21-
# find all publish URLs
22-
$manifests = @()
23-
$seenManifests = @{}
24-
$url = "https://dev.azure.com/dnceng/internal/_apis/build/builds/$buildId/logs?api-version=5.1"
13+
function Invoke-WebRequestWithAccessToken([string] $uri, [string] $accessToken, [int] $retryCount = 5) {
14+
Write-Host "Fetching content from $uri"
2515
$base64 = [Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes(":$accessToken"))
2616
$headers = @{
2717
Authorization = "Basic $base64"
2818
}
29-
Write-Host "Fetching log from $url"
30-
$json = Invoke-WebRequest -Method Get -Uri $url -Headers $headers -UseBasicParsing | ConvertFrom-Json
19+
20+
for ($i = 0; $i -lt $retryCount; $i++) {
21+
try {
22+
return Invoke-WebRequest -Method Get -Uri $uri -Headers $headers -UseBasicParsing
23+
}
24+
catch {
25+
Write-Host "Invoke-WebRequest failed: $_"
26+
Start-Sleep -Seconds 1
27+
}
28+
}
29+
30+
throw "Unable to fetch $uri after $retryCount tries."
31+
}
32+
33+
# this function has to download ~500 individual logs and check each one; prone to timeouts
34+
function Get-ManifestsViaIndividualLogs([PSObject] $manifestVersionMap, [string] $buildId, [string] $accessToken) {
35+
$manifests = @()
36+
$seenManifests = @{}
37+
$json = Invoke-WebRequestWithAccessToken -uri "https://dev.azure.com/dnceng/internal/_apis/build/builds/$buildId/logs?api-version=5.1" -accessToken $accessToken | ConvertFrom-Json
3138
foreach ($l in $json.value) {
3239
$logUrl = $l.url
33-
Write-Host "Fetching log from $logUrl"
34-
$log = (Invoke-WebRequest -Method Get -Uri $logUrl -Headers $headers -UseBasicParsing).Content
35-
If ($log -Match "(https://vsdrop\.corp\.microsoft\.com/[^\r\n;]+);([^\r\n]+)\r?\n") {
40+
$log = (Invoke-WebRequestWithAccessToken -uri $logUrl -accessToken $accessToken).Content
41+
If ($log -Match $dropUrlRegex) {
3642
$manifestShortUrl = $Matches[1]
3743
$manifestName = $Matches[2]
3844
$manifestUrl = "$manifestShortUrl;$manifestName"
@@ -45,6 +51,66 @@ try {
4551
}
4652
}
4753

54+
return $manifests
55+
}
56+
57+
# this function only has to download 1 file and look at a very specific file
58+
function Get-ManifestsViaZipLog([PSObject] $manifestVersionMap, [string] $buildId, [string] $accessToken) {
59+
# create temporary location
60+
$guid = [System.Guid]::NewGuid().ToString()
61+
$tempDir = Join-Path ([System.IO.Path]::GetTempPath()) $guid
62+
New-Item -ItemType Directory -Path $tempDir | Out-Null
63+
64+
# download the logs
65+
$base64 = [Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes(":$accessToken"))
66+
$headers = @{
67+
Authorization = "Basic $base64"
68+
}
69+
$uri = "https://dev.azure.com/dnceng/internal/_apis/build/builds/$buildId/logs?`$format=zip"
70+
Invoke-WebRequest -Uri $uri -Method Get -Headers $headers -UseBasicParsing -OutFile "$tempDir/logs.zip"
71+
72+
# expand the logs
73+
New-Item -ItemType Directory -Path "$tempDir/logs" | Out-Null
74+
Expand-Archive -Path "$tempDir/logs.zip" -DestinationPath "$tempDir/logs"
75+
76+
# parse specific logs
77+
$logDir = "$tempDir/logs"
78+
$manifests = @()
79+
$seenManifests = @{}
80+
Get-ChildItem $logDir -r -inc "*Upload VSTS Drop*" | ForEach-Object {
81+
$result = Select-String -Path $_ -Pattern "(https://vsdrop\.corp\.microsoft\.com[^;]+);(.*)" -AllMatches
82+
$result.Matches | ForEach-Object {
83+
$manifestShortUrl = $_.Groups[1].Value
84+
$manifestName = $_.Groups[2].Value
85+
$manifestUrl = "$manifestShortUrl;$manifestName"
86+
If (-Not $seenManifests.Contains($manifestUrl)) {
87+
$seenManifests.Add($manifestUrl, $true)
88+
$buildVersion = $manifestVersionMap[$manifestName]
89+
$manifestEntry = "$manifestName{$buildVersion}=$manifestUrl"
90+
$manifests += $manifestEntry
91+
}
92+
}
93+
}
94+
95+
Remove-Item -Path $tempDir -Recurse
96+
97+
return $manifests
98+
}
99+
100+
try {
101+
# build map of all *.vsman files to their `info.buildVersion` values
102+
$manifestVersionMap = @{}
103+
Get-ChildItem -Path "$insertionDir\*" -Filter "*.vsman" | ForEach-Object {
104+
$manifestName = Split-Path $_ -Leaf
105+
$vsmanContents = Get-Content $_ | ConvertFrom-Json
106+
$buildVersion = $vsmanContents.info.buildVersion
107+
$manifestVersionMap.Add($manifestName, $buildVersion)
108+
}
109+
110+
# find all publish URLs
111+
#$manifests = Get-ManifestsViaIndividualLogs -manifestVersionMap $manifestVersionMap -buildId $buildId -accessToken $accessToken
112+
$manifests = Get-ManifestsViaZipLog -manifestVersionMap $manifestVersionMap -buildId $buildId -accessToken $accessToken
113+
48114
$final = $manifests -Join ","
49115
Write-Host "Setting InsertJsonValues to $final"
50116
Write-Host "##vso[task.setvariable variable=InsertJsonValues]$final"

0 commit comments

Comments
 (0)