From 215901f51bf00e9d1e58cada05033aae8283e336 Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Fri, 4 Dec 2015 11:31:10 -0800 Subject: Update Reference Sources to .NET Framework 4.6.1 --- .../Build/Tasks/Xaml/PartialClassGenerationTaskInternal.cs | 10 +++++----- .../Microsoft/Build/Tasks/Xaml/ResolveAssemblyHelper.cs | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'mcs/class/referencesource/XamlBuildTask') 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; -- cgit v1.2.3