Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into xcode15.3-bump
Browse files Browse the repository at this point in the history
  • Loading branch information
rolfbjarne committed May 21, 2024
2 parents ee92532 + 37591c7 commit 6c23a7d
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 18 deletions.
2 changes: 2 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
<add key="darc-pub-dotnet-runtime-b6e8c6a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-b6e8c6a6/nuget/v3/index.json" />
<!-- Add a 7.0.19 feed -->
<add key="darc-pub-dotnet-runtime-397f9ea" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-397f9eac/nuget/v3/index.json" />
<!-- Add a 7.0.20 feed -->
<add key="darc-pub-dotnet-runtime-fd36db5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-fd36db5f/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources>
<clear />
Expand Down
24 changes: 12 additions & 12 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.105-servicing.24216.7">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.107-servicing.24270.16">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>79797800a3fadfd33361cc387fb247f90835a357</Sha>
<Sha>fdba15e12c3d5592c7362fbb6db83cbd906f9130</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="8.0.5-servicing.24216.14">
<Dependency Name="Microsoft.NET.ILLink" Version="8.0.0-rtm.23524.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>ca4f0fe37455882baa00c75b1ef30a7ff1494457</Sha>
<Sha>59edaad404d1b8e47080015ae8d0787f94c970df</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.5" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>2d7eea252964e69be94cb9c847b371b23e4dd470</Sha>
<Sha>087e15321bb712ef6fe8b0ba6f8bd12facf92629</Sha>
</Dependency>
<!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if removing the CoherentParentDependency on Microsoft.Dotnet.Sdk.Internal -->
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.5" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>ca4f0fe37455882baa00c75b1ef30a7ff1494457</Sha>
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>087e15321bb712ef6fe8b0ba6f8bd12facf92629</Sha>
</Dependency>
<!-- This is required for our test apps to build; in some cases Microsoft.AspNetCore.App is pulled in, and when building test apps the build needs to be able to resolve that -->
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.5" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>8486d31e24f30e3fa1809a95699a0adc16f448d7</Sha>
<Sha>c9e3996173cec136bc2e9f3b4ec45f2a323b1d63</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.5" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
Expand Down Expand Up @@ -64,9 +64,9 @@
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>492e53f5b423c6e9cbdb48f3d57c92a1f97b5005</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="8.0.5">
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="8.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>ca4f0fe37455882baa00c75b1ef30a7ff1494457</Sha>
<Sha>59edaad404d1b8e47080015ae8d0787f94c970df</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
10 changes: 5 additions & 5 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<!--Package versions-->
<PropertyGroup>
<!-- Versions updated by maestro -->
<MicrosoftDotnetSdkInternalPackageVersion>8.0.105-servicing.24216.7</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.4</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETILLinkPackageVersion>8.0.5-servicing.24216.14</MicrosoftNETILLinkPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>8.0.107-servicing.24270.16</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.5</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETILLinkPackageVersion>8.0.0-rtm.23524.7</MicrosoftNETILLinkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.5</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>8.0.5</MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>8.0.5</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rtm.23511.3</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>8.0.0</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23509.2</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetXHarnessiOSSharedPackageVersion>9.0.0-prerelease.24252.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "8.0.105-servicing.24216.7"
"version": "8.0.107-servicing.24270.16"
}
}

0 comments on commit 6c23a7d

Please sign in to comment.