Skip to content

Commit 7bf4edd

Browse files
dotnet-maestro[bot]jonathanpeppers
dotnet-maestro[bot]
and
jonathanpeppers
authored
Bump to dotnet/installer@ca467d68c8 8.0.100-preview.7.23364.32 (#8176)
Changes: dotnet/installer@28d4a6b...ca467d6 Changes: dotnet/runtime@3e87528...ae99bb2 Changes: dotnet/emsdk@60a73f9...afbff08 Changes: dotnet/cecil@3e46711...1a6a83a Updates: * Microsoft.Dotnet.Sdk.Internal: from 8.0.100-preview.7.23330.16 to 8.0.100-preview.7.23364.32 * Microsoft.NETCore.App.Ref: from 8.0.0-preview.7.23329.8 to 8.0.0-preview.7.23364.3 * Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport: from 8.0.0-preview.7.23326.1 to 8.0.0-preview.7.23361.2 * Microsoft.NET.ILLink.Tasks: from 8.0.0-preview.7.23329.8 to 8.0.0-preview.7.23364.3 * Microsoft.DotNet.Cecil: from 0.11.4-alpha.23327.1 to 0.11.4-alpha.23360.2 ~~ Other changes ~~ * Update `.apkdesc` files for app size changes * Ignore several tests around an LLVM build issue on Windows: dotnet/runtime#88625 * Workarounds for behavior changes around `$DOTNET_ROOT`: This appears to be the way to get `<Csc/>` to pick the right `dotnet`: https://github.com/dotnet/roslyn/pull/68918/files#diff-ec99cd9453fe657dd1ea08e93e94b0bb51c51484b8ad25882d312564e5fe8e26R61 * [tests] disable failing Java.Interop tests under LLVM dotnet/runtime#89190 * Bump to xamarin/java.interop/main@62efc0980 Changes: dotnet/java-interop@151b03e...62efc09 Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
1 parent 83bdddb commit 7bf4edd

File tree

12 files changed

+108
-86
lines changed

12 files changed

+108
-86
lines changed

‎build-tools/automation/yaml-templates/run-dotnet-preview.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ parameters:
1313
steps:
1414
- powershell: |
1515
if ([Environment]::OSVersion.Platform -eq "Unix") {
16-
$dotnetPath = "${{ parameters.xaSourcePath }}/bin/${{ parameters.configuration }}/dotnet/dotnet"
16+
$env:DOTNET_ROOT = "${{ parameters.xaSourcePath }}/bin/${{ parameters.configuration }}/dotnet"
17+
$dotnetPath = "$env:DOTNET_ROOT/dotnet"
1718
} else {
18-
$dotnetPath = "${{ parameters.xaSourcePath }}\bin\${{ parameters.configuration }}\dotnet\dotnet.exe"
19+
$env:DOTNET_ROOT = "${{ parameters.xaSourcePath }}\bin\${{ parameters.configuration }}\dotnet"
20+
$dotnetPath = "$env:DOTNET_ROOT\dotnet.exe"
1921
}
2022
& $dotnetPath ${{ parameters.command }} ${{ parameters.project }} ${{ parameters.arguments }}
2123
if ([System.Convert]::ToBoolean("${{ parameters.useExitCodeForErrors }}") -and $LASTEXITCODE -ne 0) {

‎build-tools/scripts/msbuild.mk‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
# $(MSBUILD_FLAGS): Additional MSBuild flags; contains $(CONFIGURATION), $(V), $(MSBUILD_ARGS).
2424

2525
MSBUILD = msbuild
26-
DOTNET_TOOL = $(topdir)/bin/$(CONFIGURATION)/dotnet/dotnet
26+
DOTNET_ROOT = $(topdir)/bin/$(CONFIGURATION)/dotnet/
27+
DOTNET_TOOL = $(DOTNET_ROOT)dotnet
2728
DOTNET_VERB = build
2829
MSBUILD_FLAGS = /p:Configuration=$(CONFIGURATION) $(MSBUILD_ARGS)
2930

@@ -51,7 +52,7 @@ endef
5152

5253
# $(call DOTNET_BINLOG,name,build=$(DOTNET_VERB),dotnet=$(DOTNET_TOOL))
5354
define DOTNET_BINLOG
54-
$(if $(3),$(3),$(DOTNET_TOOL)) $(if $(2),$(2),$(DOTNET_VERB)) -c $(CONFIGURATION) -v:n $(MSBUILD_ARGS) \
55+
$(if $(3),,DOTNET_ROOT='$(DOTNET_ROOT)') $(if $(3),$(3),$(DOTNET_TOOL)) $(if $(2),$(2),$(DOTNET_VERB)) -c $(CONFIGURATION) -v:n $(MSBUILD_ARGS) \
5556
-bl:"$(dir $(realpath $(firstword $(MAKEFILE_LIST))))/bin/Build$(CONFIGURATION)/msbuild-`date +%Y%m%dT%H%M%S`-$(1).binlog"
5657
endef
5758

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.7.23330.16">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.7.23364.32">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>28d4a6b4bed1515bdbe491c9e0c8ef7aa3a24497</Sha>
5+
<Sha>ca467d68c8f678a671984a46996d3fc37fe7f3de</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.7.23329.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
7+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.7.23364.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
88
<Uri>https://github.com/dotnet/runtime</Uri>
9-
<Sha>3e87528325b09f884b0a09a8c4ef79393abfd0db</Sha>
9+
<Sha>ae99bb2e7a0a5db7c2bff129322965fd3c6e820d</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.7.23329.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.7.23364.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>3e87528325b09f884b0a09a8c4ef79393abfd0db</Sha>
13+
<Sha>ae99bb2e7a0a5db7c2bff129322965fd3c6e820d</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-preview.7.23326.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
15+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-preview.7.23361.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>60a73f97a0ec16c25ce4d36b1bcff1fedb831716</Sha>
17+
<Sha>afbff08914374ed6790324635b9346d1256680fc</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23327.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
19+
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23360.2" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
2020
<Uri>https://github.com/dotnet/cecil</Uri>
21-
<Sha>3e46711f5a933551557286d211970faa08b07b7e</Sha>
21+
<Sha>1a6a83a8f50e1119f1007b1e3c211d3289ba6901</Sha>
2222
</Dependency>
2323
</ProductDependencies>
2424
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-preview.7.23330.16</MicrosoftDotnetSdkInternalPackageVersion>
5-
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.7.23329.8</MicrosoftNETILLinkTasksPackageVersion>
6-
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.7.23329.8</MicrosoftNETCoreAppRefPackageVersion>
4+
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-preview.7.23364.32</MicrosoftDotnetSdkInternalPackageVersion>
5+
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.7.23364.3</MicrosoftNETILLinkTasksPackageVersion>
6+
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.7.23364.3</MicrosoftNETCoreAppRefPackageVersion>
77
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
88
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
9-
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.7.23326.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
9+
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.7.23361.2</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
1010
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
1111
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
12-
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23327.1</MicrosoftDotNetCecilPackageVersion>
12+
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23360.2</MicrosoftDotNetCecilPackageVersion>
1313
<SystemIOHashingPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemIOHashingPackageVersion>
1414
</PropertyGroup>
1515
<PropertyGroup>

‎external/Java.Interop‎

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,9 @@ public void BuildBasicApplicationReleaseProfiledAotWithoutDefaultProfile ()
137137
[TestCaseSource (nameof (AotChecks))]
138138
public void BuildAotApplicationWithNdkAndBundleAndÜmläüts (string supportedAbis, bool enableLLVM, bool usesAssemblyBlobs)
139139
{
140+
if (IsWindows)
141+
Assert.Ignore ("https://github.com/dotnet/runtime/issues/88625");
142+
140143
var abisSanitized = supportedAbis.Replace (";", "").Replace ("-", "").Replace ("_", "");
141144
var path = Path.Combine ("temp", string.Format ("BuildAotNdk AndÜmläüts_{0}_{1}_{2}", abisSanitized, enableLLVM, usesAssemblyBlobs));
142145
var proj = new XamarinAndroidApplicationProject () {
@@ -213,6 +216,9 @@ public void BuildAotApplicationWithNdkAndBundleAndÜmläüts (string supportedAb
213216
[TestCaseSource (nameof (AotChecks))]
214217
public void BuildAotApplicationAndÜmläüts (string supportedAbis, bool enableLLVM, bool usesAssemblyBlobs)
215218
{
219+
if (IsWindows)
220+
Assert.Ignore ("https://github.com/dotnet/runtime/issues/88625");
221+
216222
var abisSanitized = supportedAbis.Replace (";", "").Replace ("-", "").Replace ("_", "");
217223
var path = Path.Combine ("temp", string.Format ("BuildAot AndÜmläüts_{0}_{1}_{2}", abisSanitized, enableLLVM, usesAssemblyBlobs));
218224
var proj = new XamarinAndroidApplicationProject () {
@@ -411,6 +417,9 @@ public static void Foo () {
411417
[Category ("LLVM")]
412418
public void NoSymbolsArgShouldReduceAppSize ([Values ("", "Hybrid")] string androidAotMode, [Values (false, true)] bool skipDebugSymbols)
413419
{
420+
if (IsWindows)
421+
Assert.Ignore ("https://github.com/dotnet/runtime/issues/88625");
422+
414423
AssertAotModeSupported (androidAotMode);
415424

416425
var proj = new XamarinAndroidApplicationProject () {

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@ public void CheckMonoComponentsMask (bool enableProfiler, bool useInterpreter, b
8585
[Test]
8686
public void CheckWhetherLibcAndLibmAreReferencedInAOTLibraries ()
8787
{
88+
if (IsWindows)
89+
Assert.Ignore ("https://github.com/dotnet/runtime/issues/88625");
90+
8891
var proj = new XamarinAndroidApplicationProject {
8992
IsRelease = true,
9093
EmbedAssembliesIntoApk = true,

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/Builder.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ protected bool BuildInternal (string projectOrSolution, string target, string []
279279
}
280280
if (Builder.UseDotNet) {
281281
psi.SetEnvironmentVariable ("DOTNET_MULTILEVEL_LOOKUP", "0");
282+
psi.SetEnvironmentVariable ("DOTNET_ROOT", TestEnvironment.DotNetPreviewDirectory);
282283
}
283284

284285
psi.Arguments = args.ToString ();

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetCLI.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ protected bool Execute (params string [] args)
4747
p.StartInfo.RedirectStandardOutput = true;
4848
p.StartInfo.RedirectStandardError = true;
4949
p.StartInfo.SetEnvironmentVariable ("DOTNET_MULTILEVEL_LOOKUP", "0");
50+
p.StartInfo.SetEnvironmentVariable ("DOTNET_ROOT", TestEnvironment.DotNetPreviewDirectory);
5051
if (TestEnvironment.UseLocalBuildOutput) {
5152
p.StartInfo.SetEnvironmentVariable ("DOTNETSDK_WORKLOAD_MANIFEST_ROOTS", TestEnvironment.WorkloadManifestOverridePath);
5253
p.StartInfo.SetEnvironmentVariable ("DOTNETSDK_WORKLOAD_PACK_ROOTS", TestEnvironment.WorkloadPackOverridePath);

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,58 +8,58 @@
88
"Size": 1024
99
},
1010
"assemblies/Java.Interop.dll": {
11-
"Size": 58990
11+
"Size": 58895
1212
},
1313
"assemblies/Mono.Android.dll": {
14-
"Size": 88074
14+
"Size": 88112
1515
},
1616
"assemblies/Mono.Android.Runtime.dll": {
17-
"Size": 5819
17+
"Size": 5575
1818
},
1919
"assemblies/rc.bin": {
20-
"Size": 1235
20+
"Size": 1302
2121
},
2222
"assemblies/System.Console.dll": {
23-
"Size": 6448
23+
"Size": 6418
2424
},
2525
"assemblies/System.Linq.dll": {
26-
"Size": 9135
26+
"Size": 9212
2727
},
2828
"assemblies/System.Private.CoreLib.dll": {
29-
"Size": 537441
29+
"Size": 548643
3030
},
3131
"assemblies/System.Runtime.dll": {
32-
"Size": 2629
32+
"Size": 2633
3333
},
3434
"assemblies/System.Runtime.InteropServices.dll": {
35-
"Size": 3768
35+
"Size": 3733
3636
},
3737
"assemblies/UnnamedProject.dll": {
38-
"Size": 3222
38+
"Size": 2931
3939
},
4040
"classes.dex": {
4141
"Size": 377064
4242
},
4343
"lib/arm64-v8a/libmono-component-marshal-ilgen.so": {
44-
"Size": 97392
44+
"Size": 97096
4545
},
4646
"lib/arm64-v8a/libmonodroid.so": {
47-
"Size": 380704
47+
"Size": 381088
4848
},
4949
"lib/arm64-v8a/libmonosgen-2.0.so": {
50-
"Size": 3177168
50+
"Size": 3184096
5151
},
5252
"lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
5353
"Size": 723560
5454
},
5555
"lib/arm64-v8a/libSystem.Native.so": {
56-
"Size": 94424
56+
"Size": 93856
5757
},
5858
"lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
5959
"Size": 154904
6060
},
6161
"lib/arm64-v8a/libxamarin-app.so": {
62-
"Size": 11080
62+
"Size": 11608
6363
},
6464
"META-INF/BNDLTOOL.RSA": {
6565
"Size": 1213
@@ -95,5 +95,5 @@
9595
"Size": 1904
9696
}
9797
},
98-
"PackageSize": 2771274
98+
"PackageSize": 2787658
9999
}

0 commit comments

Comments
 (0)