Skip to content

Commit 27647d2

Browse files
dotnet-maestro[bot]jonathanpeppers
dotnet-maestro[bot]
and
jonathanpeppers
authored
Bump to dotnet/installer@9239e0d 7.0.100-preview.7.22354.2 (#7146)
Changes: dotnet/installer@cf6da7b...9239e0d Changes: dotnet/linker@5460697...e4d8575 Changes: dotnet/runtime@ddc4f95...0402550 Changes: dotnet/emsdk@3fbbd97...d304ef6 Updates: * Microsoft.Dotnet.Sdk.Internal: from 7.0.100-preview.7.22327.1 to 7.0.100-preview.7.22354.2 * Microsoft.NET.ILLink.Tasks: from 7.0.100-1.22323.2 to 7.0.100-1.22351.1 * Microsoft.NETCore.App.Ref: from 7.0.0-preview.6.22322.7 to 7.0.0-preview.6.22329.5 * Microsoft.NET.Workload.Emscripten.Manifest-7.0.100: from 7.0.0-preview.6.22320.1 to 7.0.0-preview.7.22321.2 * [tests] path changed to `linker-dependencies.xml` in .NET 7 Context: dotnet/linker@a527341 This solves the test failure: Expected: file exists But was: "/Users/runner/work/1/a/TestRelease/07-04_13.37.14/temp/BuildReleaseArm64True/obj/Release/android-arm64/linked/linker-dependencies.xml.gz" Co-authored-by: Jonathan Peppers <[email protected]>
1 parent e4fd84a commit 27647d2

File tree

3 files changed

+14
-15
lines changed

3 files changed

+14
-15
lines changed

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-preview.7.22327.1">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-preview.7.22354.2">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>cf6da7b13ae36b6ab042582b165c56d99424141b</Sha>
5+
<Sha>9239e0df2d4575a89657a1cd0414881b5bb858c5</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22323.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
7+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22351.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
88
<Uri>https://github.com/dotnet/linker</Uri>
9-
<Sha>5460697bd57aff56666dd70cd64b5b6b00f417eb</Sha>
9+
<Sha>e4d85757ab8a6841efef85b8ab678dfb412faec6</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.6.22322.7" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.6.22329.5" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>ddc4f95432facf2deebfa85bad7143469dca0129</Sha>
13+
<Sha>0402550585f54e88707af55652111ace793ef27f</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-preview.6.22320.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
15+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-preview.7.22321.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>3fbbd97b47b5a71d7cf3ca2e197b0b93feaf975d</Sha>
17+
<Sha>d304ef66207ec5301acf2b6d7f7c47467628e906</Sha>
1818
</Dependency>
1919
</ProductDependencies>
2020
<ToolsetDependencies>

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-preview.7.22327.1</MicrosoftDotnetSdkInternalPackageVersion>
5-
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22323.2</MicrosoftNETILLinkTasksPackageVersion>
6-
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.6.22322.7</MicrosoftNETCoreAppRefPackageVersion>
4+
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-preview.7.22354.2</MicrosoftDotnetSdkInternalPackageVersion>
5+
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22351.1</MicrosoftNETILLinkTasksPackageVersion>
6+
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.6.22329.5</MicrosoftNETCoreAppRefPackageVersion>
77
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
88
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
9-
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-preview.6.22320.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>
9+
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-preview.7.22321.2</MicrosoftNETWorkloadEmscriptenManifest70100Version>
1010
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenManifest70100Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
1111
</PropertyGroup>
1212
<PropertyGroup>

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,9 @@ public void BuildReleaseArm64 ([Values (false, true)] bool forms)
9797
using (var b = BuildHelper.CreateApkBuilder (Path.Combine ("temp", TestName))) {
9898
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
9999

100-
var depsFilename = "linker-dependencies.xml.gz";
101100
var depsFile = Builder.UseDotNet
102-
? GetLinkedPath (b, true, depsFilename)
103-
: Path.Combine (proj.Root, b.ProjectDirectory, depsFilename);
101+
? GetLinkedPath (b, true, "linker-dependencies.xml")
102+
: Path.Combine (proj.Root, b.ProjectDirectory, "linker-dependencies.xml.gz");
104103
FileAssert.Exists (depsFile);
105104

106105
const int ApkSizeThreshold = 5 * 1024;

0 commit comments

Comments
 (0)