Skip to content

Commit 0250c22

Browse files
[master] Update dependencies from dotnet/arcade (#25962)
[master] Update dependencies from dotnet/arcade - Updates for Arcade breaking change to CreateLightCommandPackageDrop - Create output directory
1 parent b98b74a commit 0250c22

File tree

7 files changed

+37
-37
lines changed

7 files changed

+37
-37
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -317,17 +317,17 @@
317317
<Uri>https://github.com/dotnet/runtime</Uri>
318318
<Sha>92123a643f6dcb529a460aff248f59710ffc527e</Sha>
319319
</Dependency>
320-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20459.8">
320+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20465.7">
321321
<Uri>https://github.com/dotnet/arcade</Uri>
322-
<Sha>91470b0b14ba016c1fb78211b12775287c17b34e</Sha>
322+
<Sha>fa0486ddb04a76341d822903c8977fb9fa088d1e</Sha>
323323
</Dependency>
324-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20459.8">
324+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20465.7">
325325
<Uri>https://github.com/dotnet/arcade</Uri>
326-
<Sha>91470b0b14ba016c1fb78211b12775287c17b34e</Sha>
326+
<Sha>fa0486ddb04a76341d822903c8977fb9fa088d1e</Sha>
327327
</Dependency>
328-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20459.8">
328+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20465.7">
329329
<Uri>https://github.com/dotnet/arcade</Uri>
330-
<Sha>91470b0b14ba016c1fb78211b12775287c17b34e</Sha>
330+
<Sha>fa0486ddb04a76341d822903c8977fb9fa088d1e</Sha>
331331
</Dependency>
332332
</ToolsetDependencies>
333333
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
<MicrosoftEntityFrameworkCorePackageVersion>6.0.0-alpha.1.20465.1</MicrosoftEntityFrameworkCorePackageVersion>
143143
<MicrosoftEntityFrameworkCoreDesignPackageVersion>6.0.0-alpha.1.20465.1</MicrosoftEntityFrameworkCoreDesignPackageVersion>
144144
<!-- Packages from dotnet/arcade -->
145-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20459.8</MicrosoftDotNetBuildTasksInstallersPackageVersion>
145+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20465.7</MicrosoftDotNetBuildTasksInstallersPackageVersion>
146146
</PropertyGroup>
147147
<!--
148148

eng/common/post-build/sourcelink-validation.ps1

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,27 @@ $ValidatePackage = {
144144

145145
if ($FailedFiles -eq 0) {
146146
Write-Host 'Passed.'
147-
return 0
147+
return [pscustomobject]@{
148+
result = 0
149+
packagePath = $PackagePath
150+
}
148151
}
149152
else {
150153
Write-PipelineTelemetryError -Category 'SourceLink' -Message "$PackagePath has broken SourceLink links."
151-
return 1
154+
return [pscustomobject]@{
155+
result = 1
156+
packagePath = $PackagePath
157+
}
158+
}
159+
}
160+
161+
function CheckJobResult(
162+
$result,
163+
$packagePath,
164+
[ref]$ValidationFailures) {
165+
if ($jobResult.result -ne '0') {
166+
Write-PipelineTelemetryError -Category 'SourceLink' -Message "$packagePath has broken SourceLink links."
167+
$ValidationFailures.Value++
152168
}
153169
}
154170

@@ -211,10 +227,8 @@ function ValidateSourceLinkLinks {
211227
}
212228

213229
foreach ($Job in @(Get-Job -State 'Completed')) {
214-
$jobResult = Receive-Job -Id $Job.Id
215-
if ($jobResult -ne '0') {
216-
$ValidationFailures++
217-
}
230+
$jobResult = Wait-Job -Id $Job.Id | Receive-Job
231+
CheckJobResult $jobResult.result $jobResult.packagePath ([ref]$ValidationFailures)
218232
Remove-Job -Id $Job.Id
219233
}
220234
}

eng/common/post-build/symbols-validation.ps1

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,6 @@ $CountMissingSymbols = {
141141
if ($using:Clean) {
142142
Remove-Item $ExtractPath -Recurse -Force
143143
}
144-
145-
if ($MissingSymbols -ne 0)
146-
{
147-
Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $MissingSymbols modules in the package $PackagePath"
148-
}
149144

150145
Pop-Location
151146

@@ -165,6 +160,7 @@ function CheckJobResult(
165160
$DupedSymbols.Value++
166161
}
167162
elseif ($jobResult.result -ne '0') {
163+
Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $result modules in the package $packagePath"
168164
$TotalFailures.Value++
169165
}
170166
}
@@ -201,7 +197,6 @@ function CheckSymbolsAvailable {
201197
Start-Job -ScriptBlock $CountMissingSymbols -ArgumentList $FullName | Out-Null
202198

203199
$NumJobs = @(Get-Job -State 'Running').Count
204-
Write-Host $NumJobs
205200

206201
while ($NumJobs -ge $MaxParallelJobs) {
207202
Write-Host "There are $NumJobs validation jobs running right now. Waiting $SecondsBetweenLoadChecks seconds to check again."

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
"msbuild-sdks": {
3232
"Yarn.MSBuild": "1.15.2",
33-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20459.8",
34-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20459.8"
33+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20465.7",
34+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20465.7"
3535
}
3636
}

src/Installers/Windows/SharedFrameworkLib/SharedFrameworkLib.wixproj

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,12 @@
4646
<Target Name="CreateWixPackageDrop" AfterTargets="Build">
4747
<CreateLitCommandPackageDrop
4848
LitCommandWorkingDir="$(WixCommandObjDir)"
49+
OutputFolder="$(WixCommandPackagesDir)"
4950
WixExtensions="@(WixExtension)"
5051
Bf="true"
51-
Out="$(InstallersOutputPath)$(OutputName).wixlib"
52+
InstallerFile="$(InstallersOutputPath)$(OutputName).wixlib"
5253
WixSrcFiles="@(CompileObjOutput);@(WixObject);@(WixLibProjects);@(WixLibrary)">
53-
<Output TaskParameter="LitCommandPackageNameOutput" PropertyName="_LitCommandPackageNameOutput" />
54+
<Output TaskParameter="OutputFile" PropertyName="_LitCommandPackageNameOutput" />
5455
</CreateLitCommandPackageDrop>
55-
<MakeDir Directories="$(WixCommandPackagesDir)" />
56-
57-
<ZipDirectory
58-
DestinationFile="$(WixCommandPackagesDir)/LitCommandPackage-$(_LitCommandPackageNameOutput).zip"
59-
SourceDirectory="$(WixCommandObjDir)/$(_LitCommandPackageNameOutput)"
60-
Overwrite="true" />
6156
</Target>
6257
</Project>

src/Installers/Windows/Wix.targets

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,26 +90,22 @@
9090
</Target>
9191

9292
<Target Name="CreateWixPackageDrop" AfterTargets="Build">
93+
<MakeDir Directories="$(WixCommandPackagesDir)" />
9394
<CreateLightCommandPackageDrop
9495
LightCommandWorkingDir="$(WixCommandObjDir)"
96+
OutputFolder="$(WixCommandPackagesDir)"
9597
NoLogo="true"
9698
Cultures="en-us"
97-
Out="$(InstallersOutputPath)$(PackageFileName)"
99+
InstallerFile="$(InstallersOutputPath)$(PackageFileName)"
98100
AdditionalBasePaths="$(MSBuildProjectDirectory)"
99101
WixExtensions="@(WixExtension)"
100102
Loc="@(EmbeddedResource)"
101103
Sice="$(SuppressIces)"
102104
WixProjectFile="$(MSBuildProjectFile)"
103105
Fv="true"
104106
WixSrcFiles="@(CompileObjOutput);@(WixObject);@(WixLibProjects);@(_ResolvedWixLibraryPaths)">
105-
<Output TaskParameter="LightCommandPackageNameOutput" PropertyName="_LightCommandPackageNameOutput" />
107+
<Output TaskParameter="OutputFile" PropertyName="_LightCommandPackageNameOutput" />
106108
</CreateLightCommandPackageDrop>
107-
<MakeDir Directories="$(WixCommandPackagesDir)" />
108-
109-
<ZipDirectory
110-
DestinationFile="$(WixCommandPackagesDir)/LightCommandPackage-$(_LightCommandPackageNameOutput).zip"
111-
SourceDirectory="$(WixCommandObjDir)/$(_LightCommandPackageNameOutput)"
112-
Overwrite="true" />
113109
</Target>
114110

115111
</Project>

0 commit comments

Comments
 (0)