Skip to content

Commit 89ebdb1

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#5817)
[main] Update dependencies from dotnet/arcade
1 parent 8672e35 commit 89ebdb1

File tree

6 files changed

+61
-24
lines changed

6 files changed

+61
-24
lines changed

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25412.1">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25414.2">
88
<Uri>https://github.com/dotnet/arcade</Uri>
9-
<Sha>0a1768a159fc30f6b1a790710eba5fb4469d543e</Sha>
9+
<Sha>fac534d85b77789bd4daf2b4c916117f1ca381e7</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25412.1">
11+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25414.2">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>0a1768a159fc30f6b1a790710eba5fb4469d543e</Sha>
13+
<Sha>fac534d85b77789bd4daf2b4c916117f1ca381e7</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25412.1">
15+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25414.2">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>0a1768a159fc30f6b1a790710eba5fb4469d543e</Sha>
17+
<Sha>fac534d85b77789bd4daf2b4c916117f1ca381e7</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25412.1">
19+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25414.2">
2020
<Uri>https://github.com/dotnet/arcade</Uri>
21-
<Sha>0a1768a159fc30f6b1a790710eba5fb4469d543e</Sha>
21+
<Sha>fac534d85b77789bd4daf2b4c916117f1ca381e7</Sha>
2222
</Dependency>
2323
</ToolsetDependencies>
2424
</Dependencies>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
</PropertyGroup>
2121
<!-- Arcade dependencies -->
2222
<PropertyGroup>
23-
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25412.1</MicrosoftDotNetGenFacadesPackageVersion>
24-
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25412.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
25-
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25412.1</MicrosoftDotNetGenAPIPackageVersion>
23+
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.25414.2</MicrosoftDotNetGenFacadesPackageVersion>
24+
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25414.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
25+
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25414.2</MicrosoftDotNetGenAPIPackageVersion>
2626
</PropertyGroup>
2727
<!-- Additional dependencies -->
2828
<PropertyGroup>

‎eng/common/core-templates/steps/install-microbuild.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,8 @@ steps:
5353
zipSources: false
5454
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
5555
${{ if eq(parameters.microbuildUseESRP, true) }}:
56-
${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
57-
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
58-
useEsrpCli: true
59-
${{ elseif eq(variables['System.TeamProject'], 'DevDiv') }}:
56+
ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)'
57+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
6058
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
6159
${{ else }}:
6260
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca

‎eng/common/generate-locproject.ps1

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

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

36+
$wxlFilesV3 = @()
37+
$wxlFilesV5 = @()
3638
$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
3739
if (-not $wxlFiles) {
3840
$wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } # pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files
3941
if ($wxlEnFiles) {
40-
$wxlFiles = @()
41-
$wxlEnFiles | ForEach-Object {
42-
$destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)"
43-
$wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
44-
}
42+
$wxlFiles = @()
43+
$wxlEnFiles | ForEach-Object {
44+
$destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)"
45+
$content = Get-Content $_.FullName -Raw
46+
47+
# Split files on schema to select different parser settings in the generated project.
48+
if ($content -like "*http://wixtoolset.org/schemas/v4/wxl*")
49+
{
50+
$wxlFilesV5 += Copy-Item $_.FullName -Destination $destinationFile -PassThru
51+
}
52+
elseif ($content -like "*http://schemas.microsoft.com/wix/2006/localization*")
53+
{
54+
$wxlFilesV3 += Copy-Item $_.FullName -Destination $destinationFile -PassThru
55+
}
56+
}
4557
}
4658
}
4759

@@ -114,7 +126,32 @@ $locJson = @{
114126
CloneLanguageSet = "WiX_CloneLanguages"
115127
LssFiles = @( "wxl_loc.lss" )
116128
LocItems = @(
117-
$wxlFiles | ForEach-Object {
129+
$wxlFilesV3 | ForEach-Object {
130+
$outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
131+
$continue = $true
132+
foreach ($exclusion in $exclusions.Exclusions) {
133+
if ($_.FullName.Contains($exclusion)) {
134+
$continue = $false
135+
}
136+
}
137+
$sourceFile = ($_.FullName | Resolve-Path -Relative)
138+
if ($continue)
139+
{
140+
return @{
141+
SourceFile = $sourceFile
142+
CopyOption = "LangIDOnPath"
143+
OutputPath = $outputPath
144+
}
145+
}
146+
}
147+
)
148+
},
149+
@{
150+
LanguageSet = $LanguageSet
151+
CloneLanguageSet = "WiX_CloneLanguages"
152+
LssFiles = @( "P210WxlSchemaV4.lss" )
153+
LocItems = @(
154+
$wxlFilesV5 | ForEach-Object {
118155
$outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
119156
$continue = $true
120157
foreach ($exclusion in $exclusions.Exclusions) {

‎eng/common/tools.ps1

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -544,15 +544,17 @@ function LocateVisualStudio([object]$vsRequirements = $null){
544544
if (Get-Member -InputObject $GlobalJson.tools -Name 'vswhere') {
545545
$vswhereVersion = $GlobalJson.tools.vswhere
546546
} else {
547-
$vswhereVersion = '2.5.2'
547+
# keep this in sync with the VSWhereVersion in DefaultVersions.props
548+
$vswhereVersion = '3.1.7'
548549
}
549550

550551
$vsWhereDir = Join-Path $ToolsDir "vswhere\$vswhereVersion"
551552
$vsWhereExe = Join-Path $vsWhereDir 'vswhere.exe'
552553

553554
if (!(Test-Path $vsWhereExe)) {
554555
Create-Directory $vsWhereDir
555-
Write-Host 'Downloading vswhere'
556+
Write-Host 'Downloading vswhere $vswhereVersion'
557+
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
556558
Retry({
557559
Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe
558560
})

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": "10.0.100-preview.7.25372.107"
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25412.1",
17+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25414.2",
1818
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5"
1919
}
2020
}

0 commit comments

Comments
 (0)