Skip to content

[main] Update dependencies from dotnet/installer #8716

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Feb 23, 2024
Merged

[main] Update dependencies from dotnet/installer #8716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
47237bb
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Feb 12, 2024
6385b50
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Feb 15, 2024
a0408c0
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Feb 16, 2024
a11aad6
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Feb 19, 2024
5fab710
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Feb 22, 2024
3bf6c54
`darc update-dependencies --id 213925`
jonathanpeppers Feb 22, 2024
9538ed1
BuildAotApplicationWithSpecialCharactersInProject test cases work now?
jonathanpeppers Feb 22, 2024
1553fa2
Update AotTests.cs
jonathanpeppers Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-preview.2.24106.6">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-preview.2.24122.3">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>fb7b9a4b9e578fa8c9f5fb67e22daf4b0d22668e</Sha>
<Sha>0a73f814e19c9a239371cb732c9d1257e10fb8a2</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.2.24080.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.2.24122.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d40c654c274fe4f4afe66328f0599130f3eb2ea6</Sha>
<Sha>dcc66a7ca25696a2326f296c3d8d3ac5a13f0524</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.2.24080.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.2.24122.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d40c654c274fe4f4afe66328f0599130f3eb2ea6</Sha>
<Sha>dcc66a7ca25696a2326f296c3d8d3ac5a13f0524</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-preview.2.24076.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-preview.2.24120.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>687be2a32a302aaade82380c0eaafa5af85fb4da</Sha>
<Sha>258b51a8e5f5bea07766ab99d2aaa75582d1ceb9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.24065.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.24119.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
<Uri>https://github.com/dotnet/cecil</Uri>
<Sha>b8c2293cd1cbd9d0fe6f32d7b5befbd526b5a175</Sha>
<Sha>61250b0ed403b3f9b69a33f7d8f66f311338d6a1</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
10 changes: 5 additions & 5 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>9.0.100-preview.2.24106.6</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.2.24080.1</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.2.24080.1</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>9.0.100-preview.2.24122.3</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.2.24122.2</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.2.24122.2</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-preview.2.24076.1</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-preview.2.24120.1</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.24065.1</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.24119.1</MicrosoftDotNetCecilPackageVersion>
<SystemIOHashingPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemIOHashingPackageVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down
30 changes: 11 additions & 19 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AotTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,19 +111,17 @@ public void BuildBasicApplicationReleaseProfiledAotWithoutDefaultProfile ()
}

[Test]
[TestCase ("テスト", false, false, true)]
[TestCase ("テスト", true, true, false)]
[TestCase ("テスト", true, false, true)]
[TestCase ("随机生成器", false, false, true)]
[TestCase ("随机生成器", true, true, false)]
[TestCase ("随机生成器", true, false, true)]
[TestCase ("中国", false, false, true)]
[TestCase ("中国", true, true, false)]
[TestCase ("中国", true, false, true)]
public void BuildAotApplicationWithSpecialCharactersInProject (string testName, bool isRelease, bool aot, bool expectedResult)
[TestCase ("テスト", false, false)]
[TestCase ("テスト", true, true)]
[TestCase ("テスト", true, false)]
[TestCase ("随机生成器", false, false)]
[TestCase ("随机生成器", true, true)]
[TestCase ("随机生成器", true, false)]
[TestCase ("中国", false, false)]
[TestCase ("中国", true, true)]
[TestCase ("中国", true, false)]
public void BuildAotApplicationWithSpecialCharactersInProject (string testName, bool isRelease, bool aot)
{
if (!IsWindows)
expectedResult = true;
var rootPath = Path.Combine (Root, "temp", TestName);
var proj = new XamarinAndroidApplicationProject () {
ProjectName = testName,
Expand All @@ -132,13 +130,7 @@ public void BuildAotApplicationWithSpecialCharactersInProject (string testName,
};
proj.SetAndroidSupportedAbis ("armeabi-v7a", "arm64-v8a", "x86", "x86_64");
using (var builder = CreateApkBuilder (Path.Combine (rootPath, proj.ProjectName))){
builder.ThrowOnBuildFailure = false;
Assert.AreEqual (expectedResult, builder.Build (proj), "Build should have succeeded.");
if (!expectedResult) {
var aotFailed = builder.LastBuildOutput.ContainsText ("Precompiling failed");
var aapt2Failed = builder.LastBuildOutput.ContainsText ("APT2265");
Assert.IsTrue (aotFailed || aapt2Failed, "Error APT2265 or an AOT error should have been raised.");
}
Assert.IsTrue (builder.Build (proj), "Build should have succeeded.");
}
}

Expand Down