Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordotnet-bot <dotnet-bot@microsoft.com>2015-12-04 22:31:10 +0300
committerMarek Safar <marek.safar@gmail.com>2016-05-03 12:42:37 +0300
commit215901f51bf00e9d1e58cada05033aae8283e336 (patch)
tree2ac23555d1a510d8d09fda4483336465adc75855 /mcs/class/referencesource/XamlBuildTask
parent10e54be5f860d412d2ab5b193de582e232ceeb7e (diff)
Update Reference Sources to .NET Framework 4.6.1
Diffstat (limited to 'mcs/class/referencesource/XamlBuildTask')
-rw-r--r--mcs/class/referencesource/XamlBuildTask/Microsoft/Build/Tasks/Xaml/PartialClassGenerationTaskInternal.cs10
-rw-r--r--mcs/class/referencesource/XamlBuildTask/Microsoft/Build/Tasks/Xaml/ResolveAssemblyHelper.cs6
2 files changed, 8 insertions, 8 deletions
diff --git a/mcs/class/referencesource/XamlBuildTask/Microsoft/Build/Tasks/Xaml/PartialClassGenerationTaskInternal.cs b/mcs/class/referencesource/XamlBuildTask/Microsoft/Build/Tasks/Xaml/PartialClassGenerationTaskInternal.cs
index 423b3f8e050..f66e29706a8 100644
--- a/mcs/class/referencesource/XamlBuildTask/Microsoft/Build/Tasks/Xaml/PartialClassGenerationTaskInternal.cs
+++ b/mcs/class/referencesource/XamlBuildTask/Microsoft/Build/Tasks/Xaml/PartialClassGenerationTaskInternal.cs
@@ -487,11 +487,11 @@ namespace Microsoft.Build.Tasks.Xaml
XamlXmlWriterSettings xamlSettings = new XamlXmlWriterSettings() { CloseOutput = true };
// Process EmbeddedResourceXaml to remove xml:space="preserve"
- // due to a
-
-
-
-
+ // due to a bug in XamlXmlWriter. XamlXmlWriter throws
+ // if there are duplicate xml:space attributes.
+ // It is ok to remove the xml:space attribute
+ // as the XamlXmlWriter would add it in the next step
+ // if needed.
RemoveXamlSpaceAttribute(classData);
using (XamlReader reader = classData.EmbeddedResourceXaml.GetReader())
diff --git a/mcs/class/referencesource/XamlBuildTask/Microsoft/Build/Tasks/Xaml/ResolveAssemblyHelper.cs b/mcs/class/referencesource/XamlBuildTask/Microsoft/Build/Tasks/Xaml/ResolveAssemblyHelper.cs
index e498bca0215..891e2e8cdbe 100644
--- a/mcs/class/referencesource/XamlBuildTask/Microsoft/Build/Tasks/Xaml/ResolveAssemblyHelper.cs
+++ b/mcs/class/referencesource/XamlBuildTask/Microsoft/Build/Tasks/Xaml/ResolveAssemblyHelper.cs
@@ -44,9 +44,9 @@ namespace Microsoft.Build.Tasks.Xaml
public Assembly ResolveLocalProjectReferences(object sender, ResolveEventArgs args)
{
// Currently we are return the assembly just by matching the short name
- // of the assembly. Filed
-
-
+ // of the assembly. Filed bug 172138 to figure out whether we need
+ // to load the exact matching(version, culture, public key matches)
+ // assembly.
AssemblyName targetAssemblyName = new AssemblyName(args.Name);
string targetName = targetAssemblyName.Name;