Skip to content

Commit 753cd86

Browse files
committed
Removing NET check
1 parent 69ae62b commit 753cd86

File tree

4 files changed

+10
-20
lines changed

4 files changed

+10
-20
lines changed

src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/Tasks/TaskHelper.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,11 +203,9 @@ internal static string GetWholeExceptionMessage(Exception exception)
203203
while (e.InnerException != null)
204204
{
205205
Exception eInner = e.InnerException;
206-
#if NET
207-
if (!e.Message.Contains(eInner.Message, StringComparison.Ordinal))
208-
#else
206+
#pragma warning disable CA2249
209207
if (e.Message.IndexOf(eInner.Message, StringComparison.Ordinal) == -1)
210-
#endif
208+
#pragma warning restore CA2249
211209
{
212210
message += ", ";
213211
message += eInner.Message;

src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/UidManager.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -518,11 +518,9 @@ private UidCollector ParseFile(string fileName)
518518
collector.RootElementLinePosition = reader.LinePosition;
519519
}
520520

521-
#if NET
522-
if (reader.Name.Contains('.'))
523-
#else
521+
#pragma warning disable CA1847
524522
if (reader.Name.Contains("."))
525-
#endif
523+
#pragma warning restore CA1847
526524
{
527525
// the name has a dot, which suggests it is a property tag.
528526
// we will ignore adding uid

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/MarkupExtensionParser.cs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1465,11 +1465,9 @@ private string ResolveAttributeNamespaceURI(string prefix, string name, string p
14651465
// if the prefix was "" then
14661466
// 1) normal properties resolve to the parent Tag namespace.
14671467
// 2) Attached properties resolve to the "" default namespace.
1468-
#if NET
1469-
if (!name.Contains('.'))
1470-
#else
1468+
#pragma warning disable CA1847
14711469
if (!name.Contains("."))
1472-
#endif
1470+
#pragma warning restore CA1847
14731471
attribNamespaceURI = parentURI;
14741472
else
14751473
attribNamespaceURI = _parserHelper.LookupNamespace("");
@@ -1628,11 +1626,9 @@ internal static void RemoveEscapes(ref string value)
16281626
if (builder == null)
16291627
{
16301628
builder = new StringBuilder(value.Length);
1631-
#if NET
1632-
builder.Append(value.AsSpan(0,i));
1633-
#else
1629+
#pragma warning disable CA1846
16341630
builder.Append(value.Substring(0,i));
1635-
#endif
1631+
#pragma warning restore CA1846
16361632
}
16371633
noEscape = false;
16381634
}

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/XamlReaderHelper.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2738,11 +2738,9 @@ private string ResolveAttributeNamespaceURI(string prefix, string name, string p
27382738
// if the prefix was "" then
27392739
// 1) normal properties resolve to the parent Tag namespace.
27402740
// 2) Attached properties resolve to the "" default namespace.
2741-
#if NET
2742-
if (!name.Contains('.'))
2743-
#else
2741+
#pragma warning disable CA1847
27442742
if (!name.Contains("."))
2745-
#endif
2743+
#pragma warning restore CA1847
27462744
attribNamespaceURI = parentURI;
27472745
else
27482746
attribNamespaceURI = XmlReader.LookupNamespace("");

0 commit comments

Comments
 (0)