Skip to content

merge main to feature/eventPipeMeters #3579

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

Merged
wiktork merged 3 commits into from
Jan 4, 2023
Merged

merge main to feature/eventPipeMeters #3579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8eee1ce
Update dependencies from https://github.com/microsoft/clrmd build 202…
dotnet-maestro[bot] Jan 1, 2023
2854ea8
Update dependencies from https://github.com/dotnet/arcade build 20221…
dotnet-maestro[bot] Jan 2, 2023
4de9fe6
Update dependencies from https://github.com/dotnet/symstore build 202…
dotnet-maestro[bot] Jan 3, 2023
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
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.SymbolStore" Version="1.0.362701">
<Dependency Name="Microsoft.SymbolStore" Version="1.0.405201">
<Uri>https://github.com/dotnet/symstore</Uri>
<Sha>d647a79287a9b08ad0775293ed9769a8e31fe67c</Sha>
<Sha>497d5da763d44d34ed577d4ac9db3ce7231a238a</Sha>
</Dependency>
<Dependency Name="Microsoft.Diagnostics.Runtime" Version="2.3.362104">
<Dependency Name="Microsoft.Diagnostics.Runtime" Version="2.3.363101">
<Uri>https://github.com/microsoft/clrmd</Uri>
<Sha>323fcc760d7bd5f8ba248c005b27a3ed52592f0b</Sha>
<Sha>7dab97e3106587f778d4c09ed2cbc2391b6f5354</Sha>
</Dependency>
<Dependency Name="Microsoft.Diagnostics.Runtime.Utilities" Version="2.0.325901">
<Uri>https://github.com/microsoft/clrmd</Uri>
Expand All @@ -19,9 +19,9 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22623.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22630.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>27f876d352ee2a1105c0bf1869cad048141acb3a</Sha>
<Sha>e82404fca08383513e0b0b3c5308d4a9b18b7c7a</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22316.2" Pinned="true">
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Latest symstore version updated by darc -->
<MicrosoftSymbolStoreVersion>1.0.362701</MicrosoftSymbolStoreVersion>
<MicrosoftSymbolStoreVersion>1.0.405201</MicrosoftSymbolStoreVersion>
<!-- Latest shared runtime version updated by darc -->
<VSRedistCommonNetCoreSharedFrameworkx6470Version>7.0.0-rtm.22513.12</VSRedistCommonNetCoreSharedFrameworkx6470Version>
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.0</MicrosoftNETCoreAppRuntimewinx64Version>
Expand Down Expand Up @@ -45,7 +45,7 @@
<MicrosoftWin32PrimitivesVersion>4.3.0</MicrosoftWin32PrimitivesVersion>
<!-- Other libs -->
<MicrosoftBclAsyncInterfacesVersion>1.1.0</MicrosoftBclAsyncInterfacesVersion>
<MicrosoftDiagnosticsRuntimeVersion>2.3.362104</MicrosoftDiagnosticsRuntimeVersion>
<MicrosoftDiagnosticsRuntimeVersion>2.3.363101</MicrosoftDiagnosticsRuntimeVersion>
<MicrosoftDiaSymReaderNativePackageVersion>16.9.0-beta1.21055.5</MicrosoftDiaSymReaderNativePackageVersion>
<MicrosoftDiagnosticsTracingTraceEventVersion>2.0.64</MicrosoftDiagnosticsTracingTraceEventVersion>
<!-- Use pinned version to avoid picking up latest (which doesn't support netcoreapp3.1) during source-build -->
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.5.0",
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22623.1"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22630.1"
}
}