Skip to content

Update .NET SDK to 9.0.300 #11887

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.

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

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,9 @@ dotnet_diagnostic.IDE0073.severity = error
# Use 'System.Threading.Lock'
dotnet_diagnostic.IDE0330.severity = suggestion

# Use implicitly typed lambda
dotnet_diagnostic.IDE0350.severity = none

# Value types are incompatible with null values. https://xunit.net/xunit.analyzers/rules/xUnit1012
dotnet_diagnostic.xUnit1012.severity = warning

Expand Down
2 changes: 1 addition & 1 deletion .vsts-dotnet-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ jobs:
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore-Public
demands: ImageOverride -equals windows.vs2022preview.amd64.open
demands: ImageOverride -equals windows.vs2022preview.scout.amd64.open
${{ if ne(variables['System.TeamProject'], 'public') }}:
name: VSEngSS-MicroBuild2022-1ES
demands: agent.os -equals Windows_NT
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"allowPrerelease": true
},
"tools": {
"dotnet": "9.0.106",
"dotnet": "9.0.300",
"vs": {
"version": "17.12.0"
},
Expand Down
16 changes: 0 additions & 16 deletions src/MSBuildTaskHost/Concurrent/ConcurrentDictionary.cs
Original file line number Diff line number Diff line change
Expand Up @@ -471,22 +471,6 @@ private static void GetBucketAndLockNo(int hashcode, out int bucketNo, out int l
Debug.Assert(lockNo >= 0 && lockNo < lockCount);
}

/// <summary>
/// Acquires all locks for this hash table, and increments locksAcquired by the number
/// of locks that were successfully acquired. The locks are acquired in an increasing
/// order.
/// </summary>
private void AcquireAllLocks(ref int locksAcquired)
{
// First, acquire lock 0
AcquireLocks(0, 1, ref locksAcquired);

// Now that we have lock 0, the _locks array will not change (i.e., grow),
// and so we can safely read _locks.Length.
AcquireLocks(1, _tables._locks.Length, ref locksAcquired);
Debug.Assert(locksAcquired == _tables._locks.Length);
}

/// <summary>
/// Acquires a contiguous range of locks for this hash table, and increments locksAcquired
/// by the number of locks that were successfully acquired. The locks are acquired in an
Expand Down