Skip to content

Commit ea3f78c

Browse files
dotnet-maestro[bot]dalexsoto
dotnet-maestro[bot]
and
dalexsoto
authored
[net9.0] Update dependencies from dotnet/installer (#20343)
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.NET.ILLink.Tasks**: from 9.0.0-preview.3.24129.2 to 9.0.0-preview.4.24209.8 (parent: Microsoft.Dotnet.Sdk.Internal) - **Microsoft.AspNetCore.App.Ref**: from 9.0.0-preview.3.24151.1 to 9.0.0-preview.4.24208.6 (parent: Microsoft.Dotnet.Sdk.Internal) - **Microsoft.NETCore.App.Ref**: from 9.0.0-preview.3.24129.2 to 9.0.0-preview.4.24209.8 (parent: Microsoft.Dotnet.Sdk.Internal) - **Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport**: from 9.0.0-preview.3.24126.1 to 9.0.0-preview.4.24204.9 (parent: Microsoft.NETCore.App.Ref) - **Microsoft.NETCore.App.Ref**: from 9.0.0-preview.3.24129.2 to 9.0.0-preview.4.24209.8 (parent: Microsoft.Dotnet.Sdk.Internal) - **Microsoft.DotNet.Cecil**: from 0.11.4-alpha.24120.1 to 0.11.4-alpha.24168.1 (parent: Microsoft.NETCore.App.Ref) ## From https://github.com/dotnet/installer - **Subscription**: 3727984b-7a79-4ba3-37dd-08dbe6bddf31 - **Build**: 20240411.4 - **Date Produced**: April 11, 2024 3:25:11 PM UTC - **Commit**: c61f05c5628fdba80433184eb00353a908dbdccc - **Branch**: refs/heads/main - **Updates**: - **Microsoft.Dotnet.Sdk.Internal**: [from 9.0.100-preview.3.24153.2 to 9.0.100-preview.4.24211.4][106] - **Microsoft.NET.ILLink.Tasks**: [from 9.0.0-preview.3.24129.2 to 9.0.0-preview.4.24209.8][107] - **Microsoft.AspNetCore.App.Ref**: [from 9.0.0-preview.3.24151.1 to 9.0.0-preview.4.24208.6][108] - **Microsoft.NETCore.App.Ref**: [from 9.0.0-preview.3.24129.2 to 9.0.0-preview.4.24209.8][107] - **Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport**: [from 9.0.0-preview.3.24126.1 to 9.0.0-preview.4.24204.9][109] - **Microsoft.NETCore.App.Ref**: [from 9.0.0-preview.3.24129.2 to 9.0.0-preview.4.24209.8][107] - **Microsoft.DotNet.Cecil**: [from 0.11.4-alpha.24120.1 to 0.11.4-alpha.24168.1][110] [106]: dotnet/installer@893b762...c61f05c [107]: dotnet/runtime@5e603d5...6b9381b [108]: dotnet/aspnetcore@3e51552...79ef5e3 [109]: dotnet/emsdk@0f3e462...9ad7c26 [110]: dotnet/cecil@0d0bc8e...9c8ea96 --------- Co-authored-by: Alex Soto <alex@alexsoto.me> Co-authored-by: Alex Soto <alex@soto.dev>
1 parent 9ff0b3d commit ea3f78c

File tree

6 files changed

+97
-27
lines changed

6 files changed

+97
-27
lines changed

‎eng/Version.Details.xml

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-preview.3.24153.2">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-preview.4.24211.4">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>893b762b6e36d558df7ae6fccdfd8034f83a1c2e</Sha>
5+
<Sha>c61f05c5628fdba80433184eb00353a908dbdccc</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="9.0.0-preview.3.24129.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
11+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.4.24209.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>5e603d595e63ddc5cdce9777a40608279abdcc37</Sha>
13+
<Sha>6b9381be09980dac0d2fc554cf478e054c005cdb</Sha>
1414
</Dependency>
1515
<!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if removing the CoherentParentDependency on Microsoft.Dotnet.Sdk.Internal -->
16-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.3.24129.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
16+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.4.24209.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
1717
<Uri>https://github.com/dotnet/runtime</Uri>
18-
<Sha>5e603d595e63ddc5cdce9777a40608279abdcc37</Sha>
18+
<Sha>6b9381be09980dac0d2fc554cf478e054c005cdb</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="9.0.0-preview.3.24151.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
21+
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-preview.4.24208.6" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
2222
<Uri>https://github.com/dotnet/aspnetcore</Uri>
23-
<Sha>3e5155276f3d486ef49e1f06ee875d6757983695</Sha>
23+
<Sha>79ef5e329b1e31c3775a1977798253cc8f7da6cc</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-preview.3.24126.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
25+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-preview.4.24204.9" CoherentParentDependency="Microsoft.NETCore.App.Ref">
2626
<Uri>https://github.com/dotnet/emsdk</Uri>
27-
<Sha>0f3e462442af5fe65271e3185d5b645ad40a6041</Sha>
27+
<Sha>9ad7c262f14dc5e40a64030ade7788b36e74adf0</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.24120.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
29+
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.24168.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
3030
<Uri>https://github.com/dotnet/cecil</Uri>
31-
<Sha>0d0bc8e0f47fdae9834e1eac678f364c50946133</Sha>
31+
<Sha>9c8ea966df62f764523b51772763e74e71040a92</Sha>
3232
</Dependency>
3333
<!-- This is a subscription of the .NET 8 versions of our packages -->
3434
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="17.2.8044">

‎eng/Versions.props

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<!--Package versions-->
33
<PropertyGroup>
44
<!-- Versions updated by maestro -->
5-
<MicrosoftDotnetSdkInternalPackageVersion>9.0.100-preview.3.24153.2</MicrosoftDotnetSdkInternalPackageVersion>
6-
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.3.24129.2</MicrosoftNETILLinkTasksPackageVersion>
5+
<MicrosoftDotnetSdkInternalPackageVersion>9.0.100-preview.4.24211.4</MicrosoftDotnetSdkInternalPackageVersion>
6+
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.4.24209.8</MicrosoftNETILLinkTasksPackageVersion>
77
<MicrosoftNETILLinkPackageVersion>9.0.0-alpha.1.23556.4</MicrosoftNETILLinkPackageVersion>
88
<MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
9-
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.3.24129.2</MicrosoftNETCoreAppRefPackageVersion>
9+
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.4.24209.8</MicrosoftNETCoreAppRefPackageVersion>
1010
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rtm.23511.3</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
1111
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>9.0.0-alpha.1.23556.4</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
1212
<MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
13-
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.24120.1</MicrosoftDotNetCecilPackageVersion>
13+
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.24168.1</MicrosoftDotNetCecilPackageVersion>
1414
<MicrosoftDotNetXHarnessiOSSharedPackageVersion>9.0.0-prerelease.24203.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
1515
<!-- Manually updated versions -->
1616
<Emscriptennet7WorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</Emscriptennet7WorkloadVersion>

‎global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "9.0.100-preview.3.24153.2"
3+
"version": "9.0.100-preview.4.24211.4"
44
}
55
}

‎tests/dotnet/UnitTests/TrimmerWarningsTest.cs

+51-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,23 @@ public class TrimmerWarningsTest : TestBaseClass {
88
[TestCase (ApplePlatform.TVOS, "tvossimulator-x64")]
99
public void TrimmerWarningsManagedStaticRegistrar (ApplePlatform platform, string runtimeIdentifiers)
1010
{
11-
TrimmerWarnings (platform, runtimeIdentifiers, "managed-static", Array.Empty<ExpectedBuildMessage> ());
11+
// FIXME: dotnet/runtime#100256
12+
ExpectedBuildMessage [] expectedWarnings;
13+
switch (platform) {
14+
case ApplePlatform.iOS:
15+
case ApplePlatform.TVOS:
16+
expectedWarnings = Array.Empty<ExpectedBuildMessage> ();
17+
break;
18+
case ApplePlatform.MacOSX:
19+
case ApplePlatform.MacCatalyst:
20+
expectedWarnings = Array.Empty<ExpectedBuildMessage> ();
21+
break;
22+
default:
23+
Assert.Fail ($"Unknown platform: {platform}");
24+
return;
25+
}
26+
27+
TrimmerWarnings (platform, runtimeIdentifiers, "managed-static", expectedWarnings);
1228
}
1329

1430
[Test]
@@ -18,7 +34,23 @@ public void TrimmerWarningsManagedStaticRegistrar (ApplePlatform platform, strin
1834
[TestCase (ApplePlatform.TVOS, "tvos-arm64")]
1935
public void TrimmerWarningsStaticRegistrar (ApplePlatform platform, string runtimeIdentifiers)
2036
{
21-
TrimmerWarnings (platform, runtimeIdentifiers, "static", Array.Empty<ExpectedBuildMessage> ());
37+
// FIXME: dotnet/runtime#100256
38+
ExpectedBuildMessage [] expectedWarnings;
39+
switch (platform) {
40+
case ApplePlatform.iOS:
41+
case ApplePlatform.TVOS:
42+
expectedWarnings = Array.Empty<ExpectedBuildMessage> ();
43+
break;
44+
case ApplePlatform.MacOSX:
45+
case ApplePlatform.MacCatalyst:
46+
expectedWarnings = Array.Empty<ExpectedBuildMessage> ();
47+
break;
48+
default:
49+
Assert.Fail ($"Unknown platform: {platform}");
50+
return;
51+
}
52+
53+
TrimmerWarnings (platform, runtimeIdentifiers, "static", expectedWarnings);
2254
}
2355

2456
[Test]
@@ -28,7 +60,23 @@ public void TrimmerWarningsStaticRegistrar (ApplePlatform platform, string runti
2860
[TestCase (ApplePlatform.TVOS, "tvos-arm64")]
2961
public void TrimmerWarningsDynamicRegistrar (ApplePlatform platform, string runtimeIdentifiers)
3062
{
31-
TrimmerWarnings (platform, runtimeIdentifiers, "dynamic", Array.Empty<ExpectedBuildMessage> ());
63+
// FIXME: dotnet/runtime#100256
64+
ExpectedBuildMessage [] expectedWarnings;
65+
switch (platform) {
66+
case ApplePlatform.iOS:
67+
case ApplePlatform.TVOS:
68+
expectedWarnings = Array.Empty<ExpectedBuildMessage> ();
69+
break;
70+
case ApplePlatform.MacOSX:
71+
case ApplePlatform.MacCatalyst:
72+
expectedWarnings = Array.Empty<ExpectedBuildMessage> ();
73+
break;
74+
default:
75+
Assert.Fail ($"Unknown platform: {platform}");
76+
return;
77+
}
78+
79+
TrimmerWarnings (platform, runtimeIdentifiers, "dynamic", expectedWarnings);
3280
}
3381

3482
void TrimmerWarnings (ApplePlatform platform, string runtimeIdentifiers, string registrar, params ExpectedBuildMessage [] expectedWarnings)

‎tests/monotouch-test/Compression/CompressionStreamTest.cs

+11-5
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public void CheckNullRead ()
101101
Assert.Ignore ("Requires iOS 9.0+ or macOS 10.11+");
102102
MemoryStream backing = new MemoryStream (compressed_data);
103103
DeflateStream decompressing = new DeflateStream (backing, CompressionMode.Decompress, CompressionAlgorithm.Zlib);
104-
Assert.Throws<ArgumentNullException> (() => decompressing.Read (null, 0, 20));
104+
Assert.Throws<ArgumentNullException> (() => IgnoreReturnValue (decompressing.Read (null, 0, 20)));
105105
}
106106

107107
[Test]
@@ -112,7 +112,7 @@ public void CheckCompressingRead ()
112112
byte [] dummy = new byte [20];
113113
MemoryStream backing = new MemoryStream ();
114114
DeflateStream compressing = new DeflateStream (backing, CompressionMode.Compress, CompressionAlgorithm.Zlib);
115-
Assert.Throws<InvalidOperationException> (() => compressing.Read (dummy, 0, 20));
115+
Assert.Throws<InvalidOperationException> (() => IgnoreReturnValue (compressing.Read (dummy, 0, 20)));
116116
}
117117

118118
[Test]
@@ -123,7 +123,7 @@ public void CheckRangeRead ()
123123
byte [] dummy = new byte [20];
124124
MemoryStream backing = new MemoryStream (compressed_data);
125125
DeflateStream decompressing = new DeflateStream (backing, CompressionMode.Decompress, CompressionAlgorithm.Zlib);
126-
Assert.Throws<ArgumentException> (() => decompressing.Read (dummy, 10, 20));
126+
Assert.Throws<ArgumentException> (() => IgnoreReturnValue (decompressing.Read (dummy, 10, 20)));
127127
}
128128

129129
[Test]
@@ -135,7 +135,7 @@ public void CheckClosedRead ()
135135
MemoryStream backing = new MemoryStream (compressed_data);
136136
DeflateStream decompressing = new DeflateStream (backing, CompressionMode.Decompress, CompressionAlgorithm.Zlib);
137137
decompressing.Close ();
138-
Assert.Throws<ObjectDisposedException> (() => decompressing.Read (dummy, 0, 20));
138+
Assert.Throws<ObjectDisposedException> (() => IgnoreReturnValue (decompressing.Read (dummy, 0, 20)));
139139
}
140140

141141
[Test]
@@ -335,7 +335,13 @@ public void Bug19313 ()
335335
byte [] buffer = new byte [512];
336336
using (var backing = new Bug19313Stream (compressed_data))
337337
using (var decompressing = new DeflateStream (backing, CompressionMode.Decompress, CompressionAlgorithm.Zlib))
338-
decompressing.Read (buffer, 0, buffer.Length);
338+
IgnoreReturnValue (decompressing.Read (buffer, 0, buffer.Length));
339+
}
340+
341+
// Call this with the return value from CompressionStream.Read to avoid:
342+
// error CA2022: Avoid inexact read with 'Compression.CompressionStream.Read(byte[], int, int)' (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca2022)
343+
void IgnoreReturnValue (int value)
344+
{
339345
}
340346
}
341347
}

‎tests/msbuild/Xamarin.MacDev.Tests/TargetTests/DetectSigningIdentityTests.cs

+18-2
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,26 @@ public void BundleIdentifierInPartialAppManifest ()
6666
var recordArgs = BinLog.ReadBuildEvents (rv.BinLogPath).ToList ();
6767
var taskIndex = recordArgs.FindIndex (v => v is TaskStartedEventArgs tsea && tsea.TaskName == "DetectSigningIdentity");
6868
Assert.That (taskIndex, Is.GreaterThan (0), "Task index");
69-
var taskParameterIndex = recordArgs.FindIndex (taskIndex + 1, v => v is BuildMessageEventArgs bmea && bmea.Message.StartsWith ("Task Parameter:BundleIdentifier="));
69+
var taskParameterIndex = recordArgs.FindIndex (taskIndex + 1, v => {
70+
if (!(v is BuildMessageEventArgs bmea))
71+
return false;
72+
if (bmea.Message.StartsWith ("Task Parameter:BundleIdentifier="))
73+
return true;
74+
if (bmea.Message.StartsWith ("TaskInput: BundleIdentifier"))
75+
return true;
76+
return false;
77+
});
7078
Assert.That (taskParameterIndex, Is.GreaterThan (0), "Parameter index");
7179
var taskParameter = (BuildMessageEventArgs) recordArgs [taskParameterIndex];
72-
var bundleIdentifier = taskParameter.Message.Substring ("Task Parameter:BundleIdentifier=".Length);
80+
var taskMessage = taskParameter.Message;
81+
string bundleIdentifier;
82+
if (taskMessage.StartsWith ("Task Parameter:BundleIdentifier=")) {
83+
bundleIdentifier = taskMessage.Substring ("Task Parameter:BundleIdentifier=".Length);
84+
} else if (taskMessage.StartsWith ("TaskInput: BundleIdentifier")) {
85+
bundleIdentifier = taskMessage.Substring ("TaskInput: BundleIdentifier".Length).Trim ();
86+
} else {
87+
bundleIdentifier = "Unhandled task message format.";
88+
}
7389
Assert.AreEqual ("com.xamarin.detectsigningidentitytest", bundleIdentifier, "Bundle identifier");
7490
}
7591
}

0 commit comments

Comments
 (0)