Skip to content

Commit 2c9fc2b

Browse files
vatsan-madhavanvatsan-madhavan
committed
Merge branch 'master' into dev/vatsan/preview8-rel30-snap
2 parents 0a13e75 + a706c2f commit 2c9fc2b

28 files changed

+407
-213
lines changed

‎eng/Version.Details.xml‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,87 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Private.Winforms" Version="4.8.0-preview8.19374.7">
4+
<Dependency Name="Microsoft.Private.Winforms" Version="4.8.0-preview8.19379.9">
55
<Uri>https://github.com/dotnet/winforms</Uri>
6-
<Sha>f18f93d0163a3cca64634b6c7c424833b1659be0</Sha>
6+
<Sha>b0e49f17123cda852fecfc4610036f31de0d3b94</Sha>
77
</Dependency>
88
</ProductDependencies>
99
<ToolsetDependencies>
10-
<Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App">
10+
<Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App">
1111
<Uri>https://github.com/dotnet/corefx</Uri>
12-
<Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
12+
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
1313
</Dependency>
14-
<Dependency Name="System.CodeDom" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App">
14+
<Dependency Name="System.CodeDom" Version="4.6.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App">
1515
<Uri>https://github.com/dotnet/corefx</Uri>
16-
<Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
16+
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
1717
</Dependency>
18-
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App">
18+
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App">
1919
<Uri>https://github.com/dotnet/corefx</Uri>
20-
<Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
20+
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
2121
</Dependency>
22-
<Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App">
22+
<Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App">
2323
<Uri>https://github.com/dotnet/corefx</Uri>
24-
<Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
24+
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
2525
</Dependency>
26-
<Dependency Name="System.DirectoryServices" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App">
26+
<Dependency Name="System.DirectoryServices" Version="4.6.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App">
2727
<Uri>https://github.com/dotnet/corefx</Uri>
28-
<Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
28+
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
2929
</Dependency>
30-
<Dependency Name="System.Drawing.Common" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App">
30+
<Dependency Name="System.Drawing.Common" Version="4.6.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App">
3131
<Uri>https://github.com/dotnet/corefx</Uri>
32-
<Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
32+
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
3333
</Dependency>
34-
<Dependency Name="System.Reflection.Emit" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App">
34+
<Dependency Name="System.Reflection.Emit" Version="4.6.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App">
3535
<Uri>https://github.com/dotnet/corefx</Uri>
36-
<Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
36+
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
3737
</Dependency>
38-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App">
38+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="4.6.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App">
3939
<Uri>https://github.com/dotnet/corefx</Uri>
40-
<Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
40+
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
4141
</Dependency>
42-
<Dependency Name="System.Security.AccessControl" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App">
42+
<Dependency Name="System.Security.AccessControl" Version="4.6.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App">
4343
<Uri>https://github.com/dotnet/corefx</Uri>
44-
<Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
44+
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
4545
</Dependency>
46-
<Dependency Name="System.Security.Cryptography.Xml" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App">
46+
<Dependency Name="System.Security.Cryptography.Xml" Version="4.6.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App">
4747
<Uri>https://github.com/dotnet/corefx</Uri>
48-
<Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
48+
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
4949
</Dependency>
50-
<Dependency Name="System.Security.Permissions" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App">
50+
<Dependency Name="System.Security.Permissions" Version="4.6.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App">
5151
<Uri>https://github.com/dotnet/corefx</Uri>
52-
<Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
52+
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
5353
</Dependency>
54-
<Dependency Name="System.Security.Principal.Windows" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App">
54+
<Dependency Name="System.Security.Principal.Windows" Version="4.6.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App">
5555
<Uri>https://github.com/dotnet/corefx</Uri>
56-
<Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
56+
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
5757
</Dependency>
58-
<Dependency Name="System.Windows.Extensions" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App">
58+
<Dependency Name="System.Windows.Extensions" Version="4.6.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App">
5959
<Uri>https://github.com/dotnet/corefx</Uri>
60-
<Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
60+
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview8-28373-17" CoherentParentDependency="Microsoft.Private.Winforms">
62+
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview8-28379-03" CoherentParentDependency="Microsoft.Private.Winforms">
6363
<Uri>https://github.com/dotnet/core-setup</Uri>
64-
<Sha>5d8d5e866113c9f144136a04222f191456dfff1d</Sha>
64+
<Sha>915722554dc08a7075f89eddb40691caca23b6be</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19375.2">
66+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19378.1">
6767
<Uri>https://github.com/dotnet/arcade</Uri>
68-
<Sha>3dfa62fddcde597959c323d17426f215384e773a</Sha>
68+
<Sha>a8e982d3bac01d8f4f91a4c57191147570079448</Sha>
6969
</Dependency>
70-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19375.2">
70+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19378.1">
7171
<Uri>https://github.com/dotnet/arcade</Uri>
72-
<Sha>3dfa62fddcde597959c323d17426f215384e773a</Sha>
72+
<Sha>a8e982d3bac01d8f4f91a4c57191147570079448</Sha>
7373
</Dependency>
74-
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App">
74+
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App">
7575
<Uri>https://github.com/dotnet/corefx</Uri>
76-
<Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
76+
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
7777
</Dependency>
78-
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="4.8.0-preview8.19373.14">
78+
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="4.8.0-preview8.19379.4">
7979
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
80-
<Sha>d6cdc6daf9ddfeee3731ca75c8205589195d7adb</Sha>
80+
<Sha>8248026ca9df8ba891de6de97b91779ecaa35983</Sha>
8181
</Dependency>
82-
<Dependency Name="System.IO.Packaging" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App">
82+
<Dependency Name="System.IO.Packaging" Version="4.6.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App">
8383
<Uri>https://github.com/dotnet/corefx</Uri>
84-
<Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
84+
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
8585
</Dependency>
8686
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.0-preview8.19372.4" CoherentParentDependency="Microsoft.NETCore.App">
8787
<Uri>https://github.com/dotnet/coreclr</Uri>
@@ -95,17 +95,17 @@
9595
<Uri>https://github.com/dotnet/coreclr</Uri>
9696
<Sha>c01a9a157d512343ef104bb2b1f97b356e708b11</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19375.2">
98+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19378.1">
9999
<Uri>https://github.com/dotnet/arcade</Uri>
100-
<Sha>3dfa62fddcde597959c323d17426f215384e773a</Sha>
100+
<Sha>a8e982d3bac01d8f4f91a4c57191147570079448</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19375.2">
102+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19378.1">
103103
<Uri>https://github.com/dotnet/arcade</Uri>
104-
<Sha>3dfa62fddcde597959c323d17426f215384e773a</Sha>
104+
<Sha>a8e982d3bac01d8f4f91a4c57191147570079448</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19375.2">
106+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19378.1">
107107
<Uri>https://github.com/dotnet/arcade</Uri>
108-
<Sha>3dfa62fddcde597959c323d17426f215384e773a</Sha>
108+
<Sha>a8e982d3bac01d8f4f91a4c57191147570079448</Sha>
109109
</Dependency>
110110
</ToolsetDependencies>
111111
</Dependencies>

‎eng/Versions.props‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<VersionPrefix>4.8.0</VersionPrefix>
55
<PreReleaseVersionLabel>preview8</PreReleaseVersionLabel>
66
<AssemblyVersion>4.0.0.0</AssemblyVersion>
7-
<SystemIOPackagingVersion>4.6.0-preview8.19372.8</SystemIOPackagingVersion>
7+
<SystemIOPackagingVersion>4.6.0-preview8.19378.8</SystemIOPackagingVersion>
88
</PropertyGroup>
99
<!-- NuGet Package Versions -->
1010
<PropertyGroup>
11-
<MicrosoftPrivateWinformsVersion>4.8.0-preview8.19374.7</MicrosoftPrivateWinformsVersion>
11+
<MicrosoftPrivateWinformsVersion>4.8.0-preview8.19379.9</MicrosoftPrivateWinformsVersion>
1212
</PropertyGroup>
1313
<!-- Packages that come from https://github.com/dotnet/coreclr -->
1414
<PropertyGroup>
@@ -18,31 +18,31 @@
1818
</PropertyGroup>
1919
<!-- Packages that come from https://github.com/dotnet/core-setup -->
2020
<PropertyGroup>
21-
<MicrosoftNETCoreAppVersion>3.0.0-preview8-28373-17</MicrosoftNETCoreAppVersion>
22-
<MicrosoftNETCorePlatformsVersion>3.0.0-preview8.19372.8</MicrosoftNETCorePlatformsVersion>
23-
<SystemDrawingCommonVersion>4.6.0-preview8.19372.8</SystemDrawingCommonVersion>
24-
<SystemDirectoryServicesVersion>4.6.0-preview8.19372.8</SystemDirectoryServicesVersion>
25-
<SystemReflectionMetadataLoadContextVersion>4.6.0-preview8.19372.8</SystemReflectionMetadataLoadContextVersion>
21+
<MicrosoftNETCoreAppVersion>3.0.0-preview8-28379-03</MicrosoftNETCoreAppVersion>
22+
<MicrosoftNETCorePlatformsVersion>3.0.0-preview8.19378.8</MicrosoftNETCorePlatformsVersion>
23+
<SystemDrawingCommonVersion>4.6.0-preview8.19378.8</SystemDrawingCommonVersion>
24+
<SystemDirectoryServicesVersion>4.6.0-preview8.19378.8</SystemDirectoryServicesVersion>
25+
<SystemReflectionMetadataLoadContextVersion>4.6.0-preview8.19378.8</SystemReflectionMetadataLoadContextVersion>
2626
</PropertyGroup>
2727
<!-- Packages that come from https://github.com/dotnet/corefx via core-setup coherency parent dependency -->
2828
<PropertyGroup>
29-
<MicrosoftWin32RegistryPackageVersion>4.6.0-preview8.19372.8</MicrosoftWin32RegistryPackageVersion>
30-
<SystemCodeDomPackageVersion>4.6.0-preview8.19372.8</SystemCodeDomPackageVersion>
31-
<SystemConfigurationConfigurationManagerPackageVersion>4.6.0-preview8.19372.8</SystemConfigurationConfigurationManagerPackageVersion>
32-
<SystemDiagnosticsEventLogPackageVersion>4.6.0-preview8.19372.8</SystemDiagnosticsEventLogPackageVersion>
33-
<SystemReflectionEmitPackageVersion>4.6.0-preview8.19372.8</SystemReflectionEmitPackageVersion>
29+
<MicrosoftWin32RegistryPackageVersion>4.6.0-preview8.19378.8</MicrosoftWin32RegistryPackageVersion>
30+
<SystemCodeDomPackageVersion>4.6.0-preview8.19378.8</SystemCodeDomPackageVersion>
31+
<SystemConfigurationConfigurationManagerPackageVersion>4.6.0-preview8.19378.8</SystemConfigurationConfigurationManagerPackageVersion>
32+
<SystemDiagnosticsEventLogPackageVersion>4.6.0-preview8.19378.8</SystemDiagnosticsEventLogPackageVersion>
33+
<SystemReflectionEmitPackageVersion>4.6.0-preview8.19378.8</SystemReflectionEmitPackageVersion>
3434
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
35-
<SystemSecurityAccessControlPackageVersion>4.6.0-preview8.19372.8</SystemSecurityAccessControlPackageVersion>
36-
<SystemSecurityCryptographyXmlPackageVersion>4.6.0-preview8.19372.8</SystemSecurityCryptographyXmlPackageVersion>
37-
<SystemSecurityPermissionsPackageVersion>4.6.0-preview8.19372.8</SystemSecurityPermissionsPackageVersion>
38-
<SystemSecurityPrincipalWindowsPackageVersion>4.6.0-preview8.19372.8</SystemSecurityPrincipalWindowsPackageVersion>
39-
<SystemWindowsExtensionsPackageVersion>4.6.0-preview8.19372.8</SystemWindowsExtensionsPackageVersion>
35+
<SystemSecurityAccessControlPackageVersion>4.6.0-preview8.19378.8</SystemSecurityAccessControlPackageVersion>
36+
<SystemSecurityCryptographyXmlPackageVersion>4.6.0-preview8.19378.8</SystemSecurityCryptographyXmlPackageVersion>
37+
<SystemSecurityPermissionsPackageVersion>4.6.0-preview8.19378.8</SystemSecurityPermissionsPackageVersion>
38+
<SystemSecurityPrincipalWindowsPackageVersion>4.6.0-preview8.19378.8</SystemSecurityPrincipalWindowsPackageVersion>
39+
<SystemWindowsExtensionsPackageVersion>4.6.0-preview8.19378.8</SystemWindowsExtensionsPackageVersion>
4040
</PropertyGroup>
4141
<!-- Packages that come from https://github.com/dotnet/arcade -->
4242
<PropertyGroup>
43-
<MicrosoftDotNetApiCompatVersion>1.0.0-beta.19375.2</MicrosoftDotNetApiCompatVersion>
44-
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19375.2</MicrosoftDotNetCodeAnalysisPackageVersion>
45-
<MicrosoftDotNetGenAPIVersion>1.0.0-beta.19375.2</MicrosoftDotNetGenAPIVersion>
43+
<MicrosoftDotNetApiCompatVersion>1.0.0-beta.19378.1</MicrosoftDotNetApiCompatVersion>
44+
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19378.1</MicrosoftDotNetCodeAnalysisPackageVersion>
45+
<MicrosoftDotNetGenAPIVersion>1.0.0-beta.19378.1</MicrosoftDotNetGenAPIVersion>
4646
</PropertyGroup>
4747
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
4848
<PropertyGroup>
@@ -112,6 +112,6 @@
112112
It is worth reiterating that this package *should not* be consumed to build the product.
113113
-->
114114
<PropertyGroup>
115-
<MicrosoftDotNetWpfDncEngVersion>4.8.0-preview8.19373.14</MicrosoftDotNetWpfDncEngVersion>
115+
<MicrosoftDotNetWpfDncEngVersion>4.8.0-preview8.19379.4</MicrosoftDotNetWpfDncEngVersion>
116116
</PropertyGroup>
117117
</Project>

‎eng/common/init-tools-native.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ try {
9898
}
9999

100100
Write-Verbose "Installing $ToolName version $ToolVersion"
101-
Write-Verbose "Executing '$InstallerPath $LocalInstallerArguments'"
101+
Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'"
102102
& $InstallerPath @LocalInstallerArguments
103103
if ($LASTEXITCODE -Ne "0") {
104104
$errMsg = "$ToolName installation failed"

‎eng/common/native/CommonLibrary.psm1‎

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,38 @@ function DownloadAndExtract {
5959
-Verbose:$Verbose
6060

6161
if ($UnzipStatus -Eq $False) {
62-
Write-Error "Unzip failed"
63-
return $False
62+
# Retry Download one more time with Force=true
63+
$DownloadRetryStatus = CommonLibrary\Get-File -Uri $Uri `
64+
-Path $TempToolPath `
65+
-DownloadRetries 1 `
66+
-RetryWaitTimeInSeconds $RetryWaitTimeInSeconds `
67+
-Force:$True `
68+
-Verbose:$Verbose
69+
70+
if ($DownloadRetryStatus -Eq $False) {
71+
Write-Error "Last attempt of download failed as well"
72+
return $False
73+
}
74+
75+
# Retry unzip again one more time with Force=true
76+
$UnzipRetryStatus = CommonLibrary\Expand-Zip -ZipPath $TempToolPath `
77+
-OutputDirectory $InstallDirectory `
78+
-Force:$True `
79+
-Verbose:$Verbose
80+
if ($UnzipRetryStatus -Eq $False)
81+
{
82+
Write-Error "Last attempt of unzip failed as well"
83+
# Clean up partial zips and extracts
84+
if (Test-Path $TempToolPath) {
85+
Remove-Item $TempToolPath -Force
86+
}
87+
if (Test-Path $InstallDirectory) {
88+
Remove-Item $InstallDirectory -Force -Recurse
89+
}
90+
return $False
91+
}
6492
}
93+
6594
return $True
6695
}
6796

‎eng/common/post-build/darc-gather-drop.ps1‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
param(
2-
[Parameter(Mandatory=$true)][string] $BarBuildId, # ID of the build which assets should be downloaded
3-
[Parameter(Mandatory=$true)][string] $MaestroAccessToken, # Token used to access Maestro API
4-
[Parameter(Mandatory=$true)][string] $DropLocation # Where the assets should be downloaded to
2+
[Parameter(Mandatory=$true)][int] $BarBuildId, # ID of the build which assets should be downloaded
3+
[Parameter(Mandatory=$true)][string] $DropLocation, # Where the assets should be downloaded to
4+
[Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, # Token used to access Maestro API
5+
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = "https://maestro-prod.westus2.cloudapp.azure.com", # Maestro API URL
6+
[Parameter(Mandatory=$false)][string] $MaestroApiVersion = "2019-01-16" # Version of Maestro API to use
57
)
68

7-
$ErrorActionPreference = "Stop"
8-
Set-StrictMode -Version 2.0
9-
10-
. $PSScriptRoot\..\tools.ps1
9+
. $PSScriptRoot\post-build-utils.ps1
1110

1211
try {
1312
Write-Host "Installing DARC ..."
@@ -24,8 +23,8 @@ try {
2423
--continue-on-error `
2524
--id $BarBuildId `
2625
--output-dir $DropLocation `
27-
--bar-uri https://maestro-prod.westus2.cloudapp.azure.com/ `
28-
--password $MaestroAccessToken `
26+
--bar-uri $MaestroApiEndpoint `
27+
--password $MaestroApiAccessToken `
2928
--latest-location
3029
}
3130
catch {

‎eng/common/post-build/nuget-validation.ps1‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ param(
66
[Parameter(Mandatory=$true)][string] $ToolDestinationPath # Where the validation tool should be downloaded to
77
)
88

9-
$ErrorActionPreference = "Stop"
10-
Set-StrictMode -Version 2.0
11-
12-
. $PSScriptRoot\..\tools.ps1
9+
. $PSScriptRoot\post-build-utils.ps1
1310

1411
try {
1512
$url = "https://raw.githubusercontent.com/NuGet/NuGetGallery/jver-verify/src/VerifyMicrosoftPackage/verify.ps1"

0 commit comments

Comments
 (0)