Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add prefer native arm64 flag #10134

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
7749725
add basic implementation for preferArm64
YuliiaKovalova May 14, 2024
ee137ff
cleanup
YuliiaKovalova May 15, 2024
a0c1b7e
Merge remote-tracking branch 'origin/main' into dev/ykovalova/add_Pre…
YuliiaKovalova May 15, 2024
7219dab
fix targets file
YuliiaKovalova May 15, 2024
44ce08e
cleanup test file
YuliiaKovalova May 15, 2024
4394d26
remove extra code
YuliiaKovalova May 15, 2024
c74b891
fix review comments + extend tests
YuliiaKovalova May 15, 2024
b9a9d42
fix review comments
YuliiaKovalova May 16, 2024
eb1986c
remove extra ;
YuliiaKovalova May 16, 2024
b05655f
fix the missed condition
YuliiaKovalova May 16, 2024
f52e039
fix review comments
YuliiaKovalova May 16, 2024
459f25d
remove checking build results due to MSB3644 on build machines
YuliiaKovalova May 17, 2024
d81b680
fix review comments
YuliiaKovalova May 23, 2024
170409a
handle the case when prefix doesn't exist in manifest
YuliiaKovalova May 23, 2024
a79ee90
remove extra changes
YuliiaKovalova May 23, 2024
874884d
fix review comments - renaming and handling in the task
YuliiaKovalova May 23, 2024
f645ef8
change severity for SpecifiedSeverityDoesNotExist log
YuliiaKovalova May 23, 2024
98cae23
handle ClickOnceManifest and Prefer32bit cases
YuliiaKovalova May 24, 2024
79dff86
fix quoting
YuliiaKovalova May 24, 2024
bdb3aba
fix review comments - simplify conditions and typos
YuliiaKovalova May 24, 2024
0f35c1a
change condition '$(PreferNativeArm64)' == '' -> '$(PreferNativeArm…
YuliiaKovalova May 24, 2024
8c3e739
handle the case for clickonce manifests
YuliiaKovalova May 27, 2024
edee452
make _SupportedArchitectures a global property
YuliiaKovalova May 27, 2024
528d930
fix spacing
YuliiaKovalova May 27, 2024
b50a57f
Extend logged messages
YuliiaKovalova May 28, 2024
1ec6c37
add path to manifest to AddToWin32Manifest.ManifestCanNotBeOpened
YuliiaKovalova May 28, 2024
be21253
use LogErrorWithCodeFromResources to log file path
YuliiaKovalova May 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/Tasks/AddToWin32Manifest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public string ManifestPath
{
if (string.IsNullOrEmpty(ApplicationManifest.ItemSpec) || !File.Exists(ApplicationManifest?.ItemSpec))
{
Log.LogErrorFromResources("AddToWin32Manifest.SpecifiedApplicationManifestCanNotBeFound", ApplicationManifest?.ItemSpec);
Log.LogErrorWithCodeFromResources(null, ApplicationManifest?.ItemSpec, 0, 0, 0, 0, "AddToWin32Manifest.SpecifiedApplicationManifestCanNotBeFound");
return null;
}

Expand Down Expand Up @@ -121,7 +121,7 @@ public override bool Execute()

if (stream is null)
{
Log.LogErrorFromResources("AddToWin32Manifest.ManifestCanNotBeOpened", manifestPath);
Log.LogErrorWithCodeFromResources(null, manifestPath, 0, 0, 0, 0, "AddToWin32Manifest.ManifestCanNotBeOpened");

return !Log.HasLoggedErrors;
}
Expand All @@ -147,7 +147,7 @@ public override bool Execute()
}
catch (Exception ex)
{
Log.LogErrorFromResources("AddToWin32Manifest.ManifestCanNotBeOpenedWithException", ex.Message, manifestPath);
Log.LogErrorWithCodeFromResources(null, manifestPath, 0, 0, 0, 0, "AddToWin32Manifest.ManifestCanNotBeOpenedWithException", ex.Message);

return !Log.HasLoggedErrors;
}
Expand Down Expand Up @@ -187,7 +187,7 @@ private ManifestValidationResult ValidateManifest(string? manifestPath, XmlDocum

if (assemblyNode is null)
{
Log.LogErrorFromResources("AddToWin32Manifest.AssemblyNodeIsMissed", manifestPath);
Log.LogErrorWithCodeFromResources(null, manifestPath, 0, 0, 0, 0, "AddToWin32Manifest.AssemblyNodeIsMissed");
return ManifestValidationResult.Failure;
}

Expand All @@ -196,7 +196,7 @@ private ManifestValidationResult ValidateManifest(string? manifestPath, XmlDocum
{
if (!string.Equals(supportedArchitecturesNode.InnerText.Trim(), SupportedArchitectures, StringComparison.OrdinalIgnoreCase))
{
Log.LogErrorWithCodeFromResources("AddToWin32Manifest.InvalidValueInSupportedArchitectures", supportedArchitecturesNode.InnerText, manifestPath);
Log.LogErrorWithCodeFromResources(null, manifestPath, 0, 0, 0, 0, "AddToWin32Manifest.InvalidValueInSupportedArchitectures", supportedArchitecturesNode.InnerText);
YuliiaKovalova marked this conversation as resolved.
Show resolved Hide resolved

return ManifestValidationResult.Failure;
}
Expand Down
10 changes: 5 additions & 5 deletions src/Tasks/Resources/Strings.resx
Original file line number Diff line number Diff line change
Expand Up @@ -3018,20 +3018,20 @@
MSB4300 - MSB4310 Task: AddToWin32Manifest
-->
<data name="AddToWin32Manifest.InvalidValueInSupportedArchitectures">
<value>MSB4300: The specified value '{0}' for the supportedArchitectures element is invalid. Either remove it from the manifest or set it to 'amd64 arm64'. Path to the source manifest: '{1}'</value>
<value>MSB4300: The specified value '{0}' for the supportedArchitectures element is invalid. Either remove it from the manifest or set it to 'amd64 arm64'.</value>
<comment>{StrBegin="MSB4300: "}</comment>
</data>
<data name="AddToWin32Manifest.AssemblyNodeIsMissed">
<value>The assembly element is missing from the application manifest: '{0}'.</value>
<value>The assembly element is missing from the application manifest.</value>
</data>
<data name="AddToWin32Manifest.SpecifiedApplicationManifestCanNotBeFound">
<value>The application manifest file cannot be found: '{0}'. Please make sure it exists.</value>
<value>The application manifest file cannot be found. Please make sure it exists.</value>
</data>
<data name="AddToWin32Manifest.ManifestCanNotBeOpened">
<value>The manifest file either does not exist or can not be read. Please make sure it exists and has relevant content: '{0}'.</value>
<value>The manifest file either does not exist or can not be read. Please make sure it exists and has relevant content.</value>
</data>
<data name="AddToWin32Manifest.ManifestCanNotBeOpenedWithException">
<value>The manifest file opening has failed with exception: '{0}'. Please make sure it exists and has relevant content. Path to manifest file: '{1}'.</value>
<value>The manifest file opening has failed with exception: '{0}'. Please make sure it exists and has relevant content.</value>
</data>

<!--
Expand Down
20 changes: 10 additions & 10 deletions src/Tasks/Resources/xlf/Strings.cs.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions src/Tasks/Resources/xlf/Strings.de.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions src/Tasks/Resources/xlf/Strings.es.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions src/Tasks/Resources/xlf/Strings.fr.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading