Skip to content

Commit

Permalink
Merged PR 44215: Add back the coherency dependency and resync runtime…
Browse files Browse the repository at this point in the history
… flow

- Please add description for changes you are making.
- If there is an issue related to this PR, please add the reference.

Add back the coherency dependency and resync runtime flow

----
#### AI description  (iteration 1)
#### PR Classification
Dependency update and runtime flow synchronization.

#### PR Summary
This pull request updates dependencies and resynchronizes the runtime flow to ensure coherency.
- `/eng/Version.Details.xml`: Updated `Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100` and `Microsoft.SourceBuild.Intermediate.emsdk` dependencies to version 8.0.11.
- `/NuGet.config`: Updated package source keys for `dotnet-emsdk` to reflect the new SHA.
- `/eng/Versions.props`: Updated `MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion` to 8.0.11.
  • Loading branch information
marcpopMSFT committed Oct 23, 2024
1 parent 3829d74 commit 353be46
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 12 deletions.
8 changes: 1 addition & 7 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,7 @@
<add key="darc-int-dotnet-aspnetcore-4757647" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-47576478/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-91b783e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-91b783ed/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-91b783e-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-91b783ed-8/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-91b783e-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-91b783ed-7/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-91b783e-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-91b783ed-4/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-91b783e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-91b783ed-3/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-91b783e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-91b783ed-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-91b783e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-91b783ed-1/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-f623714" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-f6237140/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-d3e7d29" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-d3e7d292/nuget/v3/index.json" />
Expand Down
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -168,13 +168,13 @@
<Uri>https://github.com/Microsoft/ApplicationInsights-dotnet</Uri>
<Sha>53b80940842204f78708a538628288ff5d741a1d</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.10">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.11" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>91b783edc518e9ea0c0e883016b02261893389db</Sha>
<Sha>f6237140b33bf18c72dccfeda14be8d103c3b93e</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.10-servicing.24452.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.11-servicing.24511.5" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>91b783edc518e9ea0c0e883016b02261893389db</Sha>
<Sha>f6237140b33bf18c72dccfeda14be8d103c3b93e</Sha>
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.Aspire.Manifest-8.0.100" Version="8.0.0-preview.1.23557.2">
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
<XamarinMacOSWorkloadManifestVersion>14.0.8478</XamarinMacOSWorkloadManifestVersion>
<XamarinTvOSWorkloadManifestVersion>17.0.8478</XamarinTvOSWorkloadManifestVersion>
<!-- Workloads from dotnet/emsdk -->
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>8.0.10</MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>8.0.11</MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion)</EmscriptenWorkloadManifestVersion>
<!-- emsdk workload prerelease version band must match the emsdk feature band -->
<EmscriptenWorkloadFeatureBand>8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`))</EmscriptenWorkloadFeatureBand>
Expand Down

0 comments on commit 353be46

Please sign in to comment.