[xbuild] Use correct property for Win32Icon. Fixes #32499

diff --git a/mcs/tools/xbuild/data/12.0/Microsoft.CSharp.targets b/mcs/tools/xbuild/data/12.0/Microsoft.CSharp.targets
index 11b40d66a9b51c6c6696def143aea14a91bf6e79..1d111a1cf66d3201a71ed68f67c803fbcf239884 100644 (file)
--- a/mcs/tools/xbuild/data/12.0/Microsoft.CSharp.targets
+++ b/mcs/tools/xbuild/data/12.0/Microsoft.CSharp.targets
@@ -96,7 +96,7 @@
                        WarningLevel="$(WarningLevel)"
                        WarningsAsErrors="$(WarningsAsErrors)"
                        WarningsNotAsErrors="$(WarningsNotAsErrors)"
-                       Win32Icon="$(Win32Icon)"
+                       Win32Icon="$(ApplicationIcon)"
                        Win32Resource="$(Win32Resource)"
                        Resources="@(ManifestResourceWithNoCulture);@(ManifestNonResxWithNoCultureOnDisk);@(CompiledLicenseFile)"
                        ToolExe="$(CscToolExe)"

diff --git a/mcs/tools/xbuild/data/14.0/Microsoft.CSharp.targets b/mcs/tools/xbuild/data/14.0/Microsoft.CSharp.targets
index 11b40d66a9b51c6c6696def143aea14a91bf6e79..1d111a1cf66d3201a71ed68f67c803fbcf239884 100644 (file)
--- a/mcs/tools/xbuild/data/14.0/Microsoft.CSharp.targets
+++ b/mcs/tools/xbuild/data/14.0/Microsoft.CSharp.targets
@@ -96,7 +96,7 @@
                        WarningLevel="$(WarningLevel)"
                        WarningsAsErrors="$(WarningsAsErrors)"
                        WarningsNotAsErrors="$(WarningsNotAsErrors)"
-                       Win32Icon="$(Win32Icon)"
+                       Win32Icon="$(ApplicationIcon)"
                        Win32Resource="$(Win32Resource)"
                        Resources="@(ManifestResourceWithNoCulture);@(ManifestNonResxWithNoCultureOnDisk);@(CompiledLicenseFile)"
                        ToolExe="$(CscToolExe)"

diff --git a/mcs/tools/xbuild/data/2.0/Microsoft.CSharp.targets b/mcs/tools/xbuild/data/2.0/Microsoft.CSharp.targets
index 114e862c88c897ee2574cab27ff9f6c14026268c..29bd5d826aed56752aab8e74daa46868be68ec70 100644 (file)
--- a/mcs/tools/xbuild/data/2.0/Microsoft.CSharp.targets
+++ b/mcs/tools/xbuild/data/2.0/Microsoft.CSharp.targets
@@ -65,7 +65,7 @@
                        WarningLevel="$(WarningLevel)"
                        WarningsAsErrors="$(WarningsAsErrors)"
                        WarningsNotAsErrors="$(WarningsNotAsErrors)"
-                       Win32Icon="$(Win32Icon)"
+                       Win32Icon="$(ApplicationIcon)"
                        Win32Resource="$(Win32Resource)"
                        Resources="@(ManifestResourceWithNoCulture);@(ManifestNonResxWithNoCultureOnDisk);@(CompiledLicenseFile)"
                        ToolExe="$(CscToolExe)"

diff --git a/mcs/tools/xbuild/data/3.5/Microsoft.CSharp.targets b/mcs/tools/xbuild/data/3.5/Microsoft.CSharp.targets
index 114e862c88c897ee2574cab27ff9f6c14026268c..29bd5d826aed56752aab8e74daa46868be68ec70 100644 (file)
--- a/mcs/tools/xbuild/data/3.5/Microsoft.CSharp.targets
+++ b/mcs/tools/xbuild/data/3.5/Microsoft.CSharp.targets
@@ -65,7 +65,7 @@
                        WarningLevel="$(WarningLevel)"
                        WarningsAsErrors="$(WarningsAsErrors)"
                        WarningsNotAsErrors="$(WarningsNotAsErrors)"
-                       Win32Icon="$(Win32Icon)"
+                       Win32Icon="$(ApplicationIcon)"
                        Win32Resource="$(Win32Resource)"
                        Resources="@(ManifestResourceWithNoCulture);@(ManifestNonResxWithNoCultureOnDisk);@(CompiledLicenseFile)"
                        ToolExe="$(CscToolExe)"

diff --git a/mcs/tools/xbuild/data/4.0/Microsoft.CSharp.targets b/mcs/tools/xbuild/data/4.0/Microsoft.CSharp.targets
index 11b40d66a9b51c6c6696def143aea14a91bf6e79..1d111a1cf66d3201a71ed68f67c803fbcf239884 100644 (file)
--- a/mcs/tools/xbuild/data/4.0/Microsoft.CSharp.targets
+++ b/mcs/tools/xbuild/data/4.0/Microsoft.CSharp.targets
@@ -96,7 +96,7 @@
                        WarningLevel="$(WarningLevel)"
                        WarningsAsErrors="$(WarningsAsErrors)"
                        WarningsNotAsErrors="$(WarningsNotAsErrors)"
-                       Win32Icon="$(Win32Icon)"
+                       Win32Icon="$(ApplicationIcon)"
                        Win32Resource="$(Win32Resource)"
                        Resources="@(ManifestResourceWithNoCulture);@(ManifestNonResxWithNoCultureOnDisk);@(CompiledLicenseFile)"
                        ToolExe="$(CscToolExe)"