Skip to content

Commit 75eb7e9

Browse files
SimonZhao888SimonZhao888
authored
[automated] Merge branch 'release/10.0.1xx' => 'main' (#50371)
2 parents 66d3f47 + a17c0c9 commit 75eb7e9

16 files changed

+453
-464
lines changed

‎.vsts-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ extends:
103103
templateFolderName: templates-official
104104
publishTaskPrefix: 1ES.
105105
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
106-
locBranch: main
106+
locBranch: release/10.0.1xx
107107
# WORKAROUND: BinSkim requires the folder exist prior to scanning.
108108
preSteps:
109109
- powershell: New-Item -ItemType Directory -Path $(Build.SourcesDirectory)/artifacts/bin -Force

‎eng/Version.Details.props‎

Lines changed: 131 additions & 129 deletions
Large diffs are not rendered by default.

‎eng/Version.Details.xml‎

Lines changed: 267 additions & 259 deletions
Large diffs are not rendered by default.

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
<VersionFeature60>36</VersionFeature60>
3939
<VersionFeature70>20</VersionFeature70>
4040
<!-- This version should be N-1 (ie the currently released version) in the preview branch but N-2 in main so that workloads stay behind the unreleased version -->
41-
<VersionFeature80>17</VersionFeature80>
42-
<VersionFeature90>6</VersionFeature90>
41+
<VersionFeature80>18</VersionFeature80>
42+
<VersionFeature90>7</VersionFeature90>
4343
<!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
4444
referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
4545
<_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>

‎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
@@ -21,8 +21,8 @@
2121
}
2222
},
2323
"msbuild-sdks": {
24-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25414.103",
25-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25414.103",
24+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25416.109",
25+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25416.109",
2626
"Microsoft.Build.NoTargets": "3.7.0",
2727
"Microsoft.Build.Traversal": "3.4.0",
2828
"Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382"

‎src/Layout/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
because it is large (100MB+). -->
5858
<_IsCommunityPlatform Condition="'$(OSName)' != 'win' and '$(OSName)' != 'osx'
5959
and !('$(OSName)' == 'linux' and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'x86' or '$(TargetArchitecture)' == 'arm' or '$(TargetArchitecture)' == 'arm64'))">true</_IsCommunityPlatform>
60-
<BundleCrossgen2 Condition="'$(BundleCrossgen2)' == '' and '$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildUseMonoRuntime)' != 'true' and '$( _IsCommunityPlatform )' == 'true'">true</BundleCrossgen2>
60+
<BundleCrossgen2 Condition="'$(BundleCrossgen2)' == '' and '$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildUseMonoRuntime)' != 'true' and '$(_IsCommunityPlatform)' == 'true'">true</BundleCrossgen2>
6161

6262
<!-- Use the portable "linux-x64" Rid when downloading Linux shared framework compressed file. -->
6363
<UsePortableLinuxSharedFramework Condition="'$(UsePortableLinuxSharedFramework)' == '' and '$(IsLinux)' == 'true' and !$(TargetRid.StartsWith('linux-musl'))">true</UsePortableLinuxSharedFramework>

‎src/Layout/Directory.Build.targets‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
<ToolsetBrandName>Microsoft .NET Toolset $(Version)</ToolsetBrandName>
3131
<SharedFrameworkBrandName>Microsoft .NET Runtime $(MicrosoftNETCoreAppRuntimePackageVersion)</SharedFrameworkBrandName>
3232
<NetCoreAppTargetingPackBrandName>Microsoft .NET Targeting Pack $(MicrosoftNETCoreAppRefPackageVersion)</NetCoreAppTargetingPackBrandName>
33-
<NetStandardTargetingPackBrandName>Microsoft .NET Standard 2.1 Targeting Pack $(NETStandardLibraryRefPackageVersion)</NetStandardTargetingPackBrandName>
3433
<NetCoreAppHostPackBrandName>Microsoft .NET AppHost Pack $(MicrosoftNETCoreAppHostHostPackageVersion)</NetCoreAppHostPackBrandName>
3534
<SharedHostBrandName>Microsoft .NET Host $(SharedHostVersion)</SharedHostBrandName>
3635
<HostFxrBrandName>Microsoft .NET Host FX Resolver $(HostFxrVersion)</HostFxrBrandName>

0 commit comments

Comments
 (0)