Skip to content

Commit 8a4ded7

Browse files
Youssef1313Youssef1313
authored
Merge branch 'dotnet:main' into xunitv3
2 parents 3c31dd9 + ac86baa commit 8a4ded7

38 files changed

+3922
-1558
lines changed

‎README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Windows Presentation Foundation (WPF)
1+
# Windows Presentation Foundation (WPF)
22
[![.NET Foundation](https://img.shields.io/badge/.NET%20Foundation-blueviolet.svg)](https://www.dotnetfoundation.org/)
33
[![Build Status](https://dnceng.visualstudio.com/public/_apis/build/status/dotnet/wpf/dotnet-wpf%20CI)](https://dnceng.visualstudio.com/public/_build/latest?definitionId=270)
44
[![codecov](https://codecov.io/gh/dotnet/wpf/branch/main/graph/badge.svg?flag=production)](https://codecov.io/gh/dotnet/wpf)
@@ -22,15 +22,15 @@ To build the WPF repo and contribute features and fixes for .NET 8.0, [Visual St
2222

2323
## Getting started
2424

25-
* [.NET 6.0 SDK](https://dotnet.microsoft.com/download/dotnet/6.0), [.NET 7.0 SDK](https://dotnet.microsoft.com/download/dotnet/7.0)
26-
* [.NET Preview SDKs (8.0 daily, 7.0 servicing)](https://github.com/dotnet/installer)
25+
* [.NET 6.0 SDK](https://dotnet.microsoft.com/download/dotnet/6.0), [.NET 7.0 SDK](https://dotnet.microsoft.com/download/dotnet/7.0), [.NET 8.0 SDK](https://dotnet.microsoft.com/download/dotnet/8.0), [.NET 9.0 SDK](https://dotnet.microsoft.com/download/dotnet/9.0)
26+
* [.NET Preview SDKs](https://github.com/dotnet/dotnet/blob/main/docs/builds-table.md)
2727
* [Getting started instructions](Documentation/getting-started.md)
2828
* [Contributing guide](Documentation/contributing.md)
29-
* [Migrating .NET Framework WPF Apps to .NET Core](https://docs.microsoft.com/en-us/dotnet/desktop-wpf/migration/convert-project-from-net-framework)
29+
* [Migrating .NET Framework WPF Apps to .NET Core](https://learn.microsoft.com/en-us/dotnet/desktop/wpf/migration/)
3030

3131
## Status
3232

33-
- We are currently developing WPF for .NET 8.
33+
- We are currently developing WPF for .NET 10.
3434

3535
See the [WPF roadmap](roadmap.md) to learn about the schedule for specific WPF components.
3636

@@ -56,7 +56,7 @@ They should not be filed on this repo.
5656

5757
This code base is a fork of the WPF code in the .NET Framework. .NET Core 3.0 was released with a goal of WPF having parity with the .NET Framework version. Over time, the two implementations may diverge.
5858

59-
The [Update on .NET Core 3.0 and .NET Framework 4.8](https://blogs.msdn.microsoft.com/dotnet/2018/10/04/update-on-net-core-3-0-and-net-framework-4-8/) provides a good description of the forward-looking differences between .NET Core and .NET Framework.
59+
The [Update on .NET Core 3.0 and .NET Framework 4.8](https://devblogs.microsoft.com/dotnet/update-on-net-core-3-0-and-net-framework-4-8/) provides a good description of the forward-looking differences between .NET Core and .NET Framework.
6060

6161
This [update](https://devblogs.microsoft.com/dotnet/net-core-is-the-future-of-net/) states how going forward .NET Core is the future of .NET. and .NET Framework 4.8 will be the last major version of .NET Framework.
6262

‎eng/Version.Details.xml

Lines changed: 49 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,104 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d" BarId="269724" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="be8cb623e031f933b5b62e82d37094b4981dce30" BarId="271836" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-preview.6.25277.102">
5+
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-preview.6.25315.102">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
7+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.6.25277.102">
9+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.6.25315.102">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
11+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
1212
</Dependency>
13-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.6.25277.102">
13+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.6.25315.102">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
15+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
1616
</Dependency>
17-
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.6.25277.102">
17+
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.6.25315.102">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
19+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.6.25277.102">
21+
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.6.25315.102">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
23+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-preview.5.25222.1">
25+
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-preview.6.25280.1">
2626
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
27-
<Sha>462eb030906d5cfcbcbbe22126855da1073cda15</Sha>
27+
<Sha>5a079d0b04213669793487f309e2d0eb1d146d25</Sha>
2828
</Dependency>
29-
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.6.25277.102">
29+
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.6.25315.102">
3030
<Uri>https://github.com/dotnet/dotnet</Uri>
31-
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
31+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
3232
</Dependency>
33-
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.6.25277.102">
33+
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.6.25315.102">
3434
<Uri>https://github.com/dotnet/dotnet</Uri>
35-
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
35+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.6.25277.102">
37+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.6.25315.102">
3838
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
39+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.6.25277.102">
41+
<Dependency Name="System.CodeDom" Version="10.0.0-preview.6.25315.102">
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
43-
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
43+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
4444
</Dependency>
45-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.6.25277.102">
45+
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.6.25315.102">
4646
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
47+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
4848
</Dependency>
49-
<Dependency Name="System.CodeDom" Version="10.0.0-preview.6.25277.102">
49+
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-preview.6.25315.102">
5050
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
51+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
5252
</Dependency>
53-
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.6.25277.102">
53+
<Dependency Name="System.DirectoryServices" Version="10.0.0-preview.6.25315.102">
5454
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
55+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
5656
</Dependency>
57-
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-preview.6.25277.102">
57+
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.6.25315.102">
5858
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
59+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
6060
</Dependency>
61-
<Dependency Name="System.DirectoryServices" Version="10.0.0-preview.6.25277.102">
61+
<Dependency Name="System.IO.Packaging" Version="10.0.0-preview.6.25315.102">
6262
<Uri>https://github.com/dotnet/dotnet</Uri>
63-
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
63+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
6464
</Dependency>
65-
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.6.25277.102">
65+
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-preview.6.25315.102">
6666
<Uri>https://github.com/dotnet/dotnet</Uri>
67-
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
67+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
6868
</Dependency>
69-
<Dependency Name="System.IO.Packaging" Version="10.0.0-preview.6.25277.102">
69+
<Dependency Name="System.Security.Permissions" Version="10.0.0-preview.6.25315.102">
7070
<Uri>https://github.com/dotnet/dotnet</Uri>
71-
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
71+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
7272
</Dependency>
73-
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-preview.6.25277.102">
73+
<Dependency Name="System.Drawing.Common" Version="10.0.0-preview.6.25315.102">
7474
<Uri>https://github.com/dotnet/dotnet</Uri>
75-
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
76-
</Dependency>
77-
<Dependency Name="System.Security.Permissions" Version="10.0.0-preview.6.25277.102">
78-
<Uri>https://github.com/dotnet/dotnet</Uri>
79-
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
80-
</Dependency>
81-
<Dependency Name="System.Drawing.Common" Version="10.0.0-preview.6.25277.102">
82-
<Uri>https://github.com/dotnet/dotnet</Uri>
83-
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
75+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
8476
</Dependency>
8577
</ProductDependencies>
8678
<ToolsetDependencies>
87-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25277.102">
79+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25315.102">
8880
<Uri>https://github.com/dotnet/dotnet</Uri>
89-
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
81+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
9082
</Dependency>
91-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25277.102">
83+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25315.102">
9284
<Uri>https://github.com/dotnet/dotnet</Uri>
93-
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
85+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
9486
</Dependency>
95-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25277.102">
87+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25315.102">
9688
<Uri>https://github.com/dotnet/dotnet</Uri>
97-
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
89+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
9890
</Dependency>
99-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25277.102">
91+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25315.102">
10092
<Uri>https://github.com/dotnet/dotnet</Uri>
101-
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
93+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
10294
</Dependency>
103-
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="10.0.0-beta.25277.102">
95+
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="10.0.0-beta.25315.102">
10496
<Uri>https://github.com/dotnet/dotnet</Uri>
105-
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
97+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
10698
</Dependency>
107-
<Dependency Name="Microsoft.SourceLink.GitHub" Version="10.0.0-beta.25277.102">
99+
<Dependency Name="Microsoft.SourceLink.GitHub" Version="10.0.0-beta.25315.102">
108100
<Uri>https://github.com/dotnet/dotnet</Uri>
109-
<Sha>57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d</Sha>
101+
<Sha>be8cb623e031f933b5b62e82d37094b4981dce30</Sha>
110102
</Dependency>
111103
</ToolsetDependencies>
112104
</Dependencies>

‎eng/Versions.props

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,35 +18,33 @@
1818
dotnet/winforms is handling versions for the analyzers.
1919
-->
2020
<AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
21-
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25277.102</MicrosoftDotNetCodeAnalysisVersion>
22-
<MicrosoftSourceLinkAzureReposGitVersion>10.0.0-beta.25277.102</MicrosoftSourceLinkAzureReposGitVersion>
23-
<MicrosoftSourceLinkGitHubVersion>10.0.0-beta.25277.102</MicrosoftSourceLinkGitHubVersion>
21+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25315.102</MicrosoftDotNetCodeAnalysisVersion>
22+
<MicrosoftSourceLinkAzureReposGitVersion>10.0.0-beta.25315.102</MicrosoftSourceLinkAzureReposGitVersion>
23+
<MicrosoftSourceLinkGitHubVersion>10.0.0-beta.25315.102</MicrosoftSourceLinkGitHubVersion>
2424
</PropertyGroup>
2525
<!-- Packages that come from https://github.com/dotnet/winforms -->
2626
<PropertyGroup>
27-
<MicrosoftDotnetWinFormsProjectTemplatesVersion>10.0.0-preview.6.25277.102</MicrosoftDotnetWinFormsProjectTemplatesVersion>
28-
<MicrosoftPrivateWinformsVersion>10.0.0-preview.6.25277.102</MicrosoftPrivateWinformsVersion>
29-
<SystemDrawingCommonVersion>10.0.0-preview.6.25277.102</SystemDrawingCommonVersion>
27+
<MicrosoftDotnetWinFormsProjectTemplatesVersion>10.0.0-preview.6.25315.102</MicrosoftDotnetWinFormsProjectTemplatesVersion>
28+
<MicrosoftPrivateWinformsVersion>10.0.0-preview.6.25315.102</MicrosoftPrivateWinformsVersion>
29+
<SystemDrawingCommonVersion>10.0.0-preview.6.25315.102</SystemDrawingCommonVersion>
3030
</PropertyGroup>
3131
<!-- Packages that come from https://github.com/dotnet/runtime -->
3232
<PropertyGroup>
33-
<VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>10.0.0-preview.6.25277.102</VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion>
34-
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.6.25277.102</MicrosoftNETCoreAppRefVersion>
35-
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.6.25277.102</MicrosoftNETCoreAppRuntimewinx64Version>
36-
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.6.25277.102</MicrosoftNETCorePlatformsVersion>
37-
<SystemCodeDomPackageVersion>10.0.0-preview.6.25277.102</SystemCodeDomPackageVersion>
38-
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.6.25277.102</SystemConfigurationConfigurationManagerPackageVersion>
39-
<SystemDiagnosticsEventLogPackageVersion>10.0.0-preview.6.25277.102</SystemDiagnosticsEventLogPackageVersion>
40-
<SystemDirectoryServicesVersion>10.0.0-preview.6.25277.102</SystemDirectoryServicesVersion>
41-
<SystemFormatsNrbfVersion>10.0.0-preview.6.25277.102</SystemFormatsNrbfVersion>
42-
<SystemIOPackagingVersion>10.0.0-preview.6.25277.102</SystemIOPackagingVersion>
43-
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.6.25277.102</SystemReflectionMetadataLoadContextVersion>
33+
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.6.25315.102</MicrosoftNETCoreAppRefVersion>
34+
<MicrosoftNETCorePlatformsVersion>10.0.0-preview.6.25315.102</MicrosoftNETCorePlatformsVersion>
35+
<SystemCodeDomPackageVersion>10.0.0-preview.6.25315.102</SystemCodeDomPackageVersion>
36+
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-preview.6.25315.102</SystemConfigurationConfigurationManagerPackageVersion>
37+
<SystemDiagnosticsEventLogPackageVersion>10.0.0-preview.6.25315.102</SystemDiagnosticsEventLogPackageVersion>
38+
<SystemDirectoryServicesVersion>10.0.0-preview.6.25315.102</SystemDirectoryServicesVersion>
39+
<SystemFormatsNrbfVersion>10.0.0-preview.6.25315.102</SystemFormatsNrbfVersion>
40+
<SystemIOPackagingVersion>10.0.0-preview.6.25315.102</SystemIOPackagingVersion>
41+
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.6.25315.102</SystemReflectionMetadataLoadContextVersion>
4442
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
45-
<SystemResourcesExtensionsVersion>10.0.0-preview.6.25277.102</SystemResourcesExtensionsVersion>
46-
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.6.25277.102</SystemRuntimeSerializationFormattersPackageVersion>
47-
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-preview.6.25277.102</SystemSecurityCryptographyXmlPackageVersion>
48-
<SystemSecurityPermissionsPackageVersion>10.0.0-preview.6.25277.102</SystemSecurityPermissionsPackageVersion>
49-
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.6.25277.102</SystemWindowsExtensionsPackageVersion>
43+
<SystemResourcesExtensionsVersion>10.0.0-preview.6.25315.102</SystemResourcesExtensionsVersion>
44+
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-preview.6.25315.102</SystemRuntimeSerializationFormattersPackageVersion>
45+
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-preview.6.25315.102</SystemSecurityCryptographyXmlPackageVersion>
46+
<SystemSecurityPermissionsPackageVersion>10.0.0-preview.6.25315.102</SystemSecurityPermissionsPackageVersion>
47+
<SystemWindowsExtensionsPackageVersion>10.0.0-preview.6.25315.102</SystemWindowsExtensionsPackageVersion>
5048
</PropertyGroup>
5149
<!-- These are minimum versions used for netfx-targeted components that run in Visual Studio because in those cases,
5250
Visual Studio is providing those assemblies, and we should work with whichever version it ships. -->
@@ -60,7 +58,7 @@
6058
<!-- Packages that come from https://github.com/dotnet/arcade -->
6159
<PropertyGroup>
6260
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.24053.1</MicrosoftDotNetApiCompatVersion>
63-
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25277.102</MicrosoftDotNetGenAPIVersion>
61+
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25315.102</MicrosoftDotNetGenAPIVersion>
6462
</PropertyGroup>
6563
<!-- Sourcelink -->
6664
<PropertyGroup>
@@ -137,6 +135,6 @@
137135
<SystemReflectionMetadataLoadContextPackage>System.Reflection.MetadataLoadContext</SystemReflectionMetadataLoadContextPackage>
138136
</PropertyGroup>
139137
<PropertyGroup>
140-
<MicrosoftDotNetWpfDncEngVersion>10.0.0-preview.5.25222.1</MicrosoftDotNetWpfDncEngVersion>
138+
<MicrosoftDotNetWpfDncEngVersion>10.0.0-preview.6.25280.1</MicrosoftDotNetWpfDncEngVersion>
141139
</PropertyGroup>
142140
</Project>

‎eng/common/core-templates/job/onelocbuild.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ jobs:
8686
isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }}
8787
${{ if eq(parameters.CreatePr, true) }}:
8888
isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }}
89-
${{ if eq(parameters.RepoType, 'gitHub') }}:
90-
isShouldReusePrSelected: ${{ parameters.ReusePr }}
89+
isShouldReusePrSelected: ${{ parameters.ReusePr }}
9190
packageSourceAuth: patAuth
9291
patVariable: ${{ parameters.CeapexPat }}
9392
${{ if eq(parameters.RepoType, 'gitHub') }}:
@@ -118,4 +117,4 @@ jobs:
118117
pathToPublish: '$(Build.SourcesDirectory)/eng/Localize/'
119118
publishLocation: Container
120119
artifactName: Loc
121-
condition: ${{ parameters.condition }}
120+
condition: ${{ parameters.condition }}

0 commit comments

Comments
 (0)