Skip to content

Commit 8f5c3dc

Browse files
harshit7962harshit7962
authored
Merge branch 'main' into partTemplateParity
2 parents 2efdd84 + cf08209 commit 8f5c3dc

File tree

6 files changed

+118
-135
lines changed

6 files changed

+118
-135
lines changed

‎eng/Version.Details.xml‎

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

‎eng/Versions.props‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,27 @@
2121
</PropertyGroup>
2222
<!-- Packages that come from https://github.com/dotnet/winforms -->
2323
<PropertyGroup>
24-
<MicrosoftPrivateWinformsVersion>9.0.0-preview.7.24359.3</MicrosoftPrivateWinformsVersion>
24+
<MicrosoftPrivateWinformsVersion>9.0.0-preview.7.24365.2</MicrosoftPrivateWinformsVersion>
2525
</PropertyGroup>
2626
<!-- Packages that come from https://github.com/dotnet/runtime -->
2727
<PropertyGroup>
28-
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24358.7</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
29-
<MicrosoftNETCoreAppRefVersion>9.0.0-preview.7.24358.7</MicrosoftNETCoreAppRefVersion>
30-
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-preview.7.24358.7</MicrosoftNETCoreAppRuntimewinx64Version>
31-
<MicrosoftNETCorePlatformsVersion>9.0.0-preview.7.24358.7</MicrosoftNETCorePlatformsVersion>
32-
<SystemCodeDomPackageVersion>9.0.0-preview.7.24358.7</SystemCodeDomPackageVersion>
33-
<SystemConfigurationConfigurationManagerPackageVersion>9.0.0-preview.7.24358.7</SystemConfigurationConfigurationManagerPackageVersion>
34-
<SystemDiagnosticsEventLogPackageVersion>9.0.0-preview.7.24358.7</SystemDiagnosticsEventLogPackageVersion>
35-
<SystemDrawingCommonVersion>9.0.0-preview.7.24359.3</SystemDrawingCommonVersion>
36-
<SystemDirectoryServicesVersion>9.0.0-preview.7.24358.7</SystemDirectoryServicesVersion>
37-
<SystemIOPackagingVersion>9.0.0-preview.7.24358.7</SystemIOPackagingVersion>
38-
<SystemReflectionMetadataLoadContextVersion>9.0.0-preview.7.24358.7</SystemReflectionMetadataLoadContextVersion>
28+
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24365.1</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
29+
<MicrosoftNETCoreAppRefVersion>9.0.0-preview.7.24365.1</MicrosoftNETCoreAppRefVersion>
30+
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-preview.7.24365.1</MicrosoftNETCoreAppRuntimewinx64Version>
31+
<MicrosoftNETCorePlatformsVersion>9.0.0-preview.7.24365.1</MicrosoftNETCorePlatformsVersion>
32+
<SystemCodeDomPackageVersion>9.0.0-preview.7.24365.1</SystemCodeDomPackageVersion>
33+
<SystemConfigurationConfigurationManagerPackageVersion>9.0.0-preview.7.24365.1</SystemConfigurationConfigurationManagerPackageVersion>
34+
<SystemDiagnosticsEventLogPackageVersion>9.0.0-preview.7.24365.1</SystemDiagnosticsEventLogPackageVersion>
35+
<SystemDrawingCommonVersion>9.0.0-preview.7.24365.2</SystemDrawingCommonVersion>
36+
<SystemDirectoryServicesVersion>9.0.0-preview.7.24365.1</SystemDirectoryServicesVersion>
37+
<SystemIOPackagingVersion>9.0.0-preview.7.24365.1</SystemIOPackagingVersion>
38+
<SystemReflectionMetadataLoadContextVersion>9.0.0-preview.7.24365.1</SystemReflectionMetadataLoadContextVersion>
3939
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
40-
<SystemResourcesExtensionsVersion>9.0.0-preview.7.24358.7</SystemResourcesExtensionsVersion>
41-
<SystemRuntimeSerializationFormattersPackageVersion>9.0.0-preview.7.24358.7</SystemRuntimeSerializationFormattersPackageVersion>
42-
<SystemSecurityCryptographyXmlPackageVersion>9.0.0-preview.7.24358.7</SystemSecurityCryptographyXmlPackageVersion>
43-
<SystemSecurityPermissionsPackageVersion>9.0.0-preview.7.24358.7</SystemSecurityPermissionsPackageVersion>
44-
<SystemWindowsExtensionsPackageVersion>9.0.0-preview.7.24358.7</SystemWindowsExtensionsPackageVersion>
40+
<SystemResourcesExtensionsVersion>9.0.0-preview.7.24365.1</SystemResourcesExtensionsVersion>
41+
<SystemRuntimeSerializationFormattersPackageVersion>9.0.0-preview.7.24365.1</SystemRuntimeSerializationFormattersPackageVersion>
42+
<SystemSecurityCryptographyXmlPackageVersion>9.0.0-preview.7.24365.1</SystemSecurityCryptographyXmlPackageVersion>
43+
<SystemSecurityPermissionsPackageVersion>9.0.0-preview.7.24365.1</SystemSecurityPermissionsPackageVersion>
44+
<SystemWindowsExtensionsPackageVersion>9.0.0-preview.7.24365.1</SystemWindowsExtensionsPackageVersion>
4545
</PropertyGroup>
4646
<!-- Docs / Intellisense -->
4747
<PropertyGroup>
@@ -50,7 +50,7 @@
5050
<!-- Packages that come from https://github.com/dotnet/arcade -->
5151
<PropertyGroup>
5252
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.24053.1</MicrosoftDotNetApiCompatVersion>
53-
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.24352.2</MicrosoftDotNetCodeAnalysisPackageVersion>
53+
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.24360.4</MicrosoftDotNetCodeAnalysisPackageVersion>
5454
</PropertyGroup>
5555
<!-- Sourcelink -->
5656
<PropertyGroup>
@@ -108,6 +108,6 @@
108108
<SystemReflectionMetadataLoadContextPackage>System.Reflection.MetadataLoadContext</SystemReflectionMetadataLoadContextPackage>
109109
</PropertyGroup>
110110
<PropertyGroup>
111-
<MicrosoftDotNetWpfDncEngVersion>9.0.0-preview.7.24353.2</MicrosoftDotNetWpfDncEngVersion>
111+
<MicrosoftDotNetWpfDncEngVersion>9.0.0-preview.7.24360.2</MicrosoftDotNetWpfDncEngVersion>
112112
</PropertyGroup>
113113
</Project>

‎eng/common/core-templates/job/publish-build-assets.yml‎

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -113,38 +113,19 @@ jobs:
113113
Add-Content -Path $filePath -Value "$(DefaultChannels)"
114114
Add-Content -Path $filePath -Value $(IsStableBuild)
115115
116-
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
117-
parameters:
118-
is1ESPipeline: ${{ parameters.is1ESPipeline }}
119-
args:
120-
displayName: Publish ReleaseConfigs Artifact
121-
pathToPublish: '$(Build.StagingDirectory)/ReleaseConfigs'
122-
publishLocation: Container
123-
artifactName: ReleaseConfigs
124-
125-
- task: powershell@2
126-
displayName: Check if SymbolPublishingExclusionsFile.txt exists
127-
inputs:
128-
targetType: inline
129-
script: |
130116
$symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt"
131-
if(Test-Path -Path $symbolExclusionfile)
117+
if (Test-Path -Path $symbolExclusionfile)
132118
{
133119
Write-Host "SymbolExclusionFile exists"
134-
Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]true"
135-
}
136-
else{
137-
Write-Host "Symbols Exclusion file does not exist"
138-
Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]false"
120+
Copy-Item -Path $symbolExclusionfile -Destination "$(Build.StagingDirectory)/ReleaseConfigs"
139121
}
140122
141123
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
142124
parameters:
143125
is1ESPipeline: ${{ parameters.is1ESPipeline }}
144126
args:
145-
displayName: Publish SymbolPublishingExclusionsFile Artifact
146-
condition: eq(variables['SymbolExclusionFile'], 'true')
147-
pathToPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
127+
displayName: Publish ReleaseConfigs Artifact
128+
pathToPublish: '$(Build.StagingDirectory)/ReleaseConfigs'
148129
publishLocation: Container
149130
artifactName: ReleaseConfigs
150131

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ __AlpinePackages+=" krb5-dev"
7272
__AlpinePackages+=" openssl-dev"
7373
__AlpinePackages+=" zlib-dev"
7474

75-
__FreeBSDBase="13.2-RELEASE"
75+
__FreeBSDBase="13.3-RELEASE"
7676
__FreeBSDPkg="1.17.0"
7777
__FreeBSDABI="13"
7878
__FreeBSDPackages="libunwind"

‎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.24352.2",
16-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24352.2"
15+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24360.4",
16+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24360.4"
1717
},
1818
"sdk": {
1919
"version": "9.0.100-preview.5.24307.3"

‎src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/DatePicker.xaml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
BorderBrush="{TemplateBinding BorderBrush}"
114114
BorderThickness="{TemplateBinding BorderThickness}"
115115
CornerRadius="{TemplateBinding Border.CornerRadius}">
116-
<Grid x:Name="PART_Root" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
116+
<Grid x:Name="PART_Root" FocusManager.FocusedElement="{Binding ElementName=PART_Button}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
117117
<Grid.ColumnDefinitions>
118118
<ColumnDefinition Width="*" />
119119
<ColumnDefinition Width="Auto" />
@@ -144,9 +144,11 @@
144144
Background="Transparent"
145145
BorderBrush="Transparent"
146146
AutomationProperties.Name="{Binding Path=(AutomationProperties.Name), Mode=OneWay, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type DatePicker}}}"
147-
Cursor="Arrow">
147+
Cursor="Arrow"
148+
Focusable="True"
149+
IsTabStop="True" >
148150
<!-- WPF overrides paddings for button -->
149-
151+
150152
<TextBlock
151153
Margin="{StaticResource DatePickerCalendarButtonPadding}"
152154
HorizontalAlignment="Center"
@@ -176,7 +178,7 @@
176178
HorizontalAlignment="Stretch"
177179
VerticalAlignment="Top"
178180
AllowsTransparency="True"
179-
Placement="Mouse"
181+
Placement="Bottom"
180182
PlacementTarget="{Binding ElementName=PART_TextBox}"
181183
StaysOpen="False" />
182184
</Grid>

0 commit comments

Comments
 (0)