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

[release/9.0.1xx] Update dependencies from dotnet/sdk #22166

Open
wants to merge 6 commits into
base: release/9.0.1xx
Choose a base branch
from
+67 −19
Open

[release/9.0.1xx] Update dependencies from dotnet/sdk #22166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8acad50
Update dependencies from https://github.com/dotnet/sdk build 20250211.36
dotnet-maestro[bot] Feb 12, 2025
3936df3
Re-generate global.json for PR #22166: [release/9.0.1xx] Update depen…
Feb 12, 2025
7416450
Add a 8.0.13 feed.
rolfbjarne Feb 12, 2025
423b4bb
Add a 8.0.14 feed.
rolfbjarne Feb 14, 2025
5788b14
Bump adr to get updated feeds.
rolfbjarne Feb 18, 2025
efcc3d1
Merge branch 'release/9.0.1xx' into darc-release/9.0.1xx-160a987d-925…
rolfbjarne Feb 20, 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
48 changes: 48 additions & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,30 @@
<!-- Begin: Package sources from dotnet-emsdk -->
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-704f7cb" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-9/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-8/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-7/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-6/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-5/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-4/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-15" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-15/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-14" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-14/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-13" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-13/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-12" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-12/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-11" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-11/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-10/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-80aa709" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-80aa709-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-80aa709-15" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-15/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-80aa709-14" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-14/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-80aa709-12" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-12/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-80aa709-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-10/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />
Expand All @@ -33,13 +55,39 @@
<!-- Add a 8.0.12 feed -->
<add key="darc-pub-dotnet-emsdk-0218136" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-0218136c/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-c1ae962" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-c1ae9626/nuget/v3/index.json" />
<!-- Add a 8.0.13 feed -->
<add key="darc-pub-dotnet-runtime-e346656" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-e346656d/nuget/v3/index.json" />
<!-- Add a 8.0.14 feed -->
<add key="darc-pub-dotnet-runtime-0fdf85d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-0fdf85d5/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources>
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-80aa709-10" value="true" />
<add key="darc-int-dotnet-runtime-80aa709-12" value="true" />
<add key="darc-int-dotnet-runtime-80aa709-14" value="true" />
<add key="darc-int-dotnet-runtime-80aa709-15" value="true" />
<add key="darc-int-dotnet-runtime-80aa709-2" value="true" />
<add key="darc-int-dotnet-runtime-80aa709" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-704f7cb-1" value="true" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-10" value="true" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-11" value="true" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-12" value="true" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-13" value="true" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-14" value="true" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-15" value="true" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-2" value="true" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-3" value="true" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-4" value="true" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-5" value="true" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-6" value="true" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-7" value="true" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-8" value="true" />
<add key="darc-int-dotnet-aspnetcore-704f7cb-9" value="true" />
<add key="darc-int-dotnet-aspnetcore-704f7cb" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Expand Down
24 changes: 12 additions & 12 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.102-servicing.24610.2">
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.104-servicing.25111.36">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>a345a00343aa14a693aec75a3d56fc07e99e517f</Sha>
<Sha>346d06baea1cf7113e181e779b056b955973c633</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="9.0.0-alpha.1.23556.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cf47d9ff6827a3e1d6f2acbf925cd618418f20dd</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
</Dependency>
<!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if removing the CoherentParentDependency on Microsoft.NET.Sdk -->
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</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="9.0.0" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>af22effae4069a5dfb9b0735859de48820104f5b</Sha>
<Sha>704f7cb1d2cea33afb00c2097731216f121c2c73</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-rtm.24528.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.2-servicing.25061.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>763d10a1a251be35337ee736832bfde3f9200672</Sha>
<Sha>2c27e405e17595694d91892159593d6dd10e61e2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.24515.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25056.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/cecil</Uri>
<Sha>e51bd3677d5674fa34bf5676c5fc5562206bf94e</Sha>
<Sha>7ea2381200e5ca70cf67efc887d9cd693d82b77f</Sha>
</Dependency>
<!-- This is a subscription of the .NET 8/Xcode 16.0 versions of our packages -->
<Dependency Name="Microsoft.MacCatalyst.Sdk.net8.0_18.0" Version="18.0.8324">
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
<!--Package versions-->
<PropertyGroup>
<!-- Versions updated by maestro -->
<MicrosoftNETSdkPackageVersion>9.0.102-servicing.24610.2</MicrosoftNETSdkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>9.0.0</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETSdkPackageVersion>9.0.104-servicing.25111.36</MicrosoftNETSdkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>9.0.2</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETILLinkPackageVersion>9.0.0-alpha.1.23556.4</MicrosoftNETILLinkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>9.0.0-beta.24572.2</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkVersion>8.0.0-beta.24413.2</MicrosoftDotNetSharedFrameworkSdkVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.2</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rtm.23511.3</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>9.0.0-rc.2.24462.10</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.24515.1</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25056.3</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetXHarnessiOSSharedPackageVersion>10.0.0-prerelease.24604.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>9.0.0-beta.24572.2</MicrosoftDotNetArcadeSdkPackageVersion>
<!-- Manually updated versions -->
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"sdk": {
"version": "9.0.102-servicing.24610.2"
"version": "9.0.104-servicing.25111.36"
},
"tools": {
"dotnet": "9.0.102-servicing.24610.2"
"dotnet": "9.0.104-servicing.25111.36"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24572.2"
Expand Down
2 changes: 1 addition & 1 deletion mk/xamarin.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ MACCORE_VERSION := $(shell cd $(MACCORE_PATH) 2> /dev/null && git rev-parse HE
MACCORE_BRANCH := $(shell cd $(MACCORE_PATH) 2> /dev/null && git symbolic-ref --short HEAD 2> /dev/null)


NEEDED_ADR_VERSION := d466eac70a9b1bba94c18c63e34e590c66f6d044
NEEDED_ADR_VERSION := b525c456d6af116aa3a1721118b90b465ccef09d
NEEDED_ADR_BRANCH := main

ADR_DIRECTORY := macios-adr
Expand Down
Loading