Skip to content

Commit 62c9884

Browse files
Merge pull request #10596 from MicrosoftDocs/main638736842380936605sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 55d9fb4 + 8174329 commit 62c9884

File tree

15 files changed

+239
-42
lines changed

15 files changed

+239
-42
lines changed

docs/debugger/adapt-to-removal-of-windows-arm32-dotnet-debugging.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,14 @@ Visual Studio 17.12 can be used from the Long-Term Servicing Channel (LTSC). For
3636

3737
## Option 3: Start without debugging
3838

39-
If you have a project that you still want to run but doesn't require debugging, use **Debug->Start without debugging** to run the project. Since the debugger isn't available, you would need to diagnose any problems by using logging.
39+
If you have a project that you still want to run but doesn't require debugging, you could launch it without debugging. Since the debugger isn't available, you would need to diagnose any problems by using logging.
40+
41+
If your project is a Universal Windows Platform (UWP) project, and the target device is running an Arm32 version of Windows, then you need to manually deploy the project to run it. To do so, build your project to an .appx file, copy the appx to your device, use the WinAppDeployCmd.exe tool to install the .appx, and then start the application from the start menu. For more information, see [Install apps with the WinAppDeployCmd.exe tool](/windows/uwp/packaging/install-universal-windows-apps-with-the-winappdeploycmd-tool).
42+
43+
For other types of projects, you can still use **Debug > Start without debugging** to run the project.
4044

4145
> [!NOTE]
42-
> This option is not recommended since .NET support for Windows on Arm32 has ended.
46+
> This option isn't recommended since .NET support for Windows on Arm32 has ended.
4347
4448

4549
## Option 4: Target Linux

docs/get-started/csharp/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ metadata:
1313
ms.author: ghogen
1414
manager: mijacobs
1515

16-
ms.subservice: vs-acquisition
16+
ms.subservice: general-ide
1717
dev_langs:
1818
- CSharp
1919

docs/get-started/visual-basic/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ metadata:
1313
author: ghogen
1414
manager: mijacobs
1515

16-
ms.subservice: vs-acquisition
16+
ms.subservice: general-ide
1717
dev_langs:
1818
- VB
1919

docs/ide/compare-with.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Compare files in Visual Studio
33
titleSuffix: ""
44
description: Compare or diff two files in Visual Studio to see where changes are by viewing the files side-by-side in a split screen, and to see line-by-line what is different.
5-
ms.date: 03/12/2024
5+
ms.date: 01/27/2025
66
ms.topic: how-to
77
author: ghogen
88
ms.author: ghogen
@@ -34,7 +34,7 @@ From the [Developer Command Prompt](./reference/command-prompt-powershell.md), u
3434
devenv /Diff SourceFile TargetFile [SourceDisplayName [TargetDisplayName]]
3535
```
3636

37-
Visual Studio opens with the two files shown side-by-side, but a project is not opened. The `TargetFile` is considered the newer version, and is editable.
37+
Visual Studio opens with the two files shown side-by-side, but a project is not opened. The `TargetFile` is considered the newer version, and is editable. In the target file, you can make changes in the usual ways such as typing, pasting code from the clipboard, and so on.
3838

3939
## Understand differences
4040

docs/ide/finding-and-replacing-text.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Open the **Find and Replace** dialog box by pressing **Ctrl**+**Shift**+**F**, o
102102

103103
:::moniker-end
104104

105-
To expose the **Replace** text box, use the down arrow to the left of the **Find** text.
105+
To expose the **Replace** text box, use the down arrow to the left of the **Find** text, or choose the tab **Replace in Files**. When you switch to replace mode, an additional text field appears for the replacement text, and a checkbox appears that provides the option to preserve case when replacing text.
106106

107107
Set the scope of your search and replace operation to:
108108

@@ -117,6 +117,8 @@ The **Find and Replace** tool does not search directories with the `Hidden` or `
117117

118118
To cancel a Find or Replace operation, press **Ctrl**+**Break**.
119119

120+
For more information, see [Find in files](../ide/find-in-files.md) and [Replace in files](../ide/replace-in-files.md), and for more about using regular expressions, see [Use Regular Expressions](../ide/using-regular-expressions-in-visual-studio.md).
121+
120122
### Find Results
121123

122124
When you choose **Find All**, a **Find Results** window opens and lists the matches for your search. Selecting a result in the list displays the associated file and highlights the match. If the file is not already open for editing, it is opened in a preview tab in the right side of the tab well. You can use the **Find** control to search through the **Find Results** list.

docs/msbuild/errors/msb3103.md

Lines changed: 48 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "MSB3103: Invalid Resx file"
33
description: "This error occurs when there's an issue with a .resx resource file."
4-
ms.date: "06/18/2021"
4+
ms.date: "1/27/2025"
55
ms.topic: "error-reference"
66
f1_keywords:
77
- MSB3103
@@ -18,4 +18,50 @@ ms.subservice: msbuild
1818
---
1919
# MSB3103: Invalid Resx file
2020

21-
This error occurs when there/s an issue with a .resx resource file. When you see this error, another error is displayed with more details. Look to the other error for more information.
21+
This error occurs when there/s an issue with a `.resx` resource file. When you see this error, another error is displayed with more details. Look to the other error for more information.
22+
23+
## Message text
24+
25+
`MSB3103: Invalid Resx file`
26+
27+
## Remarks
28+
29+
The error MSB3103 occurs when MSBuild encounters an invalid `.resx` file during the build process. This error indicates that the `.resx` file can't be properly read or processed, often due to incorrect file paths or references.
30+
31+
## Common Causes
32+
33+
This error can occur in the following scenarios:
34+
35+
1. **Missing or Inaccessible Resources**: The `.resx` file references external resources (for example, images or files) that aren't present in the expected location or are inaccessible.
36+
- Example: A file path specified in the `.resx` is incorrect or points to a missing file.
37+
2. **Incorrect type reference**: The `.resx` file referenced a type that couldn't be found.
38+
- Example: A typo in a type reference in a ResXFile reference, or a type that was not available for some reason.
39+
3. **Corrupted files**: The `.resx` file or one of its dependencies was corrupted.
40+
41+
## Real-World Scenarios
42+
43+
1. **Migrating projects**: When you're upgrading a legacy project from .NET Framework to .NET Core or .NET 6+, existing `.resx` files may contain elements or attributes that are incompatible with the newer frameworks.
44+
2. **Manual edits to `.resx` files**: Someone manually editing `.resx` files might inadvertently introduce syntax errors or invalid data.
45+
3. **Broken resource links**: Referencing external files (for example, images or icons) in `.resx` files without ensuring these files are included in the project or accessible during the build.
46+
4. **Corrupted `.resx` files**: Files can become corrupted due to version control conflicts or file encoding changes.
47+
48+
### Resolution
49+
50+
1. **Check Resource Entries**:
51+
- If external resources are referenced, verify their paths and existence.
52+
53+
2. **Use the ResX Resource Manager**:
54+
- Consider using tools like [ResX Resource Manager](https://github.com/dotnet/ResXResourceManager) to validate and manage `.resx` files.
55+
56+
3. **Update for Framework Compatibility**:
57+
- Review changes in resource handling for the target framework.
58+
- Update `.resx` files to align with the requirements of the new framework.
59+
60+
4. **Revert to a Known Good State**:
61+
- If the `.resx` file has become corrupted, revert to a previous version from source control.
62+
63+
64+
## Related Content
65+
66+
- [MSBuild Documentation](../msbuild.md)
67+
- [ResX Resource Manager](https://github.com/dotnet/ResXResourceManager)

docs/msbuild/errors/msb3202.md

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "MSB3202: The project file 'filename' was not found."
33
description: "This error occurs when MSBuild can't find a project file with the specified name at the expected location."
4-
ms.date: "08/15/2022"
4+
ms.date: 1/21/2025
55
ms.topic: "error-reference"
66
f1_keywords:
77
- MSB3202
@@ -26,4 +26,32 @@ The full message is something like the following text:
2626
MSB3202: The project file 'filename' was not found.
2727
```
2828

29-
Make sure the current directory is correct and that the specified project file exists and that the filename is spelled correctly.
29+
## Remarks
30+
31+
The MSB3202 error occurs when MSBuild is unable to locate the specified project file. This error is generated when a build is invoked with an incorrect or missing project file path, or incorrect or missing dependent project file.
32+
33+
## Common causes
34+
35+
Here are some real-world scenarios that can lead to this error, especially in modern development and CI/CD environments:
36+
37+
1. **Incorrect file path in command line or build script**
38+
- When invoking MSBuild, the specified project file path doesn't exist or is mistyped. Check the path, especially for syntax issues such as quotes around paths with spaces.
39+
40+
2. **Project file renamed or deleted**
41+
- A project file was renamed or removed from the repository, but the build logic or one of the build inputs was not updated to reflect this change.
42+
43+
3. **Repository checkout issues**
44+
- During a CI/CD pipeline execution, the source code repository might not be fully checked out, or the necessary project file is excluded due to `.gitignore` rules or shallow cloning.
45+
46+
## Resolution
47+
48+
1. Verify that the project file exists at the specified location.
49+
- Use an absolute path to the project file to avoid ambiguity.
50+
- Example:
51+
52+
`msbuild C:\Projects\MySolution\MyProject.csproj`
53+
54+
2. Check for typos in the ProjectReference item in the project file.
55+
56+
3. Ensure your version control system includes all necessary project files and that the repository checkout is complete.
57+

docs/msbuild/errors/msb3245.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "MSB3245: Could not resolve this reference. 'assembly' If this reference is required by your code, you may get compilation errors."
33
description: "This diagnostic code is emitted when MSBuild can't find an assembly referenced in your project."
4-
ms.date: "08/15/2022"
4+
ms.date: 1/21/2025
55
ms.topic: "error-reference"
66
f1_keywords:
77
- MSB3245
@@ -22,10 +22,12 @@ This diagnostic code is emitted when MSBuild can't resolve an assembly reference
2222

2323
The full message resembles the following text:
2424

25-
```output
26-
MSB3245: Could not resolve this reference. 'assembly' If this reference is required by your code, you may get compilation errors.
27-
```
25+
`MSB3245: Could not resolve this reference. 'assembly' If this reference is required by your code, you may get compilation errors.`
2826

2927
This error might occur if the item is a directory, not a file, or it could occur if the assembly resolver for that reference returns an error. It could be any error that prevents resolution of the reference, such as a missing assembly, misspelled name, version mismatch, mismatched processor architecture, or failed `ProjectReference`.
3028

31-
For a guide on resolving errors with assembly references, see [Troubleshoot assembly references](../troubleshoot-assembly-references.md).
29+
For a guide on resolving errors with assembly references, see [Troubleshoot assembly references](../troubleshoot-assembly-references.md).
30+
31+
### Related content
32+
33+
- [MSBuild ResolveAssemblyReference Task Documentation](../resolveassemblyreference-task.md)

docs/msbuild/errors/msb3248.md

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "MSB3248 diagnostic code"
33
description: "Parameter 'value' has invalid value 'value'."
4-
ms.date: 12/06/2024
4+
ms.date: 1/21/2025
55
ms.topic: "error-reference"
66
f1_keywords:
77
- MSB3248
@@ -27,13 +27,32 @@ This article describes the MSB3248 error code.
2727
## Message text
2828

2929
```output
30-
MSB3248: Parameter 'value' has invalid value 'value'.
30+
MSB3248: Parameter 'parameter name' has invalid value 'value'.
3131
```
3232

3333
<!-- :::editable-content name="postOutputDescription"::: -->
34-
<!--
35-
{StrBegin="MSB3248: "}
36-
-->
34+
## Remarks
35+
36+
The error code MSB3248 occurs in the `ResolveAssemblyReference` task in MSBuild when there's an issue with the parameters specified for resolving assembly references. The `ResolveAssemblyReference` task is responsible for resolving assembly references in a project. You don't normally invoke this task directly; it's called during the .NET build process.
37+
38+
### Common causes
39+
40+
The most likely cause is an MSBuild property setting that creates an issue with the assembly resolution process. See [Common MSBuild properties](../common-msbuild-project-properties.md).
41+
42+
## Resolution
43+
44+
Look at what specific parameter triggers the error and its value and review how it's set or modified in your project files or imported files.
45+
46+
Enable detailed logging for your MSBuild process by using the `/v:diag` verbosity flag:
47+
48+
```bash
49+
msbuild MyProject.proj /v:diag
50+
```
51+
52+
This option provides a detailed log output, which should be helpful to determine which assembly reference is triggering the issue. Then, check the values of the properties that are related to that assembly, and the project that references it.
53+
54+
You can also create a binary log by using the `-bl` command-line option, and use MSBuild [structured log viewer](https://msbuildlog.com/) to more easily view the log output. For more information, see [Troubleshoot assembly references](../troubleshoot-assembly-references.md).
55+
3756
<!-- :::editable-content-end::: -->
3857
<!-- :::ErrorDefinitionDescription-end::: -->
3958

docs/msbuild/errors/msb3249.md

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "MSB3249 diagnostic code"
33
description: "Application Configuration file 'value' is invalid."
4-
ms.date: 12/06/2024
4+
ms.date: 1/21/2025
55
ms.topic: "error-reference"
66
f1_keywords:
77
- MSB3249
@@ -31,12 +31,41 @@ MSB3249: Application Configuration file 'value' is invalid.
3131
```
3232

3333
<!-- :::editable-content name="postOutputDescription"::: -->
34-
<!--
35-
{StrBegin="MSB3249: "}
36-
-->
34+
35+
### Remarks
36+
37+
The error MSB3249 is raised by the `ResolveAssemblyReference` task in MSBuild when an invalid or malformed application configuration file (for example, `app.config`) is detected during the build process. This usually occurs when the configuration file contains syntax errors, invalid XML, or unexpected values that prevent MSBuild from properly resolving assembly references. See [ResolveAssemblyReference task](../resolveassemblyreference-task.md).
38+
39+
### Possible causes
40+
41+
1. **Malformed or invalid XML**: The `app.config` file contains syntax errors or is not well-formed XML.
42+
2. **Missing or incorrect `<runtime>` section**: The `app.config` file is missing the `<runtime>` element or contains invalid data in this section. See [`<runtime>` element](/dotnet/framework/configure-apps/file-schema/runtime/runtime-element).
43+
3. **Unrecognized configuration settings**: The file includes settings that are not supported or are incorrectly specified.
44+
4. **File not accessible**: The `app.config` file is missing, locked, or inaccessible due to file permissions.
45+
46+
### Resolution
47+
48+
1. **Validate the `app.config` file**:
49+
- Open the file in an XML editor or IDE that supports XML validation.
50+
- Correct any syntax errors or invalid XML structure.
51+
52+
2. **Check for unsupported or invalid settings**:
53+
- Review the file for any unrecognized configuration keys or invalid values.
54+
- Refer to the [Configuring apps by using configuration files](/dotnet/framework/configure-apps/) for supported settings.
55+
56+
3. **Ensure file accessibility**:
57+
- Confirm that the `app.config` file exists in the expected location.
58+
- Ensure the build process has the necessary permissions to read the file.
59+
60+
The `ResolveAssemblyReference` task is responsible for resolving references to assemblies during the build process. An invalid `app.config` file can prevent this task from completing successfully. For more information on the `ResolveAssemblyReference` task, see [MSBuild ResolveAssemblyReference Task](../resolveassemblyreference-task.md).
61+
3762
<!-- :::editable-content-end::: -->
3863
<!-- :::ErrorDefinitionDescription-end::: -->
3964

65+
## Related content
66+
67+
[ResolveAssemblyReference task](../resolveassemblyreference-task.md)
68+
4069
## Applies to
4170

4271
All versions of MSBuild

0 commit comments

Comments
 (0)