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

[automated] Merge branch 'release/8.0' => 'release/8.0-staging' #111421

Merged
merged 9 commits into from
Jan 23, 2025
Merged

[automated] Merge branch 'release/8.0' => 'release/8.0-staging' #111421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6384931
Merge commit 'c1ae962610643a3c17bcf9621017ac42ff7703f7'
Nov 5, 2024
c9309e4
Merge commit '18be5f154b6f49849978a6136c5595bbfbef588c'
Dec 2, 2024
c55f263
Merge commit '85de95211b9e0d72325c8dbfcbfe98a0bb78a2f8'
Dec 2, 2024
03db418
Merge commit 'e6b0f6ddf41201fcbef84e458cd5e1c6d03f3e31'
Dec 2, 2024
89ef51c
Merged PR 45620: Update DIA to 17.12.0-beta1.24603.5
Dec 3, 2024
e346656
Merge pull request #111376 from carlossanlop/release/8.0-staging
carlossanlop Jan 14, 2025
0f5d4d6
Merge commit '89ef51c5d8f5239345127a1e282e11036e590c8b' into internal…
vseanreesermsft Jan 14, 2025
0205d7b
Merge pull request #111430 from vseanreesermsft/internal-merge-8.0-20…
carlossanlop Jan 15, 2025
50773e8
Update dependencies from https://github.com/dotnet/emsdk build 202501…
dotnet-maestro[bot] Jan 22, 2025
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
5 changes: 1 addition & 4 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-c458a76" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-c458a76-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-3/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-c458a76-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-c458a76-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-1/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-b767aab" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b767aaba/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-sdk -->
<!-- End: Package sources from dotnet-sdk -->
Expand Down
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,13 @@
<Sha>45dd3a73dd5b64b010c4251303b3664bb30df029</Sha>
<SourceBuild RepoName="cecil" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.12">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.13">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>c458a7647c04e323c238f381eb176af24254b3ff</Sha>
<Sha>b767aaba495c5666e715d070cf2556e6a6bb58dc</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.12-servicing.24569.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.13-servicing.25071.1">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>c458a7647c04e323c238f381eb176af24254b3ff</Sha>
<Sha>b767aaba495c5666e715d070cf2556e6a6bb58dc</Sha>
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25060.2">
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 @@ -167,7 +167,7 @@
<optimizationlinuxarm64MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationlinuxarm64MIBCRuntimeVersion>
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.23566.3</optimizationPGOCoreCLRVersion>
<!-- Not auto-updated. -->
<MicrosoftDiaSymReaderNativeVersion>17.10.0-beta1.24272.1</MicrosoftDiaSymReaderNativeVersion>
<MicrosoftDiaSymReaderNativeVersion>17.12.0-beta1.24603.5</MicrosoftDiaSymReaderNativeVersion>
<SystemCommandLineVersion>2.0.0-beta4.23307.1</SystemCommandLineVersion>
<TraceEventVersion>3.0.3</TraceEventVersion>
<NETStandardLibraryRefVersion>2.1.0</NETStandardLibraryRefVersion>
Expand Down Expand Up @@ -242,7 +242,7 @@
Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml
like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-8_0_100_Transport
-->
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>8.0.12</MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>8.0.13</MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</MicrosoftNETRuntimeEmscriptenVersion>
<!-- workloads -->
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
Expand Down
Loading