Skip to content

Commit 218c2d1

Browse files
hoyosjshoyosjs
authored
Merge main into release/stable (#5345)
- **Fix release tool parameter (#5337)** - **Update thread statics format (#5341)** - **Fix staging parameter path (#5342)**
2 parents f62b34f + 672f0ff commit 218c2d1

File tree

5 files changed

+53
-18
lines changed

5 files changed

+53
-18
lines changed

Diff for: ‎eng/Version.Details.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
<Uri>https://github.com/dotnet/sdk</Uri>
3333
<Sha>bf19cbbae5fdf176cd4f13bca559133021779846</Sha>
3434
</Dependency>
35-
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="10.0.0-preview.3.25162.8">
35+
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="10.0.0-preview.3.25163.10">
3636
<Uri>https://github.com/dotnet/aspnetcore</Uri>
37-
<Sha>e6d943297f981ae68003b215f0cee66891cdf8ae</Sha>
37+
<Sha>f3555640d3b0d049856947c4f2bd0b869adf5c5e</Sha>
3838
</Dependency>
39-
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-preview.3.25162.8">
39+
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-preview.3.25163.10">
4040
<Uri>https://github.com/dotnet/aspnetcore</Uri>
41-
<Sha>e6d943297f981ae68003b215f0cee66891cdf8ae</Sha>
41+
<Sha>f3555640d3b0d049856947c4f2bd0b869adf5c5e</Sha>
4242
</Dependency>
4343
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.3.25153.8">
4444
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -49,9 +49,9 @@
4949
<Sha>3cf22b78d833dbac3d7e32f32406419bcb7511c0</Sha>
5050
</Dependency>
5151
<!-- Intermediate is necessary for source build. -->
52-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.616001">
52+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="10.0.616304">
5353
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
54-
<Sha>8f9f6fa14523b2f2475ea0a86be1cf60b5de5336</Sha>
54+
<Sha>cac4d021768f34079c30570518ece6af317cbab8</Sha>
5555
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
5656
</Dependency>
5757
<Dependency Name="Microsoft.CodeAnalysis" Version="4.11.0-2.24271.11">

Diff for: ‎eng/Versions.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<VSRedistCommonNetCoreSharedFrameworkx64100Version>10.0.0-preview.3.25153.8</VSRedistCommonNetCoreSharedFrameworkx64100Version>
2020
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.3.25153.8</MicrosoftNETCoreAppRuntimewinx64Version>
2121
<!-- Latest shared aspnetcore version updated by darc -->
22-
<MicrosoftAspNetCoreAppRefInternalVersion>10.0.0-preview.3.25162.8</MicrosoftAspNetCoreAppRefInternalVersion>
23-
<MicrosoftAspNetCoreAppRefVersion>10.0.0-preview.3.25162.8</MicrosoftAspNetCoreAppRefVersion>
22+
<MicrosoftAspNetCoreAppRefInternalVersion>10.0.0-preview.3.25163.10</MicrosoftAspNetCoreAppRefInternalVersion>
23+
<MicrosoftAspNetCoreAppRefVersion>10.0.0-preview.3.25163.10</MicrosoftAspNetCoreAppRefVersion>
2424
<!-- dotnet/installer: Testing version of the SDK. Needed for the signed & entitled host. -->
2525
<MicrosoftNETSdkVersion>10.0.100-preview.3.25159.6</MicrosoftNETSdkVersion>
2626
</PropertyGroup>
@@ -60,7 +60,7 @@
6060
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22316.2</MicrosoftDotNetRemoteExecutorVersion>
6161
<cdbsosversion>10.0.26100.1</cdbsosversion>
6262
<NewtonSoftJsonVersion>13.0.1</NewtonSoftJsonVersion>
63-
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>10.0.616001</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>
63+
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>10.0.616304</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>
6464
<!-- Roslyn and analyzers -->
6565
<!-- dotnet/roslyn dependencies -->
6666
<!--

Diff for: ‎eng/release/DiagnosticsReleaseTool/DiagnosticsReleaseCommandLine.cs

+6-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public static Command PrepareRelease()
3333
// Toggles
3434
ToolManifestVerificationOption, DiagnosticLoggingOption,
3535
// Outputs
36-
StagingPathOption(),
36+
StagingPathOption,
3737
AzureStorageAccountNameOption, AzureStorageAccountKeyOption, AzureStorageContainerNameOption
3838
};
3939

@@ -43,7 +43,7 @@ public static Command PrepareRelease()
4343
toolManifest: parseResult.GetValue(ToolManifestPathOption),
4444
verifyToolManifest: parseResult.GetValue(ToolManifestVerificationOption),
4545
inputDropPath: parseResult.GetValue(InputDropPathOption),
46-
stagingDirectory: parseResult.GetValue(StagingPathOption()),
46+
stagingDirectory: parseResult.GetValue(StagingPathOption),
4747
releaseName: parseResult.GetValue(ReleaseNameOption),
4848
accountName: parseResult.GetValue(AzureStorageAccountNameOption),
4949
clientId: parseResult.GetValue(AzureStorageAccountKeyOption),
@@ -92,7 +92,10 @@ public static Command PrepareRelease()
9292
Required = true
9393
};
9494

95-
private static Option<DirectoryInfo> StagingPathOption()
95+
96+
private static readonly Option<DirectoryInfo> StagingPathOption = InitStagingPath();
97+
98+
private static Option<DirectoryInfo> InitStagingPath()
9699
{
97100
Option<DirectoryInfo> option = new("--staging-directory", "-p")
98101
{

Diff for: ‎eng/release/DiagnosticsReleaseTool/DiagnosticsReleaseTool.sln

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
Microsoft Visual Studio Solution File, Format Version 12.00
2+
# Visual Studio Version 17
3+
VisualStudioVersion = 17.5.2.0
4+
MinimumVisualStudioVersion = 10.0.40219.1
5+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiagnosticsReleaseTool", "DiagnosticsReleaseTool.csproj", "{67E77FB6-7C08-5D47-087C-10848A96123B}"
6+
EndProject
7+
Global
8+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
9+
Debug|Any CPU = Debug|Any CPU
10+
Release|Any CPU = Release|Any CPU
11+
EndGlobalSection
12+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
13+
{67E77FB6-7C08-5D47-087C-10848A96123B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
14+
{67E77FB6-7C08-5D47-087C-10848A96123B}.Debug|Any CPU.Build.0 = Debug|Any CPU
15+
{67E77FB6-7C08-5D47-087C-10848A96123B}.Release|Any CPU.ActiveCfg = Release|Any CPU
16+
{67E77FB6-7C08-5D47-087C-10848A96123B}.Release|Any CPU.Build.0 = Release|Any CPU
17+
EndGlobalSection
18+
GlobalSection(SolutionProperties) = preSolution
19+
HideSolutionNode = FALSE
20+
EndGlobalSection
21+
GlobalSection(ExtensibilityGlobals) = postSolution
22+
SolutionGuid = {A8543907-B0C4-4BBA-9F92-CE3D3FDA2F8D}
23+
EndGlobalSection
24+
EndGlobal

Diff for: ‎src/SOS/Strike/util.cpp

+14-6
Original file line numberDiff line numberDiff line change
@@ -825,7 +825,10 @@ void DisplayThreadStatic (DacpModuleData* pModule, CLRDATA_ADDRESS cdaMT, DacpMe
825825
DacpThreadStoreData ThreadStore;
826826
ThreadStore.Request(g_sos);
827827

828-
ExtOut(" >> Thread:Value");
828+
#define INDENT " "
829+
#define INDENT_DATA INDENT INDENT
830+
831+
ExtOut(INDENT "Thread static values (Thread:Value)\n");
829832
CLRDATA_ADDRESS CurThread = ThreadStore.firstThread;
830833
while (CurThread)
831834
{
@@ -850,8 +853,9 @@ void DisplayThreadStatic (DacpModuleData* pModule, CLRDATA_ADDRESS cdaMT, DacpMe
850853
pSOS14->Release();
851854
if (SUCCEEDED(hr) && (Flags&4))
852855
{
853-
ExtOut(" %x:", vThread.osThreadId);
856+
ExtOut(INDENT_DATA "%x:", vThread.osThreadId);
854857
DisplayDataMember(pFD, dwTmp, FALSE);
858+
ExtOut("\n");
855859
}
856860
}
857861
else
@@ -917,15 +921,19 @@ void DisplayThreadStatic (DacpModuleData* pModule, CLRDATA_ADDRESS cdaMT, DacpMe
917921
continue;
918922
}
919923

920-
ExtOut(" %x:", vThread.osThreadId);
924+
ExtOut(INDENT_DATA "%x:", vThread.osThreadId);
921925
DisplayDataMember(pFD, dwTmp, FALSE);
926+
ExtOut("\n");
922927
}
923928
}
924929

925930
// Go to next thread
926931
CurThread = vThread.nextThread;
927932
}
928-
ExtOut(" <<\n");
933+
ExtOut("\n");
934+
935+
#undef INDENT
936+
#undef INDENT_DATA
929937
}
930938

931939
const char * ElementTypeName(unsigned type)
@@ -3961,7 +3969,7 @@ class SOSDacInterface15Simulator : public ISOSDacInterface15
39613969
return S_OK;
39623970
}
39633971

3964-
virtual HRESULT STDMETHODCALLTYPE Next(
3972+
virtual HRESULT STDMETHODCALLTYPE Next(
39653973
/* [in] */ unsigned int count,
39663974
/* [length_is][size_is][out] */ SOSMethodData methods[ ],
39673975
/* [out] */ unsigned int *pFetched)
@@ -4051,7 +4059,7 @@ class SOSDacInterface15Simulator : public ISOSDacInterface15
40514059
return E_NOINTERFACE;
40524060
}
40534061

4054-
virtual HRESULT STDMETHODCALLTYPE GetMethodTableSlotEnumerator(
4062+
virtual HRESULT STDMETHODCALLTYPE GetMethodTableSlotEnumerator(
40554063
CLRDATA_ADDRESS mt,
40564064
ISOSMethodEnum **enumerator)
40574065
{

0 commit comments

Comments
 (0)