Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
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
24 changes: 5 additions & 19 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-dotnet -->
<add key="darc-pub-dotnet-dotnet-03ebd38" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-03ebd38e/nuget/v3/index.json" />
<add key="darc-pub-dotnet-dotnet-5aef8ea" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-5aef8eac/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-dotnet -->
<!-- Begin: Package sources from dotnet-macios -->
<add key="darc-pub-dotnet-macios-ecebc19" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-ecebc190/nuget/v3/index.json" />
Expand All @@ -27,32 +27,18 @@
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />
<add key="Dotnet arcade" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
<!-- dotnet8-transport is required for Microsoft.DotNet.Cecil -->
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
<add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
<add key="macios-dependencies" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/macios-dependencies/nuget/v3/index.json" />
<add key="xamarin-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/xamarin-impl/nuget/v3/index.json" />
<add key="local-tests-feed" value="tests/.nuget/packages" />
<!-- 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" />
<!-- Add a 8.0.15 feed -->
<add key="darc-pub-dotnet-runtime-7aa8bb0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-7aa8bb0e/nuget/v3/index.json" />
<!-- Add a 8.0.16 feed -->
<add key="darc-pub-dotnet-runtime-0239fb04" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-0239fb04/nuget/v3/index.json" />
<!-- Add a 8.0.18 feed -->
<add key="darc-pub-dotnet-runtime-c0390586" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-c0390586/nuget/v3/index.json" />
<!-- Add a 9.0.5 feed -->
<add key="darc-pub-dotnet-runtime-38d99eb2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-38d99eb2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-bfcae359" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-bfcae359/nuget/v3/index.json" />
<!-- Add a 8.0.22 feed -->
<add key="darc-pub-dotnet-runtime-ad2d4fbc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ad2d4fbc/nuget/v3/index.json" />
<!-- Add a 9.0.11 feed -->
<add key="darc-pub-dotnet-runtime-35fe9c61" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-35fe9c61/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources>
<clear />
Expand Down
12 changes: 6 additions & 6 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25515.107</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25515.107</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25515.107</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.25515.107</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>10.0.0-rtm.25515.107</MicrosoftNETILLinkPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25520.105</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25520.105</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25520.105</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.25520.105</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>10.0.0-rtm.25520.105</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.0</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>10.0.0</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.100-rtm.25515.107</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.100-rtm.25520.105</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.100</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<!-- dotnet/macios dependencies -->
Expand Down
32 changes: 16 additions & 16 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-rtm.25515.107">
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-rtm.25520.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="10.0.0-rtm.25515.107">
<Dependency Name="Microsoft.NET.ILLink" Version="10.0.0-rtm.25520.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
</Dependency>
<!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if changing the version outside of dependency flow -->
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25515.107">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25520.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
</Dependency>
<!-- This is a subscription of the .NET 9 latest stable versions of our packages -->
<Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_18.5" Version="18.5.9227">
Expand Down Expand Up @@ -78,25 +78,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25515.107">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25520.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25515.107">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25520.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.100">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="10.0.0-prerelease.25466.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>cbaa911ef1bce4cf92a7e4f7ffa5171eddd1a8fd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25515.107">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25520.105">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>03ebd38e3fd6b1068f44b5e4c560ad891c2b412e</Sha>
<Sha>5aef8eac3428937558b9abd7b477148b8a5d29b8</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"sdk": {
"version": "10.0.100-rtm.25515.107",
"version": "10.0.100-rtm.25520.105",
"paths": [
"builds/downloads/dotnet",
"$host$"
],
"errorMessage": "The .NET SDK could not be found, please run 'make dotnet -C builds'."
},
"tools": {
"dotnet": "10.0.100-rtm.25515.107"
"dotnet": "10.0.100-rtm.25520.105"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25515.107"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25520.105"
}
}
4 changes: 2 additions & 2 deletions mk/xamarin.mk
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ifdef ENABLE_XAMARIN
ifdef ENABLE_ADR
NEEDED_ADR_VERSION := 4eaa26dc8a9df5638ed133529224dd697a2f7755
NEEDED_ADR_BRANCH := xcode26
NEEDED_ADR_VERSION := f766ab0cf5ee79f9e254c0eb206bd77f7061f0b1
NEEDED_ADR_BRANCH := main

ADR_DIRECTORY := macios-adr
ADR_MODULE := https://[email protected]/devdiv/DevDiv/_git/macios-adr
Expand Down