Skip to content

Commit 175e1d9

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/dotnet build 279809 (#11058)
Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25416.105 -> 10.0.0-beta.25416.109) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.2.25416.105 -> 10.0.0-rc.2.25416.109) Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 27b82f6 commit 175e1d9

File tree

6 files changed

+118
-81
lines changed

6 files changed

+118
-81
lines changed

‎eng/Version.Details.props‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,30 @@ This file should be imported by eng/Versions.props
77
<Project>
88
<PropertyGroup>
99
<!-- dotnet/dotnet dependencies -->
10-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25416.105</MicrosoftDotNetArcadeSdkPackageVersion>
11-
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25416.105</MicrosoftDotNetCodeAnalysisPackageVersion>
12-
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25416.105</MicrosoftDotNetGenAPIPackageVersion>
13-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25416.105</MicrosoftDotNetHelixSdkPackageVersion>
14-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rc.2.25416.105</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
15-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.2.25416.105</MicrosoftNETCoreAppRefPackageVersion>
16-
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.2.25416.105</MicrosoftNETCorePlatformsPackageVersion>
17-
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rc.2.25416.105</MicrosoftPrivateWinformsPackageVersion>
10+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25416.109</MicrosoftDotNetArcadeSdkPackageVersion>
11+
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25416.109</MicrosoftDotNetCodeAnalysisPackageVersion>
12+
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25416.109</MicrosoftDotNetGenAPIPackageVersion>
13+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25416.109</MicrosoftDotNetHelixSdkPackageVersion>
14+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rc.2.25416.109</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
15+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.2.25416.109</MicrosoftNETCoreAppRefPackageVersion>
16+
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.2.25416.109</MicrosoftNETCorePlatformsPackageVersion>
17+
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rc.2.25416.109</MicrosoftPrivateWinformsPackageVersion>
1818
<MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
1919
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
20-
<SystemCodeDomPackageVersion>10.0.0-rc.2.25416.105</SystemCodeDomPackageVersion>
21-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.2.25416.105</SystemConfigurationConfigurationManagerPackageVersion>
22-
<SystemDiagnosticsEventLogPackageVersion>10.0.0-rc.2.25416.105</SystemDiagnosticsEventLogPackageVersion>
23-
<SystemDirectoryServicesPackageVersion>10.0.0-rc.2.25416.105</SystemDirectoryServicesPackageVersion>
24-
<SystemDrawingCommonPackageVersion>10.0.0-rc.2.25416.105</SystemDrawingCommonPackageVersion>
25-
<SystemFormatsNrbfPackageVersion>10.0.0-rc.2.25416.105</SystemFormatsNrbfPackageVersion>
26-
<SystemIOPackagingPackageVersion>10.0.0-rc.2.25416.105</SystemIOPackagingPackageVersion>
27-
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rc.2.25416.105</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
28-
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.2.25416.105</SystemReflectionMetadataLoadContextPackageVersion>
29-
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.2.25416.105</SystemResourcesExtensionsPackageVersion>
30-
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.2.25416.105</SystemRuntimeSerializationFormattersPackageVersion>
31-
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-rc.2.25416.105</SystemSecurityCryptographyXmlPackageVersion>
32-
<SystemSecurityPermissionsPackageVersion>10.0.0-rc.2.25416.105</SystemSecurityPermissionsPackageVersion>
33-
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.2.25416.105</SystemWindowsExtensionsPackageVersion>
20+
<SystemCodeDomPackageVersion>10.0.0-rc.2.25416.109</SystemCodeDomPackageVersion>
21+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.2.25416.109</SystemConfigurationConfigurationManagerPackageVersion>
22+
<SystemDiagnosticsEventLogPackageVersion>10.0.0-rc.2.25416.109</SystemDiagnosticsEventLogPackageVersion>
23+
<SystemDirectoryServicesPackageVersion>10.0.0-rc.2.25416.109</SystemDirectoryServicesPackageVersion>
24+
<SystemDrawingCommonPackageVersion>10.0.0-rc.2.25416.109</SystemDrawingCommonPackageVersion>
25+
<SystemFormatsNrbfPackageVersion>10.0.0-rc.2.25416.109</SystemFormatsNrbfPackageVersion>
26+
<SystemIOPackagingPackageVersion>10.0.0-rc.2.25416.109</SystemIOPackagingPackageVersion>
27+
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rc.2.25416.109</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
28+
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.2.25416.109</SystemReflectionMetadataLoadContextPackageVersion>
29+
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.2.25416.109</SystemResourcesExtensionsPackageVersion>
30+
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.2.25416.109</SystemRuntimeSerializationFormattersPackageVersion>
31+
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-rc.2.25416.109</SystemSecurityCryptographyXmlPackageVersion>
32+
<SystemSecurityPermissionsPackageVersion>10.0.0-rc.2.25416.109</SystemSecurityPermissionsPackageVersion>
33+
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.2.25416.109</SystemWindowsExtensionsPackageVersion>
3434
<!-- _git/dotnet-wpf-int dependencies -->
3535
<MicrosoftDotNetWpfDncEngPackageVersion>10.0.0-preview.7.25317.2</MicrosoftDotNetWpfDncEngPackageVersion>
3636
</PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,100 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="a01724db6d16445177cb31c6f300d38b0af06290" BarId="279606" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e" BarId="279809" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rc.2.25416.105">
5+
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rc.2.25416.109">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
7+
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rc.2.25416.105">
9+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rc.2.25416.109">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
11+
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
1212
</Dependency>
13-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.2.25416.105">
13+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.2.25416.109">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
15+
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
1616
</Dependency>
17-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.2.25416.105">
17+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.2.25416.109">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
19+
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.2.25416.105">
21+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.2.25416.109">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
23+
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
2424
</Dependency>
2525
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-preview.7.25317.2">
2626
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
2727
<Sha>8a6c1d81657ef04c040f598cafacf8f5a33abda2</Sha>
2828
</Dependency>
29-
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.2.25416.105">
29+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.2.25416.109">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
31+
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
3232
</Dependency>
33-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.2.25416.105">
33+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.2.25416.109">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
35+
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.2.25416.105">
37+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.2.25416.109">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
39+
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
4040
</Dependency>
41-
<Dependency Name="System.CodeDom" Version="10.0.0-rc.2.25416.105">
41+
<Dependency Name="System.CodeDom" Version="10.0.0-rc.2.25416.109">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
43+
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
4444
</Dependency>
45-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.2.25416.105">
45+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.2.25416.109">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
47+
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
4848
</Dependency>
49-
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-rc.2.25416.105">
49+
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-rc.2.25416.109">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
51+
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
5252
</Dependency>
53-
<Dependency Name="System.DirectoryServices" Version="10.0.0-rc.2.25416.105">
53+
<Dependency Name="System.DirectoryServices" Version="10.0.0-rc.2.25416.109">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
55+
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.2.25416.105">
57+
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.2.25416.109">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
59+
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
6060
</Dependency>
61-
<Dependency Name="System.IO.Packaging" Version="10.0.0-rc.2.25416.105">
61+
<Dependency Name="System.IO.Packaging" Version="10.0.0-rc.2.25416.109">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
63+
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
6464
</Dependency>
65-
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-rc.2.25416.105">
65+
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-rc.2.25416.109">
6666
<Uri>https://github.com/dotnet/dotnet</Uri>
67-
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
67+
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
6868
</Dependency>
69-
<Dependency Name="System.Security.Permissions" Version="10.0.0-rc.2.25416.105">
69+
<Dependency Name="System.Security.Permissions" Version="10.0.0-rc.2.25416.109">
7070
<Uri>https://github.com/dotnet/dotnet</Uri>
71-
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
71+
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
7272
</Dependency>
73-
<Dependency Name="System.Drawing.Common" Version="10.0.0-rc.2.25416.105">
73+
<Dependency Name="System.Drawing.Common" Version="10.0.0-rc.2.25416.109">
7474
<Uri>https://github.com/dotnet/dotnet</Uri>
75-
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
75+
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
7676
</Dependency>
7777
</ProductDependencies>
7878
<ToolsetDependencies>
79-
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rc.2.25416.105">
79+
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rc.2.25416.109">
8080
<Uri>https://github.com/dotnet/dotnet</Uri>
81-
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
81+
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
8282
</Dependency>
83-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25416.105">
83+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25416.109">
8484
<Uri>https://github.com/dotnet/dotnet</Uri>
85-
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
85+
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
8686
</Dependency>
87-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25416.105">
87+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25416.109">
8888
<Uri>https://github.com/dotnet/dotnet</Uri>
89-
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
89+
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
9090
</Dependency>
91-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25416.105">
91+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25416.109">
9292
<Uri>https://github.com/dotnet/dotnet</Uri>
93-
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
93+
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
9494
</Dependency>
95-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25416.105">
95+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25416.109">
9696
<Uri>https://github.com/dotnet/dotnet</Uri>
97-
<Sha>a01724db6d16445177cb31c6f300d38b0af06290</Sha>
97+
<Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
9898
</Dependency>
9999
<!-- TODO: Unpin sourcelink dependencies: https://github.com/dotnet/wpf/issues/11042 -->
100100
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2" Pinned="true">

‎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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
}
2525
},
2626
"msbuild-sdks": {
27-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25416.105",
28-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25416.105",
27+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25416.109",
28+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25416.109",
2929
"Microsoft.Build.NoTargets": "3.7.56"
3030
},
3131
"native-tools": {

0 commit comments

Comments
 (0)