Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion 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-4090eb3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-4090eb30/nuget/v3/index.json" />
<add key="darc-pub-dotnet-dotnet-1483376" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-1483376c/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-dotnet -->
<!-- Begin: Package sources from dotnet-macios -->
<add key="darc-pub-dotnet-macios-ab5c9f5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-ab5c9f5f/nuget/v3/index.json" />
Expand Down
20 changes: 10 additions & 10 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25569.104</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25569.104</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25569.104</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.25569.104</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>10.0.1-servicing.25569.104</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.1</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>10.0.1</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.101-servicing.25569.104</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.1</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.101</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25574.102</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25574.102</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25574.102</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.25574.102</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>10.0.2-servicing.25574.102</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.2</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>10.0.2</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.102-servicing.25574.102</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.2</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.102</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<!-- dotnet/macios dependencies -->
<MicrosoftiOSSdknet100_260PackageVersion>26.0.11017</MicrosoftiOSSdknet100_260PackageVersion>
<MicrosoftiOSSdknet90_185PackageVersion>18.5.9227</MicrosoftiOSSdknet90_185PackageVersion>
Expand Down
40 changes: 20 additions & 20 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.101-servicing.25569.104">
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.102-servicing.25574.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4090eb301f5e5db13760aa57eeb32b516c42c56b</Sha>
<Sha>1483376c1a0ffb1e5f197266578dbce1e4098783</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="10.0.1-servicing.25569.104">
<Dependency Name="Microsoft.NET.ILLink" Version="10.0.2-servicing.25574.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4090eb301f5e5db13760aa57eeb32b516c42c56b</Sha>
<Sha>1483376c1a0ffb1e5f197266578dbce1e4098783</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.1">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.2">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4090eb301f5e5db13760aa57eeb32b516c42c56b</Sha>
<Sha>1483376c1a0ffb1e5f197266578dbce1e4098783</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="10.0.1">
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="10.0.2">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4090eb301f5e5db13760aa57eeb32b516c42c56b</Sha>
<Sha>1483376c1a0ffb1e5f197266578dbce1e4098783</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.1">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.2">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4090eb301f5e5db13760aa57eeb32b516c42c56b</Sha>
<Sha>1483376c1a0ffb1e5f197266578dbce1e4098783</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25569.104">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25574.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4090eb301f5e5db13760aa57eeb32b516c42c56b</Sha>
<Sha>1483376c1a0ffb1e5f197266578dbce1e4098783</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 @@ -95,25 +95,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25569.104">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25574.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4090eb301f5e5db13760aa57eeb32b516c42c56b</Sha>
<Sha>1483376c1a0ffb1e5f197266578dbce1e4098783</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25569.104">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25574.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4090eb301f5e5db13760aa57eeb32b516c42c56b</Sha>
<Sha>1483376c1a0ffb1e5f197266578dbce1e4098783</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.101">
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4090eb301f5e5db13760aa57eeb32b516c42c56b</Sha>
<Sha>1483376c1a0ffb1e5f197266578dbce1e4098783</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="10.0.0-prerelease.25527.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>b9f51d9ff3ac9411d1aa9988ef20bfda9a041418</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25569.104">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25574.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>4090eb301f5e5db13760aa57eeb32b516c42c56b</Sha>
<Sha>1483376c1a0ffb1e5f197266578dbce1e4098783</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.101-servicing.25569.104",
"version": "10.0.102-servicing.25574.102",
"paths": [
"builds/downloads/dotnet",
"$host$"
],
"errorMessage": "The .NET SDK could not be found, please run 'make dotnet -C builds'."
},
"tools": {
"dotnet": "10.0.101-servicing.25569.104"
"dotnet": "10.0.102-servicing.25574.102"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25569.104"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25574.102"
}
}
2 changes: 1 addition & 1 deletion mk/xamarin.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ifdef ENABLE_XAMARIN
ifdef ENABLE_ADR
NEEDED_ADR_VERSION := f766ab0cf5ee79f9e254c0eb206bd77f7061f0b1
NEEDED_ADR_VERSION := 1969331d8e98d7c199e8d7d84809f93a4e71556a
NEEDED_ADR_BRANCH := main

ADR_DIRECTORY := macios-adr
Expand Down
Loading