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.

Sign up for GitHub

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

Jump to bottom

[automated] Merge branch 'vs16.9' => 'master' #6120

Merged
merged 1 commit into from Feb 8, 2021
Merged

[automated] Merge branch 'vs16.9' => 'master' #6120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/Shared/FileUtilities.cs
View file
Open in desktop
Expand Up @@ -4,6 +4,8 @@
using System;
#if !CLR2COMPATIBILITY
using System.Collections.Concurrent;
#else
using Microsoft.Build.Shared.Concurrent;
#endif
using System.Collections.Generic;
using System.Diagnostics;
Expand Down Expand Up @@ -107,11 +109,8 @@ public static bool GetIsFileSystemCaseSensitive()

internal static readonly string DirectorySeparatorString = Path.DirectorySeparatorChar.ToString();

#if !CLR2COMPATIBILITY
private static readonly ConcurrentDictionary<string, bool> FileExistenceCache = new ConcurrentDictionary<string, bool>(StringComparer.OrdinalIgnoreCase);
#else
private static readonly Microsoft.Build.Shared.Concurrent.ConcurrentDictionary<string, bool> FileExistenceCache = new Microsoft.Build.Shared.Concurrent.ConcurrentDictionary<string, bool>(StringComparer.OrdinalIgnoreCase);
#endif

private static readonly IFileSystem DefaultFileSystem = FileSystems.Default;

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion src/Tasks.UnitTests/GenerateBindingRedirects_Tests.cs
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@
using Xunit;
using Xunit.Abstractions;

namespace Microsoft.Build.Tasks.Unittest
namespace Microsoft.Build.Tasks.UnitTests
{
public class GenerateBindingRedirectsTests : IDisposable
{
Expand Down