Skip to content

Commit 56c02ec

Browse files
authored
Merge pull request #1416 from microsoft/dev/andarno/libtemplateUpdate
Merge latest Library.Template
2 parents b22131b + dcac562 commit 56c02ec

File tree

6 files changed

+16
-12
lines changed

6 files changed

+16
-12
lines changed

.github/renovate.json

+4
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
"matchDepNames": ["dotnet-sdk", "mcr.microsoft.com/dotnet/sdk"],
2626
"groupName": "Dockerfile and global.json updates"
2727
},
28+
{
29+
"matchPackageNames": ["*"],
30+
"allowedVersions": "!/-g[a-f0-9]+$/"
31+
},
2832
{
2933
"matchPackageNames": [
3034
"System.Collections.Immutable",

.github/workflows/docs_validate.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
with:
1818
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
1919
- name: 🔗 Markup Link Checker (mlc)
20-
uses: becheran/mlc@v0.19.2
20+
uses: becheran/mlc@v0.21.0
2121
with:
2222
args: --do-not-warn-for-redirect-to https://learn.microsoft.com*,https://dotnet.microsoft.com/*,https://dev.azure.com/*,https://app.codecov.io/*,https://badges.gitter.im/*,https://github.com/*,https://app.gitter.im/* -p docfx -i https://aka.ms/onboardsupport,https://aka.ms/spot,https://msrc.microsoft.com/*,https://www.microsoft.com/msrc*,https://microsoft.com/msrc*,https://microsoft.sharepoint.com/*
2323
- name: ⚙ Install prerequisites

Directory.Packages.props

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<PropertyGroup>
55
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
66
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
7-
<MicroBuildVersion>2.0.181</MicroBuildVersion>
7+
<MicroBuildVersion>2.0.187</MicroBuildVersion>
88
<CodeAnalysisVersion>3.11.0</CodeAnalysisVersion>
99
<CodeAnalysisVersionForTests>4.12.0</CodeAnalysisVersionForTests>
1010
<CodefixTestingVersion>1.1.2</CodefixTestingVersion>
11-
<MicrosoftDiagnosticsRuntimeVersion>3.1.525101</MicrosoftDiagnosticsRuntimeVersion>
11+
<MicrosoftDiagnosticsRuntimeVersion>3.0.442202</MicrosoftDiagnosticsRuntimeVersion>
1212
<CodeAnalysisAnalyzerVersion>3.11.0-beta1.24527.2</CodeAnalysisAnalyzerVersion>
1313
</PropertyGroup>
1414
<ItemGroup>
@@ -26,9 +26,9 @@
2626
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit" Version="$(CodefixTestingVersion)" />
2727
<PackageVersion Include="Microsoft.Diagnostics.Runtime.Utilities" Version="$(MicrosoftDiagnosticsRuntimeVersion)" />
2828
<PackageVersion Include="Microsoft.Diagnostics.Runtime" Version="$(MicrosoftDiagnosticsRuntimeVersion)" />
29-
<PackageVersion Include="Microsoft.VisualStudio.Interop" Version="17.13.40002" />
30-
<PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="17.13.40002" />
31-
<PackageVersion Include="Microsoft.VisualStudio.Shell.Framework" Version="17.13.40002" />
29+
<PackageVersion Include="Microsoft.VisualStudio.Interop" Version="17.12.40391" />
30+
<PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="17.12.40392" />
31+
<PackageVersion Include="Microsoft.VisualStudio.Shell.Framework" Version="17.12.40391" />
3232
<PackageVersion Include="Microsoft.VisualStudio.Validation" Version="17.8.8" />
3333
<PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
3434
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.162" />
@@ -50,9 +50,9 @@
5050
<PackageVersion Update="Microsoft.CodeAnalysis.VisualBasic" Version="$(CodeAnalysisVersionForTests)" />
5151
</ItemGroup>
5252
<ItemGroup Label="Library.Template">
53-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
53+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
5454
<PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild.NonShipping" Version="$(MicroBuildVersion)" />
55-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
55+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
5656
<PackageVersion Include="xunit" Version="2.9.3" />
5757
</ItemGroup>
5858
<ItemGroup>

azure-pipelines/install-dependencies.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ steps:
1414
- template: WIFtoPATauth.yml
1515
parameters:
1616
wifServiceConnectionName: azure-public/vside package pull
17-
deadPATServiceConnectionId: 0ae39abc-4d06-4436-a7b5-865833df49db # azure-public/msft_consumption
17+
deadPATServiceConnectionId: 46f0d4d4-9fff-4c58-a1ab-3b8f97e3b78a # azure-public/msft_consumption_public
1818

1919
- task: NuGetAuthenticate@1
2020
displayName: 🔏 Authenticate NuGet feeds
2121
inputs:
2222
${{ if and(parameters.needsAzurePublicFeeds, eq(variables['system.collectionId'], '011b8bdf-6d56-4f87-be0d-0092136884d9')) }}:
23-
nuGetServiceConnections: azure-public/msft_consumption
23+
nuGetServiceConnections: azure-public/msft_consumption_public
2424

2525
- powershell: |
2626
$AccessToken = '$(System.AccessToken)' # Avoid specifying the access token directly on the init.ps1 command line to avoid it showing up in errors

nuget.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</config>
66
<packageSources>
77
<clear />
8-
<add key="msft_consumption" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/msft_consumption/nuget/v3/index.json" />
8+
<add key="msft_consumption_public" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/msft_consumption_public/nuget/v3/index.json" />
99
</packageSources>
1010
<disabledPackageSources>
1111
<!-- Defend against user or machine level disabling of sources that we list in this file. -->

src/SosThreadingTools/DumpAsyncCommand.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ private void MarkThreadingBlockTasks(List<AsyncStateMachine> allStateMachines)
370370
{
371371
if (visitedObjects.Add(stackObject.Address))
372372
{
373-
ClrObject joinableTaskObject = stackObject.Type is null ? runtime.Heap.GetObject(stackObject.Address) : runtime.Heap.GetObject(stackObject.Address, stackObject.Type);
373+
var joinableTaskObject = new ClrObject(stackObject.Address, stackObject.Type);
374374
int state = joinableTaskObject.ReadField<int>("state");
375375
if ((state & 0x10) == 0x10)
376376
{

0 commit comments

Comments
 (0)