Skip to content

Commit 138701b

Browse files
dotnet-maestro[bot]jonathanpeppers
dotnet-maestro[bot]
and
jonathanpeppers
authored
Bump to dotnet/installer@0bfd2dd757 9.0.100-preview.4.24208.2 (#8862)
Changes: dotnet/installer@dc43d36...0bfd2dd Changes: dotnet/runtime@17f8138...ffb2578 Changes: dotnet/emsdk@5dd0620...bd79d3d Updates: * Microsoft.Dotnet.Sdk.Internal: from 9.0.100-preview.4.24175.5 to 9.0.100-preview.4.24208.2 * Microsoft.NETCore.App.Ref: from 9.0.0-preview.4.24173.6 to 9.0.0-preview.4.24204.3 * Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport: from 9.0.0-preview.3.24160.1 to 9.0.0-preview.4.24201.2 * Microsoft.NET.ILLink.Tasks: from 9.0.0-preview.4.24173.6 to 9.0.0-preview.4.24204.3 Other changes: * [tests] we can assert 0 trimmer warnings again This is fixed: dotnet/runtime#100256 Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
1 parent 1d4a661 commit 138701b

File tree

4 files changed

+14
-24
lines changed

4 files changed

+14
-24
lines changed

‎eng/Version.Details.xml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-preview.4.24175.5">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-preview.4.24208.2">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>dc43d363d284c26cb1b463683d6ebb2c88ab0b58</Sha>
5+
<Sha>0bfd2dd757482b30745b799ee0a92cad3d8f5b50</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.4.24173.6" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
7+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.4.24204.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
88
<Uri>https://github.com/dotnet/runtime</Uri>
9-
<Sha>17f8138a726b8af269bffc59e9baa12dcb7abca5</Sha>
9+
<Sha>ffb257818db89672d84d538964cec1b54fb2a094</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.4.24173.6" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.4.24204.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>17f8138a726b8af269bffc59e9baa12dcb7abca5</Sha>
13+
<Sha>ffb257818db89672d84d538964cec1b54fb2a094</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-preview.3.24160.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
15+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-preview.4.24201.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>5dd0620274178dd73cac5049e5187c00e07ecf0c</Sha>
17+
<Sha>bd79d3dd7ed2db36b3c3d4fa807c21a06d2024ec</Sha>
1818
</Dependency>
1919
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.24168.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
2020
<Uri>https://github.com/dotnet/cecil</Uri>

‎eng/Versions.props

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<MicrosoftDotnetSdkInternalPackageVersion>9.0.100-preview.4.24175.5</MicrosoftDotnetSdkInternalPackageVersion>
5-
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.4.24173.6</MicrosoftNETILLinkTasksPackageVersion>
6-
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.4.24173.6</MicrosoftNETCoreAppRefPackageVersion>
4+
<MicrosoftDotnetSdkInternalPackageVersion>9.0.100-preview.4.24208.2</MicrosoftDotnetSdkInternalPackageVersion>
5+
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.4.24204.3</MicrosoftNETILLinkTasksPackageVersion>
6+
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.4.24204.3</MicrosoftNETCoreAppRefPackageVersion>
77
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
88
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
9-
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-preview.3.24160.1</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
9+
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-preview.4.24201.2</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
1010
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
1111
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
1212
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.24168.1</MicrosoftDotNetCecilPackageVersion>

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs

+1-6
Original file line numberDiff line numberDiff line change
@@ -260,12 +260,7 @@ public void BuildHasNoWarnings (bool isRelease, bool xamarinForms, bool multidex
260260
proj.SetProperty ("TrimmerSingleWarn", "false");
261261
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
262262
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
263-
// FIXME: https://github.com/dotnet/runtime/issues/100256
264-
if (!xamarinForms && isRelease) {
265-
Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, " 4 Warning(s)"), $"{b.BuildLogFile} should have 4 MSBuild warnings.");
266-
} else {
267-
b.AssertHasNoWarnings ();
268-
}
263+
b.AssertHasNoWarnings ();
269264
Assert.IsFalse (StringAssertEx.ContainsText (b.LastBuildOutput, "Warning: end of file not at end of a line"),
270265
"Should not get a warning from the <CompileNativeAssembly/> task.");
271266
var lockFile = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath, ".__lock");

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs

+1-6
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,7 @@ public void DotNetNew ([Values ("android", "androidlib", "android-bindinglib", "
4242

4343
// Release build
4444
Assert.IsTrue (dotnet.Build (parameters: new [] { "Configuration=Release", "TrimmerSingleWarn=false" }), "`dotnet build` should succeed");
45-
// FIXME: https://github.com/dotnet/runtime/issues/100256
46-
if (template.Contains ("lib")) {
47-
dotnet.AssertHasNoWarnings ();
48-
} else {
49-
Assert.IsTrue (StringAssertEx.ContainsText (dotnet.LastBuildOutput, " 4 Warning(s)"), $"{dotnet.BuildLogFile} should have 4 MSBuild warnings.");
50-
}
45+
dotnet.AssertHasNoWarnings ();
5146
}
5247

5348
static readonly object[] DotNetPackTargetFrameworks = new object[] {

0 commit comments

Comments
 (0)