Skip to content

Commit 12af080

Browse files
grendellogrendello
committed
Fix after rebase
1 parent 188de63 commit 12af080

File tree

8 files changed

+63
-6
lines changed

8 files changed

+63
-6
lines changed

‎Directory.Build.props

+28-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,34 @@
5252
<MonoOptionsVersion>6.12.0.148</MonoOptionsVersion>
5353
<SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
5454
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
55-
<ELFSharpVersion>2.16.1</ELFSharpVersion>
56-
<MdocPackageVersion Condition=" '$(MdocPackageVersion)' == '' ">5.8.9.2</MdocPackageVersion>
55+
<ELFSharpVersion>2.17.3</ELFSharpVersion>
56+
<HumanizerVersion>2.14.1</HumanizerVersion>
57+
<MdocPackageVersion Condition=" '$(MdocPackageVersion)' == '' ">5.9.3</MdocPackageVersion>
58+
</PropertyGroup>
59+
60+
<PropertyGroup>
61+
<!--
62+
Use $(TreatWarningsAsErrors) for CI builds. We have grandfathered some projects that have existing warnings,
63+
but we would like to go ahead and prevent any other projects from getting new warnings.
64+
65+
This can be opted into locally with $(_AndroidTreatWarningsAsErrors) = true.
66+
-->
67+
<_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'assembly-store-reader.csproj' ">true</_AllowProjectWarnings>
68+
<_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'decompress-assemblies.csproj' ">true</_AllowProjectWarnings>
69+
<_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'jnienv-gen.csproj' ">true</_AllowProjectWarnings>
70+
<_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'Microsoft.Android.Sdk.ILLink.csproj' ">true</_AllowProjectWarnings>
71+
<_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'Microsoft.Android.Templates.csproj' ">true</_AllowProjectWarnings>
72+
<_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'Mono.Android.csproj' ">true</_AllowProjectWarnings>
73+
<_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'Mono.Android.NET-Tests.csproj' ">true</_AllowProjectWarnings>
74+
<_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'MSBuildDeviceIntegration.csproj' ">true</_AllowProjectWarnings>
75+
<_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'NativeAOT.csproj' ">true</_AllowProjectWarnings>
76+
<_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'TestRunner.Core.NET.csproj' ">true</_AllowProjectWarnings>
77+
<_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'Xamarin.Android.Build.Tasks.csproj' ">true</_AllowProjectWarnings>
78+
<_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'Xamarin.Android.Build.Tests.csproj' ">true</_AllowProjectWarnings>
79+
<_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'Xamarin.Android.JcwGen-Tests.csproj' ">true</_AllowProjectWarnings>
80+
<_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'Xamarin.Android.NUnitLite.NET.csproj' ">true</_AllowProjectWarnings>
81+
<_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'Xamarin.ProjectTools.csproj' ">true</_AllowProjectWarnings>
82+
<TreatWarningsAsErrors Condition=" ('$(RunningOnCI)' == 'true' OR '$(_AndroidTreatWarningsAsErrors)' == 'true') AND '$(_AllowProjectWarnings)' != 'true' ">true</TreatWarningsAsErrors>
5783
</PropertyGroup>
5884

5985
</Project>

‎Xamarin.Android.sln

+29
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,15 @@ EndProject
116116
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "xapp", "xapp", "{2F5EB899-105F-4CDF-B18F-5F7B902C15E4}"
117117
EndProject
118118
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xapp", "tools\xapp\xapp.csproj", "{2D91DE25-43BA-4333-9B04-FE4347269847}"
119+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Android.Tools.Aidl-Tests", "tests\Xamarin.Android.Tools.Aidl-Tests\Xamarin.Android.Tools.Aidl-Tests.csproj", "{A39B6D7C-6616-40D6-8AE4-C6CEE93D2708}"
120+
EndProject
121+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FFCF518F-2A4A-40A2-9174-2EE13B76C723}"
122+
EndProject
123+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Android.Sdk.Analysis", "src\Microsoft.Android.Sdk.Analysis\Microsoft.Android.Sdk.Analysis.csproj", "{5E806C9F-1B67-4B6B-A6AB-258834250DBB}"
124+
EndProject
125+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "proguard-android", "src\proguard-android\proguard-android.csproj", "{5FD0133B-69E5-4474-9B67-9FD1D0150C70}"
126+
EndProject
127+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Android.Runtime.NativeAOT", "src\Microsoft.Android.Runtime.NativeAOT\Microsoft.Android.Runtime.NativeAOT.csproj", "{E8831F32-11D7-D42C-E43C-711998BC357A}"
119128
EndProject
120129
Global
121130
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -323,6 +332,22 @@ Global
323332
{2D91DE25-43BA-4333-9B04-FE4347269847}.Debug|AnyCPU.Build.0 = Debug|Any CPU
324333
{2D91DE25-43BA-4333-9B04-FE4347269847}.Release|AnyCPU.ActiveCfg = Release|Any CPU
325334
{2D91DE25-43BA-4333-9B04-FE4347269847}.Release|AnyCPU.Build.0 = Release|Any CPU
335+
{A39B6D7C-6616-40D6-8AE4-C6CEE93D2708}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
336+
{A39B6D7C-6616-40D6-8AE4-C6CEE93D2708}.Debug|AnyCPU.Build.0 = Debug|Any CPU
337+
{A39B6D7C-6616-40D6-8AE4-C6CEE93D2708}.Release|AnyCPU.ActiveCfg = Release|Any CPU
338+
{A39B6D7C-6616-40D6-8AE4-C6CEE93D2708}.Release|AnyCPU.Build.0 = Release|Any CPU
339+
{5E806C9F-1B67-4B6B-A6AB-258834250DBB}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
340+
{5E806C9F-1B67-4B6B-A6AB-258834250DBB}.Debug|AnyCPU.Build.0 = Debug|Any CPU
341+
{5E806C9F-1B67-4B6B-A6AB-258834250DBB}.Release|AnyCPU.ActiveCfg = Release|Any CPU
342+
{5E806C9F-1B67-4B6B-A6AB-258834250DBB}.Release|AnyCPU.Build.0 = Release|Any CPU
343+
{5FD0133B-69E5-4474-9B67-9FD1D0150C70}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
344+
{5FD0133B-69E5-4474-9B67-9FD1D0150C70}.Debug|AnyCPU.Build.0 = Debug|Any CPU
345+
{5FD0133B-69E5-4474-9B67-9FD1D0150C70}.Release|AnyCPU.ActiveCfg = Release|Any CPU
346+
{5FD0133B-69E5-4474-9B67-9FD1D0150C70}.Release|AnyCPU.Build.0 = Release|Any CPU
347+
{E8831F32-11D7-D42C-E43C-711998BC357A}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
348+
{E8831F32-11D7-D42C-E43C-711998BC357A}.Debug|AnyCPU.Build.0 = Debug|Any CPU
349+
{E8831F32-11D7-D42C-E43C-711998BC357A}.Release|AnyCPU.ActiveCfg = Release|Any CPU
350+
{E8831F32-11D7-D42C-E43C-711998BC357A}.Release|AnyCPU.Build.0 = Release|Any CPU
326351
EndGlobalSection
327352
GlobalSection(SolutionProperties) = preSolution
328353
HideSolutionNode = FALSE
@@ -379,6 +404,10 @@ Global
379404
{BA4D889D-066B-4C2C-A973-09E319CBC396} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}
380405
{2F5EB899-105F-4CDF-B18F-5F7B902C15E4} = {864062D3-A415-4A6F-9324-5820237BA058}
381406
{2D91DE25-43BA-4333-9B04-FE4347269847} = {2F5EB899-105F-4CDF-B18F-5F7B902C15E4}
407+
{A39B6D7C-6616-40D6-8AE4-C6CEE93D2708} = {CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483}
408+
{5E806C9F-1B67-4B6B-A6AB-258834250DBB} = {FFCF518F-2A4A-40A2-9174-2EE13B76C723}
409+
{5FD0133B-69E5-4474-9B67-9FD1D0150C70} = {FFCF518F-2A4A-40A2-9174-2EE13B76C723}
410+
{E8831F32-11D7-D42C-E43C-711998BC357A} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
382411
EndGlobalSection
383412
GlobalSection(ExtensibilityGlobals) = postSolution
384413
SolutionGuid = {53A1F287-EFB2-4D97-A4BB-4A5E145613F6}

‎src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGenerator.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ sealed class XamarinAndroidBundledAssembly
155155
#pragma warning restore CS0649
156156

157157
// Keep in sync with FORMAT_TAG in src/monodroid/jni/xamarin-app.hh
158-
const ulong FORMAT_TAG = 0x00026E69726D6158;
158+
const ulong FORMAT_TAG = 0x00025E6972616D58; // 'Xmari^XY' where XY is the format version
159159

160160
SortedDictionary <string, string>? environmentVariables;
161161
SortedDictionary <string, string>? systemProperties;

‎src/native/mono/xamarin-app-stub/xamarin-app.hh

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
// Each change to any exported structures must increase the format version number
1515
// Keep in sync with src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGenerator.cs
16-
static constexpr uint64_t FORMAT_TAG = 0x00026E69726D6158; // The leftmost two bytes denote format version
16+
static constexpr uint64_t FORMAT_TAG = 0x00026E69726D6158; // 'Xmari^XY' where XY is the format version
1717
static constexpr uint32_t COMPRESSED_DATA_MAGIC = 0x5A4C4158; // 'XALZ', little-endian
1818
static constexpr uint32_t ASSEMBLY_STORE_MAGIC = 0x41424158; // 'XABA', little-endian
1919

‎tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
<PackageReference Include="MSBuild.StructuredLogger" Version="2.2.169" />
4848
<PackageReference Include="ICSharpCode.Decompiler" Version="7.2.1.6856" />
4949
<PackageReference Include="Mono.Cecil" Version="$(MonoCecilVersion)" />
50+
<PackageReference Include="Humanizer" Version="$(HumanizerVersion)" />
5051
</ItemGroup>
5152

5253
<ItemGroup>

‎tools/xapp/Xamarin.Android.Application.Typemaps/XamarinAppReleaseDSO.cs

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.IO;
4+
using System.Text;
35

46
using Xamarin.Android.Application.Utilities;
57

‎tools/xapp/Xamarin.Android.Application.Utilities/ELF32.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
2-
using System.Collections.Generic;
32
using System.IO;
43

4+
using ELFSharp;
55
using ELFSharp.ELF;
66
using ELFSharp.ELF.Sections;
77

‎tools/xapp/Xamarin.Android.Application.Utilities/ELF64.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System;
2-
using System.Collections.Generic;
32
using System.IO;
43

54
using ELFSharp.ELF;

0 commit comments

Comments
 (0)