[release/5.0-rc2] Update dependencies from dotnet/arcade (#25963)
[release/5.0-rc2] Update dependencies from dotnet/arcade - Update create light/light command package drop task - Create output directory
This commit is contained in:
parent
06d672f2ca
commit
9675fdb455
|
|
@ -308,17 +308,17 @@
|
||||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||||
<Sha>e24e67a8dd52a20e5aa07b934ce7790c96808b1b</Sha>
|
<Sha>e24e67a8dd52a20e5aa07b934ce7790c96808b1b</Sha>
|
||||||
</Dependency>
|
</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>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>91470b0b14ba016c1fb78211b12775287c17b34e</Sha>
|
<Sha>fa0486ddb04a76341d822903c8977fb9fa088d1e</Sha>
|
||||||
</Dependency>
|
</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>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>91470b0b14ba016c1fb78211b12775287c17b34e</Sha>
|
<Sha>fa0486ddb04a76341d822903c8977fb9fa088d1e</Sha>
|
||||||
</Dependency>
|
</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>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>91470b0b14ba016c1fb78211b12775287c17b34e</Sha>
|
<Sha>fa0486ddb04a76341d822903c8977fb9fa088d1e</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-3.20458.6" Pinned="true">
|
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-3.20458.6" Pinned="true">
|
||||||
<Uri>https://github.com/dotnet/roslyn</Uri>
|
<Uri>https://github.com/dotnet/roslyn</Uri>
|
||||||
|
|
|
||||||
|
|
@ -140,7 +140,7 @@
|
||||||
<MicrosoftEntityFrameworkCorePackageVersion>5.0.0-rc.2.20465.4</MicrosoftEntityFrameworkCorePackageVersion>
|
<MicrosoftEntityFrameworkCorePackageVersion>5.0.0-rc.2.20465.4</MicrosoftEntityFrameworkCorePackageVersion>
|
||||||
<MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.0-rc.2.20465.4</MicrosoftEntityFrameworkCoreDesignPackageVersion>
|
<MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.0-rc.2.20465.4</MicrosoftEntityFrameworkCoreDesignPackageVersion>
|
||||||
<!-- Packages from dotnet/arcade -->
|
<!-- Packages from dotnet/arcade -->
|
||||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20459.8</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20465.7</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<!--
|
<!--
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -144,11 +144,27 @@ $ValidatePackage = {
|
||||||
|
|
||||||
if ($FailedFiles -eq 0) {
|
if ($FailedFiles -eq 0) {
|
||||||
Write-Host 'Passed.'
|
Write-Host 'Passed.'
|
||||||
return 0
|
return [pscustomobject]@{
|
||||||
|
result = 0
|
||||||
|
packagePath = $PackagePath
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
Write-PipelineTelemetryError -Category 'SourceLink' -Message "$PackagePath has broken SourceLink links."
|
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++
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -211,10 +227,8 @@ function ValidateSourceLinkLinks {
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach ($Job in @(Get-Job -State 'Completed')) {
|
foreach ($Job in @(Get-Job -State 'Completed')) {
|
||||||
$jobResult = Receive-Job -Id $Job.Id
|
$jobResult = Wait-Job -Id $Job.Id | Receive-Job
|
||||||
if ($jobResult -ne '0') {
|
CheckJobResult $jobResult.result $jobResult.packagePath ([ref]$ValidationFailures)
|
||||||
$ValidationFailures++
|
|
||||||
}
|
|
||||||
Remove-Job -Id $Job.Id
|
Remove-Job -Id $Job.Id
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -141,11 +141,6 @@ $CountMissingSymbols = {
|
||||||
if ($using:Clean) {
|
if ($using:Clean) {
|
||||||
Remove-Item $ExtractPath -Recurse -Force
|
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
|
Pop-Location
|
||||||
|
|
||||||
|
|
@ -165,6 +160,7 @@ function CheckJobResult(
|
||||||
$DupedSymbols.Value++
|
$DupedSymbols.Value++
|
||||||
}
|
}
|
||||||
elseif ($jobResult.result -ne '0') {
|
elseif ($jobResult.result -ne '0') {
|
||||||
|
Write-PipelineTelemetryError -Category 'CheckSymbols' -Message "Missing symbols for $result modules in the package $packagePath"
|
||||||
$TotalFailures.Value++
|
$TotalFailures.Value++
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -201,7 +197,6 @@ function CheckSymbolsAvailable {
|
||||||
Start-Job -ScriptBlock $CountMissingSymbols -ArgumentList $FullName | Out-Null
|
Start-Job -ScriptBlock $CountMissingSymbols -ArgumentList $FullName | Out-Null
|
||||||
|
|
||||||
$NumJobs = @(Get-Job -State 'Running').Count
|
$NumJobs = @(Get-Job -State 'Running').Count
|
||||||
Write-Host $NumJobs
|
|
||||||
|
|
||||||
while ($NumJobs -ge $MaxParallelJobs) {
|
while ($NumJobs -ge $MaxParallelJobs) {
|
||||||
Write-Host "There are $NumJobs validation jobs running right now. Waiting $SecondsBetweenLoadChecks seconds to check again."
|
Write-Host "There are $NumJobs validation jobs running right now. Waiting $SecondsBetweenLoadChecks seconds to check again."
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Yarn.MSBuild": "1.15.2",
|
"Yarn.MSBuild": "1.15.2",
|
||||||
"Microsoft.DotNet.Arcade.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.20459.8"
|
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20465.7"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -46,17 +46,12 @@
|
||||||
<Target Name="CreateWixPackageDrop" AfterTargets="Build">
|
<Target Name="CreateWixPackageDrop" AfterTargets="Build">
|
||||||
<CreateLitCommandPackageDrop
|
<CreateLitCommandPackageDrop
|
||||||
LitCommandWorkingDir="$(WixCommandObjDir)"
|
LitCommandWorkingDir="$(WixCommandObjDir)"
|
||||||
|
OutputFolder="$(WixCommandPackagesDir)"
|
||||||
WixExtensions="@(WixExtension)"
|
WixExtensions="@(WixExtension)"
|
||||||
Bf="true"
|
Bf="true"
|
||||||
Out="$(InstallersOutputPath)$(OutputName).wixlib"
|
InstallerFile="$(InstallersOutputPath)$(OutputName).wixlib"
|
||||||
WixSrcFiles="@(CompileObjOutput);@(WixObject);@(WixLibProjects);@(WixLibrary)">
|
WixSrcFiles="@(CompileObjOutput);@(WixObject);@(WixLibProjects);@(WixLibrary)">
|
||||||
<Output TaskParameter="LitCommandPackageNameOutput" PropertyName="_LitCommandPackageNameOutput" />
|
<Output TaskParameter="OutputFile" PropertyName="_LitCommandPackageNameOutput" />
|
||||||
</CreateLitCommandPackageDrop>
|
</CreateLitCommandPackageDrop>
|
||||||
<MakeDir Directories="$(WixCommandPackagesDir)" />
|
|
||||||
|
|
||||||
<ZipDirectory
|
|
||||||
DestinationFile="$(WixCommandPackagesDir)/LitCommandPackage-$(_LitCommandPackageNameOutput).zip"
|
|
||||||
SourceDirectory="$(WixCommandObjDir)/$(_LitCommandPackageNameOutput)"
|
|
||||||
Overwrite="true" />
|
|
||||||
</Target>
|
</Target>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -90,11 +90,13 @@
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="CreateWixPackageDrop" AfterTargets="Build">
|
<Target Name="CreateWixPackageDrop" AfterTargets="Build">
|
||||||
|
<MakeDir Directories="$(WixCommandPackagesDir)" />
|
||||||
<CreateLightCommandPackageDrop
|
<CreateLightCommandPackageDrop
|
||||||
LightCommandWorkingDir="$(WixCommandObjDir)"
|
LightCommandWorkingDir="$(WixCommandObjDir)"
|
||||||
|
OutputFolder="$(WixCommandPackagesDir)"
|
||||||
NoLogo="true"
|
NoLogo="true"
|
||||||
Cultures="en-us"
|
Cultures="en-us"
|
||||||
Out="$(InstallersOutputPath)$(PackageFileName)"
|
InstallerFile="$(InstallersOutputPath)$(PackageFileName)"
|
||||||
AdditionalBasePaths="$(MSBuildProjectDirectory)"
|
AdditionalBasePaths="$(MSBuildProjectDirectory)"
|
||||||
WixExtensions="@(WixExtension)"
|
WixExtensions="@(WixExtension)"
|
||||||
Loc="@(EmbeddedResource)"
|
Loc="@(EmbeddedResource)"
|
||||||
|
|
@ -102,14 +104,8 @@
|
||||||
WixProjectFile="$(MSBuildProjectFile)"
|
WixProjectFile="$(MSBuildProjectFile)"
|
||||||
Fv="true"
|
Fv="true"
|
||||||
WixSrcFiles="@(CompileObjOutput);@(WixObject);@(WixLibProjects);@(_ResolvedWixLibraryPaths)">
|
WixSrcFiles="@(CompileObjOutput);@(WixObject);@(WixLibProjects);@(_ResolvedWixLibraryPaths)">
|
||||||
<Output TaskParameter="LightCommandPackageNameOutput" PropertyName="_LightCommandPackageNameOutput" />
|
<Output TaskParameter="OutputFile" PropertyName="_LightCommandPackageNameOutput" />
|
||||||
</CreateLightCommandPackageDrop>
|
</CreateLightCommandPackageDrop>
|
||||||
<MakeDir Directories="$(WixCommandPackagesDir)" />
|
|
||||||
|
|
||||||
<ZipDirectory
|
|
||||||
DestinationFile="$(WixCommandPackagesDir)/LightCommandPackage-$(_LightCommandPackageNameOutput).zip"
|
|
||||||
SourceDirectory="$(WixCommandObjDir)/$(_LightCommandPackageNameOutput)"
|
|
||||||
Overwrite="true" />
|
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue