Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -317,17 +317,17 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>92123a643f6dcb529a460aff248f59710ffc527e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20459.8">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20465.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>91470b0b14ba016c1fb78211b12775287c17b34e</Sha>
<Sha>fa0486ddb04a76341d822903c8977fb9fa088d1e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20459.8">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20465.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>91470b0b14ba016c1fb78211b12775287c17b34e</Sha>
<Sha>fa0486ddb04a76341d822903c8977fb9fa088d1e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20459.8">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20465.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>91470b0b14ba016c1fb78211b12775287c17b34e</Sha>
<Sha>fa0486ddb04a76341d822903c8977fb9fa088d1e</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
<MicrosoftEntityFrameworkCorePackageVersion>6.0.0-alpha.1.20465.1</MicrosoftEntityFrameworkCorePackageVersion>
<MicrosoftEntityFrameworkCoreDesignPackageVersion>6.0.0-alpha.1.20465.1</MicrosoftEntityFrameworkCoreDesignPackageVersion>
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20459.8</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20465.7</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<!--

Expand Down
26 changes: 20 additions & 6 deletions eng/common/post-build/sourcelink-validation.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -144,11 +144,27 @@ $ValidatePackage = {

if ($FailedFiles -eq 0) {
Write-Host 'Passed.'
return 0
return [pscustomobject]@{
result = 0
packagePath = $PackagePath
}
}
else {
Write-PipelineTelemetryError -Category 'SourceLink' -Message "$PackagePath has broken SourceLink links."
return 1
return [pscustomobject]@{
result = 1
packagePath = $PackagePath
}
}
}

function CheckJobResult(
$result,
$packagePath,
[ref]$ValidationFailures) {
if ($jobResult.result -ne '0') {
Write-PipelineTelemetryError -Category 'SourceLink' -Message "$packagePath has broken SourceLink links."
$ValidationFailures.Value++
}
}

Expand Down Expand Up @@ -211,10 +227,8 @@ function ValidateSourceLinkLinks {
}

foreach ($Job in @(Get-Job -State 'Completed')) {
$jobResult = Receive-Job -Id $Job.Id
if ($jobResult -ne '0') {
$ValidationFailures++
}
$jobResult = Wait-Job -Id $Job.Id | Receive-Job
CheckJobResult $jobResult.result $jobResult.packagePath ([ref]$ValidationFailures)
Remove-Job -Id $Job.Id
}
}
Expand Down
7 changes: 1 addition & 6 deletions eng/common/post-build/symbols-validation.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,6 @@ $CountMissingSymbols = {
if ($using:Clean) {
Remove-Item $ExtractPath -Recurse -Force
}

if ($MissingSymbols -ne 0)
{
Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $MissingSymbols modules in the package $PackagePath"
}

Pop-Location

Expand All @@ -165,6 +160,7 @@ function CheckJobResult(
$DupedSymbols.Value++
}
elseif ($jobResult.result -ne '0') {
Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $result modules in the package $packagePath"
$TotalFailures.Value++
}
}
Expand Down Expand Up @@ -201,7 +197,6 @@ function CheckSymbolsAvailable {
Start-Job -ScriptBlock $CountMissingSymbols -ArgumentList $FullName | Out-Null

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

while ($NumJobs -ge $MaxParallelJobs) {
Write-Host "There are $NumJobs validation jobs running right now. Waiting $SecondsBetweenLoadChecks seconds to check again."
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
},
"msbuild-sdks": {
"Yarn.MSBuild": "1.15.2",
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20459.8",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20459.8"
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20465.7",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20465.7"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,12 @@
<Target Name="CreateWixPackageDrop" AfterTargets="Build">
<CreateLitCommandPackageDrop
LitCommandWorkingDir="$(WixCommandObjDir)"
OutputFolder="$(WixCommandPackagesDir)"
WixExtensions="@(WixExtension)"
Bf="true"
Out="$(InstallersOutputPath)$(OutputName).wixlib"
InstallerFile="$(InstallersOutputPath)$(OutputName).wixlib"
WixSrcFiles="@(CompileObjOutput);@(WixObject);@(WixLibProjects);@(WixLibrary)">
<Output TaskParameter="LitCommandPackageNameOutput" PropertyName="_LitCommandPackageNameOutput" />
<Output TaskParameter="OutputFile" PropertyName="_LitCommandPackageNameOutput" />
</CreateLitCommandPackageDrop>
<MakeDir Directories="$(WixCommandPackagesDir)" />

<ZipDirectory
DestinationFile="$(WixCommandPackagesDir)/LitCommandPackage-$(_LitCommandPackageNameOutput).zip"
SourceDirectory="$(WixCommandObjDir)/$(_LitCommandPackageNameOutput)"
Overwrite="true" />
</Target>
</Project>
12 changes: 4 additions & 8 deletions src/Installers/Windows/Wix.targets
Original file line number Diff line number Diff line change
Expand Up @@ -90,26 +90,22 @@
</Target>

<Target Name="CreateWixPackageDrop" AfterTargets="Build">
<MakeDir Directories="$(WixCommandPackagesDir)" />
<CreateLightCommandPackageDrop
LightCommandWorkingDir="$(WixCommandObjDir)"
OutputFolder="$(WixCommandPackagesDir)"
NoLogo="true"
Cultures="en-us"
Out="$(InstallersOutputPath)$(PackageFileName)"
InstallerFile="$(InstallersOutputPath)$(PackageFileName)"
AdditionalBasePaths="$(MSBuildProjectDirectory)"
WixExtensions="@(WixExtension)"
Loc="@(EmbeddedResource)"
Sice="$(SuppressIces)"
WixProjectFile="$(MSBuildProjectFile)"
Fv="true"
WixSrcFiles="@(CompileObjOutput);@(WixObject);@(WixLibProjects);@(_ResolvedWixLibraryPaths)">
<Output TaskParameter="LightCommandPackageNameOutput" PropertyName="_LightCommandPackageNameOutput" />
<Output TaskParameter="OutputFile" PropertyName="_LightCommandPackageNameOutput" />
</CreateLightCommandPackageDrop>
<MakeDir Directories="$(WixCommandPackagesDir)" />

<ZipDirectory
DestinationFile="$(WixCommandPackagesDir)/LightCommandPackage-$(_LightCommandPackageNameOutput).zip"
SourceDirectory="$(WixCommandObjDir)/$(_LightCommandPackageNameOutput)"
Overwrite="true" />
</Target>

</Project>