Skip to content

Commit 23829da

Browse files
authored
Merge branch 'main' into editorconfig
2 parents ebc2172 + fee6e1a commit 23829da

File tree

4,073 files changed

+91133
-47833
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,073 files changed

+91133
-47833
lines changed

Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<PropertyGroup>
33
<RepositoryName>wpf</RepositoryName>
44
<WindowsDesktopARM64Support>true</WindowsDesktopARM64Support>
5-
<TargetFramework>net9.0</TargetFramework>
6-
<TargetFrameworkVersion>9.0</TargetFrameworkVersion>
5+
<TargetFramework>net10.0</TargetFramework>
6+
<TargetFrameworkVersion>10.0</TargetFrameworkVersion>
77
</PropertyGroup>
88
<!-- Normalize $(TestWpfArcadeSdkPath) by appending a '\' to it if one is missing -->
99
<PropertyGroup Condition="'$(TestWpfArcadeSdkPath)'!=''">

Documentation/acceptance_criteria.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Thank you for contributing to **WPF for .NET Core!** We ask that before you sta
3434

3535
5. The issue will be discussed with community members and WPF developers to understand the problem and review possible solutions.
3636

37-
6. When the a solution has been agreed upon, implement and **validate the change locally**.
37+
6. When a solution has been agreed upon, implement and **validate the change locally**.
3838
> Please follow the testing requirements [Developer Guide](developer-guide.md).
3939
4040
> Verify your change works. Create and test the updated feature area locally with a WPF test application compiled against a version of the WPF Framework that contains your changes. See the [Developer Guide](developer-guide.md) for instructions on testing against local builds.

Documentation/api-compat.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ This property points to the directory where reference assemblies for `WPF on .NE
1616
to avoid requiring the [.NET Framework 4.8 Developer Pack](https://dotnet.microsoft.com/download/dotnet-framework/net48) to be installed on all machines that build `WPF on .NET Core`, a private tools zip is used that
1717
contains a copy of these assemblies.
1818
### RefApiCompatNeededProjects
19-
This property contains a list of projects that have hand-crafted references assemblies that must be compared against their corresponding runtime assemblies during API Compatibility checks.
19+
This property contains a list of projects that have hand-crafted reference assemblies that must be compared against their corresponding runtime assemblies during API Compatibility checks.
2020

2121
## [ApiCompat.targets](/eng/WpfArcadeSdk/tools/ApiCompat.targets)
2222
This targets file implements necessary targets to run API compatibility checks.
@@ -40,22 +40,22 @@ The various targets both setup and execute API compatibility checks.
4040
#### ResolveNetFrameworkApiCompatItems
4141
Sets up [ApiCompatBaseline](#ApiCompatBaseline), [ResolvedMatchingContract](#ResolvedMatchingContract), and [ResolvedImplementationAssembly](#ResolvedImplementationAssembly) for projects that require
4242
API compatibility checks against `WPF on .NET Framework 4.8`. This is run before [WpfValidateApiCompatForNetFramework](#WpfValidateApiCompatForNetFramework) to
43-
ensure that the necessary configuration is availabe for the check.
43+
ensure that the necessary configuration is available for the check.
4444
#### ResolveRefApiCompatItems
4545
Sets up [ApiCompatBaseline](#ApiCompatBaseline), [ResolvedMatchingContract](#ResolvedMatchingContract), and [ResolvedImplementationAssembly](#ResolvedImplementationAssembly) for projects that require
4646
API compatibility checks between runtime assemblies and hand-crafted reference assemblies. This is run before [WpfValidateApiCompatForRef](#WpfValidateApiCompatForRef) to
47-
ensure that the necessary configuration is availabe for the check.
47+
ensure that the necessary configuration is available for the check.
4848
#### WpfValidateApiCompatForNetFramework
4949
Calls the API compatibility tool in order to validate a particular project's reference assembly against the corresponding reference assembly for `WPF on .NET Framework 4.8`.
5050
The [ResolvedMatchingContract](#ResolvedMatchingContract) is the `.NET Framework 4.8` assembly and the [ResolvedImplementationAssembly](#ResolvedImplementationAssembly) is the
51-
`.NET Core` assembly. This will generate and MSBuild error for each compatibility issue found. A developer can examine the current [baseline files](#Baseline-Files) to get
51+
`.NET Core` assembly. This will generate an MSBuild error for each compatibility issue found. A developer can examine the current [baseline files](#Baseline-Files) to get
5252
an idea of the kinds of errors that can be reported.
5353

5454
If the tool fails completely, an error of the form "ApiCompat failed for..." will be generated. If this occurs, please [file an issue](https://github.com/dotnet/wpf/issues/new/choose) and include a link to your fork and branch that failed.
5555
#### WpfValidateApiCompatForRef
5656
Calls the API compatibility tool in order to validate a particular project's hand-crafted reference assembly against the corresponding runtime assembly.
5757
The [ResolvedMatchingContract](#ResolvedMatchingContract) is the runtime assembly and the [ResolvedImplementationAssembly](#ResolvedImplementationAssembly) is the
58-
hand-crafted reference assembly. This will generate and MSBuild error for each compatibility issue found. A developer can examine the current [baseline files](#Baseline-Files) to get
58+
hand-crafted reference assembly. This will generate an MSBuild error for each compatibility issue found. A developer can examine the current [baseline files](#Baseline-Files) to get
5959
an idea of the kinds of errors that can be reported.
6060

6161
If the tool fails completely, an error of the form "ApiCompat failed for..." will be generated. If this occurs, please [file an issue](https://github.com/dotnet/wpf/issues/new/choose) and include a link to your fork and branch that failed.
@@ -66,8 +66,8 @@ This directory contains the aggregate baseline files for all initial API compati
6666
Errors listed in a baseline file are ignored by the API compatibility tool on subsequent runs.
6767

6868
These baselined errors are, generally, one of the following:
69-
* Intential API changes that diverge from `WPF on .NET Framework 4.8`
69+
* Intentional API changes that diverge from `WPF on .NET Framework 4.8`
7070
* Errors resulting from changes to underlying assemblies in `.NET Core` that do not adversely affect product functionality
71-
* Errors due to build-specific architecture at the time of baselining (e.g. the split nature of WPF's product build).
71+
* Errors due to build-specific architecture at the time of baselining (e.g., the split nature of WPF's product build).
7272

7373
A developer can re-baseline the entirety of the product by setting the property `BaselineAllAPICompatError` to `true` during a build.

Documentation/contributing.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ Project maintainers will consider changes that improve the product or fix known
1616

1717
Maintainers will not merge changes that have narrowly-defined benefits due to compatibility risk or complexity added to the product. We may revert changes if they are found to be breaking.
1818

19-
Most .NET Core components are cross-platform and we appreciate contributions that either improve their feature set in a given environment or that add support for a new environment. We will typically not accept contributions that implement support for an OS-specific technolology on another operating system. We also do not intend to accept contributions that provide cross-platform implementations for Windows Forms or WPF.
19+
Most .NET Core components are cross-platform and we appreciate contributions that either improve their feature set in a given environment or that add support for a new environment. We will typically not accept contributions that implement support for an OS-specific technology on another operating system. We also do not intend to accept contributions that provide cross-platform implementations for Windows Forms or WPF.
2020

2121
Contributions must also satisfy the [acceptance criteria](acceptance_criteria.md) to learn how to develop changes for this repo.as well as other published guidelines defined in this document.
2222

2323
## Code Formatting Improvements and Minor Enhancements
2424

2525
We will consider code-formatting improvements that are identified by running code analyzers.
2626

27-
Our CodeAnalysis rules are not enabled by default. These can be enabled by setting the MSBuild property `EnableAnalyzers=true` (in commandline, it is set as `/p:EnableAnalyzers=true`).
27+
Our CodeAnalysis rules are not enabled by default. These can be enabled by setting the MSBuild property `EnableAnalyzers=true` (in command line, it is set as `/p:EnableAnalyzers=true`).
2828

2929
The code analyzer would likely recommend changes that can result in changes to the generated IL. In general, we prefer code-formatting PR's to be limited to changes that do not have any impact on the IL - these are easier to review and approve and do not require additional testing.
3030

0 commit comments

Comments
 (0)