Skip to content

Commit 18910a4

Browse files
author
Mirroring
committed
Merge commit '790461a7f98d8857a9a3241830a755ae1092771f'
2 parents d8486c5 + 790461a commit 18910a4

File tree

6 files changed

+44
-19
lines changed

6 files changed

+44
-19
lines changed

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,25 +165,25 @@
165165
</Dependency>
166166
</ProductDependencies>
167167
<ToolsetDependencies>
168-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25271.1">
168+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25302.2">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>086a1771875b63404b4a710d27250fe384dc2810</Sha>
170+
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
171171
</Dependency>
172-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.25271.1">
172+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.25302.2">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174-
<Sha>086a1771875b63404b4a710d27250fe384dc2810</Sha>
174+
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25271.1">
176+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25302.2">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>086a1771875b63404b4a710d27250fe384dc2810</Sha>
178+
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
179179
</Dependency>
180180
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="9.0.0-beta.24053.1">
181181
<Uri>https://github.com/dotnet/arcade</Uri>
182182
<Sha>f4e11a15c7b8a949d4a366e792a9843ff6e88cd5</Sha>
183183
</Dependency>
184-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.25271.1">
184+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.25302.2">
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186-
<Sha>086a1771875b63404b4a710d27250fe384dc2810</Sha>
186+
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
187187
</Dependency>
188188
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
189189
<Uri>https://github.com/dotnet/sourcelink</Uri>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<MajorVersion>9</MajorVersion>
55
<MinorVersion>0</MinorVersion>
6-
<PatchVersion>6</PatchVersion>
6+
<PatchVersion>7</PatchVersion>
77
<PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
88
<PreReleaseVersionIteration>
99
</PreReleaseVersionIteration>
@@ -52,7 +52,7 @@
5252
<!-- Packages that come from https://github.com/dotnet/arcade -->
5353
<PropertyGroup>
5454
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.24053.1</MicrosoftDotNetApiCompatVersion>
55-
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.25271.1</MicrosoftDotNetCodeAnalysisPackageVersion>
55+
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.25302.2</MicrosoftDotNetCodeAnalysisPackageVersion>
5656
</PropertyGroup>
5757
<!-- Sourcelink -->
5858
<PropertyGroup>

‎eng/common/core-templates/post-build/post-build.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@ parameters:
4444
displayName: Publish installers and checksums
4545
type: boolean
4646
default: true
47+
48+
- name: requireDefaultChannels
49+
displayName: Fail the build if there are no default channel(s) registrations for the current build
50+
type: boolean
51+
default: false
4752

4853
- name: SDLValidationParameters
4954
type: object
@@ -312,5 +317,6 @@ stages:
312317
-PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
313318
-AzdoToken '$(System.AccessToken)'
314319
-WaitPublishingFinish true
320+
-RequireDefaultChannels ${{ parameters.requireDefaultChannels }}
315321
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
316322
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'

‎eng/common/post-build/publish-using-darc.ps1‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ param(
55
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net',
66
[Parameter(Mandatory=$true)][string] $WaitPublishingFinish,
77
[Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
8-
[Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters
8+
[Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters,
9+
[Parameter(Mandatory=$false)][string] $RequireDefaultChannels
910
)
1011

1112
try {
@@ -33,6 +34,10 @@ try {
3334
if ("false" -eq $WaitPublishingFinish) {
3435
$optionalParams.Add("--no-wait") | Out-Null
3536
}
37+
38+
if ("true" -eq $RequireDefaultChannels) {
39+
$optionalParams.Add("--default-channels-required") | Out-Null
40+
}
3641

3742
& $darc add-build-to-channel `
3843
--id $buildId `

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25271.1",
16-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25271.1"
15+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25302.2",
16+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25302.2"
1717
},
1818
"sdk": {
1919
"version": "9.0.106"

‎src/Microsoft.DotNet.Wpf/src/PresentationCore/Fonts/GlobalUserInterface.CompositeFont‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1745,9 +1745,13 @@
17451745
Target = "MingLiU-ExtB"
17461746
Scale = "1.0" />
17471747
<!-- Other -->
1748+
<!-- CHT/KO/All
1749+
MingLiU-ExtB is not in UapFonts so Yu Gothic is specified as a fallback.
1750+
YaHei, Simsun-ExtB, and MingLiU_HKSCS-ExtB are included at the end of this catch-all category because each includes some characters
1751+
not present in other fonts. -->
17481752
<FontFamilyMap
17491753
Unicode = "20000-2A6DF"
1750-
Target = "MingLiU-ExtB"
1754+
Target = "MingLiU-ExtB, Yu Gothic UI, Microsoft YaHei UI, Simsun-ExtB, MingLiU_HKSCS-ExtB"
17511755
Scale = "1.0" />
17521756

17531757
<!-- (unassigned) 2A6E0-2A6FF -->
@@ -1790,9 +1794,13 @@
17901794
Target = "MingLiU-ExtB"
17911795
Scale = "1.0" />
17921796
<!-- Other -->
1797+
<!-- All
1798+
MingLiU-ExtB is not in UapFonts so Yu Gothic is specified as a fallback.
1799+
YaHei, Simsun-ExtB, and MingLiU_HKSCS-ExtB are included at the end of this catch-all category because each includes some characters
1800+
not present in other fonts. -->
17931801
<FontFamilyMap
17941802
Unicode = "2A700-2B81F"
1795-
Target = "MingLiU-ExtB"
1803+
Target = "MingLiU-ExtB, Yu Gothic UI, Microsoft YaHei UI, Simsun-ExtB, MingLiU_HKSCS-ExtB"
17961804
Scale = "1.0" />
17971805

17981806
<!--
@@ -1801,10 +1809,13 @@
18011809
-->
18021810
<FontFamilyMap
18031811
Unicode = "2B820-2EBEF"
1804-
Target = "SimSun-ExtB"
1812+
Target = "SimSun-ExtB, Yu Gothic UI, Yu Gothic, Microsoft YaHei UI, Microsoft YaHei"
18051813
Scale = "1.0" />
18061814

1807-
<!-- (unassigned) 2EBF0-2F7FF -->
1815+
<FontFamilyMap
1816+
Unicode = "2EBF0-2EE5F"
1817+
Target = "SimSun-ExtG"
1818+
Scale = "1.0" />
18081819

18091820
<!-- CJK Compatibility Ideographs Supplement 2F800-2FA1F -->
18101821
<!-- Vista, Win7, Win8:
@@ -1845,12 +1856,15 @@
18451856
<!-- Other -->
18461857
<FontFamilyMap
18471858
Unicode = "2F800-2FA1F"
1848-
Target = "Yu Gothic UI, Meiryo UI, Meiryo, MingLiU-ExtB"
1859+
Target = "Yu Gothic UI, Meiryo UI, Meiryo, MingLiU-ExtB, MingLiU_MSCS-ExtB"
18491860
Scale = "1.0" />
18501861

18511862
<!-- (unassigned) 2FA20-2FFFF -->
18521863

1853-
<!-- (unassigned) 30000-3FFFF -->
1864+
<FontFamilyMap
1865+
Unicode = "30000-323AF"
1866+
Target = "SimSun-ExtG"
1867+
Scale = "1.0" />
18541868

18551869
<!-- Ignoring planes 4 to 16 -->
18561870

0 commit comments

Comments
 (0)