Skip to content

Commit 2304371

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20220818.4 (#43397)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22411.2 -> To Version 7.0.0-beta.22418.4 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent ee2161b commit 2304371

File tree

9 files changed

+109
-44
lines changed

9 files changed

+109
-44
lines changed

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -297,22 +297,22 @@
297297
<Uri>https://github.com/dotnet/runtime</Uri>
298298
<Sha>e680411c22e33f45821f4ae64365a2970b2430a6</Sha>
299299
</Dependency>
300-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22411.2">
300+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22418.4">
301301
<Uri>https://github.com/dotnet/arcade</Uri>
302-
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
302+
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
303303
<SourceBuild RepoName="arcade" ManagedOnly="true" />
304304
</Dependency>
305-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22411.2">
305+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22418.4">
306306
<Uri>https://github.com/dotnet/arcade</Uri>
307-
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
307+
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
308308
</Dependency>
309-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22411.2">
309+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22418.4">
310310
<Uri>https://github.com/dotnet/arcade</Uri>
311-
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
311+
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
312312
</Dependency>
313-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22411.2">
313+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22418.4">
314314
<Uri>https://github.com/dotnet/arcade</Uri>
315-
<Sha>6a638cd0c13962ab2a1943cb1c878be5a41dd82e</Sha>
315+
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
316316
</Dependency>
317317
</ToolsetDependencies>
318318
</Dependencies>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@
137137
<MicrosoftEntityFrameworkCoreVersion>7.0.0-rc.1.22415.4</MicrosoftEntityFrameworkCoreVersion>
138138
<MicrosoftEntityFrameworkCoreDesignVersion>7.0.0-rc.1.22415.4</MicrosoftEntityFrameworkCoreDesignVersion>
139139
<!-- Packages from dotnet/arcade -->
140-
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22411.2</MicrosoftDotNetBuildTasksInstallersVersion>
141-
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22411.2</MicrosoftDotNetBuildTasksTemplatingVersion>
140+
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksInstallersVersion>
141+
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksTemplatingVersion>
142142
<!-- Packages from dotnet/source-build-externals -->
143143
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>7.0.0-alpha.1.22409.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
144144
</PropertyGroup>

‎eng/common/cross/build-rootfs.sh

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ __FreeBSDPackages+=" openssl"
7676
__FreeBSDPackages+=" krb5"
7777
__FreeBSDPackages+=" terminfo-db"
7878

79-
__IllumosPackages="icu-64.2nb2"
80-
__IllumosPackages+=" mit-krb5-1.16.2nb4"
81-
__IllumosPackages+=" openssl-1.1.1e"
82-
__IllumosPackages+=" zlib-1.2.11"
79+
__IllumosPackages="icu"
80+
__IllumosPackages+=" mit-krb5"
81+
__IllumosPackages+=" openssl"
82+
__IllumosPackages+=" zlib"
8383

8484
__HaikuPackages="gmp"
8585
__HaikuPackages+=" gmp_devel"
@@ -390,14 +390,18 @@ elif [[ "$__CodeName" == "illumos" ]]; then
390390
if [[ "$__UseMirror" == 1 ]]; then
391391
BaseUrl=http://pkgsrc.smartos.skylime.net
392392
fi
393-
BaseUrl="$BaseUrl/packages/SmartOS/2020Q1/${__illumosArch}/All"
393+
BaseUrl="$BaseUrl/packages/SmartOS/trunk/${__illumosArch}/All"
394+
echo "Downloading manifest"
395+
wget "$BaseUrl"
394396
echo "Downloading dependencies."
395397
read -ra array <<<"$__IllumosPackages"
396398
for package in "${array[@]}"; do
397-
echo "Installing $package..."
399+
echo "Installing '$package'"
400+
package="$(grep ">$package-[0-9]" All | sed -En 's/.*href="(.*)\.tgz".*/\1/p')"
401+
echo "Resolved name '$package'"
398402
wget "$BaseUrl"/"$package".tgz
399403
ar -x "$package".tgz
400-
tar --skip-old-files -xzf "$package".tmp.tgz -C "$__RootfsDir" 2>/dev/null
404+
tar --skip-old-files -xzf "$package".tmp.tg* -C "$__RootfsDir" 2>/dev/null
401405
done
402406
echo "Cleaning up temporary files."
403407
popd

‎eng/common/generate-locproject.ps1

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ $jsonTemplateFiles | ForEach-Object {
3333

3434
$jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern
3535

36+
$wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them
37+
3638
$xlfFiles = @()
3739

3840
$allXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.xlf"
@@ -77,8 +79,7 @@ $locJson = @{
7779
CopyOption = "LangIDOnPath"
7880
OutputPath = "$($_.Directory.Parent.FullName | Resolve-Path -Relative)\"
7981
}
80-
}
81-
else {
82+
} else {
8283
return @{
8384
SourceFile = $sourceFile
8485
CopyOption = "LangIDOnName"
@@ -88,6 +89,32 @@ $locJson = @{
8889
}
8990
}
9091
)
92+
},
93+
@{
94+
CloneLanguageSet = "WiX_CloneLanguages"
95+
LssFiles = @( "wxl_loc.lss" )
96+
LocItems = @(
97+
$wxlFiles | ForEach-Object {
98+
$outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
99+
$continue = $true
100+
foreach ($exclusion in $exclusions.Exclusions) {
101+
if ($outputPath.Contains($exclusion))
102+
{
103+
$continue = $false
104+
}
105+
}
106+
$sourceFile = ($_.FullName | Resolve-Path -Relative)
107+
if ($continue)
108+
{
109+
return @{
110+
SourceFile = $sourceFile
111+
CopyOption = "LangIDOnPath"
112+
OutputPath = $outputPath
113+
Languages = "cs-CZ;de-DE;es-ES;fr-FR;it-IT;ja-JP;ko-KR;pl-PL;pt-BR;ru-RU;tr-TR;zh-CN;zh-TW"
114+
}
115+
}
116+
}
117+
)
91118
}
92119
)
93120
}

‎eng/common/sdk-task.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ try {
6464
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
6565
}
6666
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
67-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.1.0" -MemberType NoteProperty
67+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.2.1" -MemberType NoteProperty
6868
}
6969
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7070
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

‎eng/common/sdl/sdl.ps1

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
2+
function Install-Gdn {
3+
param(
4+
[string]$Path,
5+
6+
# If omitted, install the latest version of Guardian, otherwise install that specific version.
7+
[string]$Version
8+
)
9+
10+
$ErrorActionPreference = 'Stop'
11+
Set-StrictMode -Version 2.0
12+
$disableConfigureToolsetImport = $true
13+
$global:LASTEXITCODE = 0
14+
15+
# `tools.ps1` checks $ci to perform some actions. Since the SDL
16+
# scripts don't necessarily execute in the same agent that run the
17+
# build.ps1/sh script this variable isn't automatically set.
18+
$ci = $true
19+
. $PSScriptRoot\..\tools.ps1
20+
21+
$argumentList = @("install", "Microsoft.Guardian.Cli", "-Source https://securitytools.pkgs.visualstudio.com/_packaging/Guardian/nuget/v3/index.json", "-OutputDirectory $Path", "-NonInteractive", "-NoCache")
22+
23+
if ($Version) {
24+
$argumentList += "-Version $Version"
25+
}
26+
27+
Start-Process nuget -Verbose -ArgumentList $argumentList -NoNewWindow -Wait
28+
29+
$gdnCliPath = Get-ChildItem -Filter guardian.cmd -Recurse -Path $Path
30+
31+
if (!$gdnCliPath)
32+
{
33+
Write-PipelineTelemetryError -Category 'Sdl' -Message 'Failure installing Guardian'
34+
}
35+
36+
return $gdnCliPath.FullName
37+
}

‎eng/common/templates/steps/execute-sdl.yml

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,26 @@ parameters:
88
condition: ''
99

1010
steps:
11-
- ${{ if ne(parameters.overrideGuardianVersion, '') }}:
12-
- powershell: |
13-
$content = Get-Content $(GuardianPackagesConfigFile)
14-
15-
Write-Host "packages.config content was:`n$content"
16-
17-
$content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)')
18-
$content | Set-Content $(GuardianPackagesConfigFile)
19-
20-
Write-Host "packages.config content updated to:`n$content"
21-
displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }}
11+
- task: NuGetAuthenticate@1
12+
inputs:
13+
nuGetServiceConnections: GuardianConnect
2214

2315
- task: NuGetToolInstaller@1
2416
displayName: 'Install NuGet.exe'
2517

26-
- task: NuGetCommand@2
27-
displayName: 'Install Guardian'
28-
inputs:
29-
restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config
30-
feedsToUse: config
31-
nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config
32-
externalFeedCredentials: GuardianConnect
33-
restoreDirectory: $(Build.SourcesDirectory)\.packages
18+
- ${{ if ne(parameters.overrideGuardianVersion, '') }}:
19+
- pwsh: |
20+
. $(Build.SourcesDirectory)\eng\common\sdl\sdl.ps1
21+
$guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts -Version ${{ parameters.overrideGuardianVersion }}
22+
Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation"
23+
displayName: Install Guardian (Overridden)
24+
25+
- ${{ if eq(parameters.overrideGuardianVersion, '') }}:
26+
- pwsh: |
27+
. $(Build.SourcesDirectory)\eng\common\sdl\sdl.ps1
28+
$guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts
29+
Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation"
30+
displayName: Install Guardian
3431
3532
- ${{ if ne(parameters.overrideParameters, '') }}:
3633
- powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }}
@@ -40,7 +37,7 @@ steps:
4037

4138
- ${{ if eq(parameters.overrideParameters, '') }}:
4239
- powershell: ${{ parameters.executeAllSdlToolsScript }}
43-
-GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion)
40+
-GuardianCliLocation $(GuardianCliLocation)
4441
-NugetPackageDirectory $(Build.SourcesDirectory)\.packages
4542
-AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
4643
${{ parameters.additionalParameters }}

‎eng/common/tools.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
365365

366366
# If the version of msbuild is going to be xcopied,
367367
# use this version. Version matches a package here:
368-
# https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.1.0&view=overview
369-
$defaultXCopyMSBuildVersion = '17.1.0'
368+
# https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.2.1&view=overview
369+
$defaultXCopyMSBuildVersion = '17.2.1'
370370

371371
if (!$vsRequirements) {
372372
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"msbuild-sdks": {
2929
"Yarn.MSBuild": "1.22.10",
30-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22411.2",
31-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22411.2"
30+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22418.4",
31+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22418.4"
3232
}
3333
}

0 commit comments

Comments
 (0)