Skip to content

Commit e32808d

Browse files
dotnet-maestro[bot]dalexsoto
dotnet-maestro[bot]
and
dalexsoto
authored
[release/10.0.1xx-preview1] Update dependencies from dotnet/sdk (#22105)
This pull request updates the following dependencies ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 10.0.0-preview.1.25079.4 to 10.0.0-preview.1.25107.4 (parent: Microsoft.NET.Sdk) ## From https://github.com/dotnet/sdk - **Subscription**: d05b3a99-3aea-4518-81ec-4583c1153c08 - **Build**: 20250210.21 - **Date Produced**: February 11, 2025 6:51:46 AM UTC - **Commit**: d1382d9b07310de51feef4b00ab46e9648cb9919 - **Branch**: refs/heads/release/10.0.1xx-preview1 - **Updates**: - **Microsoft.NET.Sdk**: [from 10.0.100-preview.1.25081.4 to 10.0.100-preview.1.25110.21][11] [11]: dotnet/sdk@c9c8de2...d1382d9 --------- Co-authored-by: Alex Soto <alex@soto.dev>
1 parent af16bd6 commit e32808d

File tree

13 files changed

+71
-514
lines changed

13 files changed

+71
-514
lines changed

‎builds/Makefile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,14 @@ print-dotnet-pkg-urls: dotnet-install.sh
5555
$(Q) if ! test -f $@-found-it.stamp; then echo "No working urls were found."; exit 1; fi
5656
$(Q) rm -f $@-found-it.stamp
5757

58-
# We need https://github.com/dotnet/install-scripts/pull/526, which hasn't been released yet.
58+
# We need https://github.com/dotnet/install-scripts/pull/555, which hasn't been released yet.
5959
# Revert to using https://dot.net/v1/dotnet-install.sh whenever https://dot.net/v1/dotnet-install.sh has been updated.
60-
DOTNET_DOWNLOAD_URL?=https://raw.githubusercontent.com/dotnet/install-scripts/87151ae8d2153247f4566208e0df23169d737e92/src/dotnet-install.sh
60+
DOTNET_DOWNLOAD_URL?=https://raw.githubusercontent.com/dotnet/install-scripts/d48e000adad7243861d799ec86c0bf7210a8fc7a/src/dotnet-install.sh
6161

6262
DOTNET_DOWNLOAD_URL?=https://dot.net/v1/dotnet-install.sh
6363

6464
dotnet-install.sh: Makefile
65+
$(Q) echo "Downloading dotnet-install.sh from $(DOTNET_DOWNLOAD_URL) into $@."
6566
$(Q) $(CURL_RETRY) $(DOTNET_DOWNLOAD_URL) --output $@.tmp
6667
$(Q) chmod +x $@.tmp
6768
$(Q) mv $@.tmp $@

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-preview.1.25081.4">
3+
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-preview.1.25110.21">
44
<Uri>https://github.com/dotnet/sdk</Uri>
5-
<Sha>c9c8de22fa57f40f0d322865e5ce5f780d9a797d</Sha>
5+
<Sha>d1382d9b07310de51feef4b00ab46e9648cb9919</Sha>
66
</Dependency>
77
<Dependency Name="Microsoft.NET.ILLink" Version="9.0.0-alpha.1.23556.4">
88
<Uri>https://github.com/dotnet/runtime</Uri>
99
<Sha>cf47d9ff6827a3e1d6f2acbf925cd618418f20dd</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-preview.1.25078.5" CoherentParentDependency="Microsoft.NET.Sdk">
11+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-preview.1.25080.5" CoherentParentDependency="Microsoft.NET.Sdk">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>1da2ea4983bb5cc3d17a3806eebc435df4cd27dd</Sha>
13+
<Sha>b98cabca124ca73be9247c5f7b6796c6ce55e816</Sha>
1414
</Dependency>
1515
<!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if removing the CoherentParentDependency on Microsoft.NET.Sdk -->
16-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.1.25078.5" CoherentParentDependency="Microsoft.NET.Sdk">
16+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.1.25080.5" CoherentParentDependency="Microsoft.NET.Sdk">
1717
<Uri>https://github.com/dotnet/runtime</Uri>
18-
<Sha>1da2ea4983bb5cc3d17a3806eebc435df4cd27dd</Sha>
18+
<Sha>b98cabca124ca73be9247c5f7b6796c6ce55e816</Sha>
1919
</Dependency>
2020
<!-- 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 -->
21-
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-preview.1.25079.4" CoherentParentDependency="Microsoft.NET.Sdk">
21+
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-preview.1.25107.4" CoherentParentDependency="Microsoft.NET.Sdk">
2222
<Uri>https://github.com/dotnet/aspnetcore</Uri>
23-
<Sha>3b0d8ebf433269137c0fb345446f5381440668f7</Sha>
23+
<Sha>ddbe93118b58c82efcc930842caf0f182d53aa2f</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport" Version="10.0.0-alpha.1.25059.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
25+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport" Version="10.0.0-preview.1.25077.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
2626
<Uri>https://github.com/dotnet/emsdk</Uri>
27-
<Sha>0de3165cb0d56323b6caaf8e9916d4d9e72da32d</Sha>
27+
<Sha>3ac196ac425223d11490e759c2641256ce746f21</Sha>
2828
</Dependency>
2929
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.24627.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
3030
<Uri>https://github.com/dotnet/cecil</Uri>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<!--Package versions-->
33
<PropertyGroup>
44
<!-- Versions updated by maestro -->
5-
<MicrosoftNETSdkPackageVersion>10.0.100-preview.1.25081.4</MicrosoftNETSdkPackageVersion>
6-
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-preview.1.25078.5</MicrosoftNETILLinkTasksPackageVersion>
5+
<MicrosoftNETSdkPackageVersion>10.0.100-preview.1.25110.21</MicrosoftNETSdkPackageVersion>
6+
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-preview.1.25080.5</MicrosoftNETILLinkTasksPackageVersion>
77
<MicrosoftNETILLinkPackageVersion>9.0.0-alpha.1.23556.4</MicrosoftNETILLinkPackageVersion>
88
<MicrosoftDotNetBuildTasksFeedPackageVersion>9.0.0-beta.25058.5</MicrosoftDotNetBuildTasksFeedPackageVersion>
99
<MicrosoftDotNetSharedFrameworkSdkVersion>8.0.0-beta.24413.2</MicrosoftDotNetSharedFrameworkSdkVersion>
10-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.1.25078.5</MicrosoftNETCoreAppRefPackageVersion>
10+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.1.25080.5</MicrosoftNETCoreAppRefPackageVersion>
1111
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rtm.23511.3</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
1212
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>9.0.0-rc.2.24462.10</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
1313
<MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-preview.1.25081.4"
3+
"version": "10.0.100-preview.1.25110.21"
44
},
55
"tools": {
6-
"dotnet": "10.0.100-preview.1.25081.4"
6+
"dotnet": "10.0.100-preview.1.25110.21"
77
},
88
"msbuild-sdks": {
99
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25058.5"

‎msbuild/Xamarin.MacDev.Tasks/Tasks/PackLibraryResources.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,14 @@ public override bool Execute ()
4949
{
5050
var results = new List<ITaskItem> ();
5151

52+
var hashOriginalResources = new HashSet<string> (BundleOriginalResourcesWithLogicalNames.Select (v => v.ItemSpec));
53+
5254
foreach (var item in BundleResourcesWithLogicalNames) {
55+
if (hashOriginalResources.Contains (item.ItemSpec)) {
56+
Log.LogMessage (MessageImportance.Low, $"Skipping BundleResourcesWithLogicalNames={item.ItemSpec}, because it's also specified in BundleOriginalResourcesWithLogicalNames");
57+
continue;
58+
}
59+
5360
var logicalName = item.GetMetadata ("LogicalName");
5461

5562
if (string.IsNullOrEmpty (logicalName)) {

‎tests/BundledResources/ResourcesTest.cs‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
using System;
1111
using System.IO;
12+
using System.Linq;
1213
using NUnit.Framework;
1314

1415
using Foundation;
@@ -41,10 +42,14 @@ public void Bundled ()
4142
if (!hasResources) {
4243
Assert.That (resources.Length, Is.EqualTo (0), "No resources");
4344
} else {
44-
Assert.That (resources.Length, Is.GreaterThanOrEqualTo (2), "Resources");
45-
Assert.That (resources, Contains.Item ("__monotouch_content_basn3p08.png"), "res-basn3p08.png");
46-
Assert.That (resources, Contains.Item ("__monotouch_content_basn3p08__with__loc.png"), "res-basn3p08_with_loc.png");
47-
Assert.That (resources, Contains.Item ("__monotouch_content_xamvideotest.mp4"), "res-xamvideotest.mp4");
45+
var expectedResources = new string [] {
46+
"basn3p08.png",
47+
"basn3p08__with__loc.png",
48+
"xamvideotest.mp4",
49+
};
50+
var oldPrefixed = expectedResources.Select (v => $"__monotouch_content_{v}").ToArray ();
51+
var newPrefixed = expectedResources.Select (v => $"__monotouch_item_BundleResource_{v}").ToArray ();
52+
Assert.That (resources, Is.EquivalentTo (oldPrefixed).Or.EquivalentTo (newPrefixed), "Resources");
4853
}
4954
}
5055
}

0 commit comments

Comments
 (0)