Skip to content

Commit 2f797ef

Browse files
authored
[tools] fix warnings in assembly-store-reader-mk2 & decompress-assemblies (#10051)
Fix all NRT warnings in `assembly-store-reader-mk2` and `decompress-assemblies` tools and removes them from the "allow warnings" allow-list in the `Directory.Build.props` file.
1 parent 8135d65 commit 2f797ef

File tree

5 files changed

+9
-11
lines changed

5 files changed

+9
-11
lines changed

Directory.Build.props

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@
6464
6565
This can be opted into locally with $(_AndroidTreatWarningsAsErrors) = true.
6666
-->
67-
<_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'assembly-store-reader.csproj' ">true</_AllowProjectWarnings>
68-
<_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'decompress-assemblies.csproj' ">true</_AllowProjectWarnings>
6967
<_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'jnienv-gen.csproj' ">true</_AllowProjectWarnings>
7068
<_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'Microsoft.Android.Sdk.ILLink.csproj' ">true</_AllowProjectWarnings>
7169
<_AllowProjectWarnings Condition=" '$(MSBuildProjectFile)' == 'Microsoft.Android.Templates.csproj' ">true</_AllowProjectWarnings>

src/Xamarin.Android.Build.Tasks/Tasks/CollectNativeFilesForArchive.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ void AddNativeLibraries (ArchiveFileList files, string [] supportedAbis)
219219
}
220220

221221
foreach (string abi in supportedAbis) {
222-
string clangAbi = MonoAndroidHelper.MapAndroidAbiToClang (abi);
222+
string? clangAbi = MonoAndroidHelper.MapAndroidAbiToClang (abi);
223223
if (string.IsNullOrEmpty (clangAbi)) {
224224
LogSanitizerError ($"Unable to map Android ABI {abi} to clang ABI");
225225
return;

src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.Basic.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public static AndroidTargetArch AbiToTargetArch (string abi)
9595

9696
public static string AbiToRid (string abi)
9797
{
98-
if (!AbiToRidMap.TryGetValue (abi, out string rid)) {
98+
if (!AbiToRidMap.TryGetValue (abi, out string? rid)) {
9999
throw new NotSupportedException ($"Internal error: unsupported ABI '{abi}'");
100100
};
101101

@@ -104,7 +104,7 @@ public static string AbiToRid (string abi)
104104

105105
public static string RidToAbi (string rid)
106106
{
107-
if (!RidToAbiMap.TryGetValue (rid, out string abi)) {
107+
if (!RidToAbiMap.TryGetValue (rid, out string? abi)) {
108108
throw new NotSupportedException ($"Internal error: unsupported Runtime Identifier '{rid}'");
109109
};
110110

@@ -132,7 +132,7 @@ public static AndroidTargetArch RidToArch (string rid)
132132

133133
public static string ArchToRid (AndroidTargetArch arch)
134134
{
135-
if (!ArchToRidMap.TryGetValue (arch, out string rid)) {
135+
if (!ArchToRidMap.TryGetValue (arch, out string? rid)) {
136136
throw new InvalidOperationException ($"Internal error: unsupported architecture '{arch}'");
137137
};
138138

@@ -141,7 +141,7 @@ public static string ArchToRid (AndroidTargetArch arch)
141141

142142
public static string ArchToAbi (AndroidTargetArch arch)
143143
{
144-
if (!ArchToAbiMap.TryGetValue (arch, out string abi)) {
144+
if (!ArchToAbiMap.TryGetValue (arch, out string? abi)) {
145145
throw new InvalidOperationException ($"Internal error: unsupported architecture '{arch}'");
146146
};
147147

@@ -160,9 +160,9 @@ public static string ArchToAbi (AndroidTargetArch arch)
160160
return Convert.ToString (obj, CultureInfo.InvariantCulture);
161161
}
162162

163-
public static string MapAndroidAbiToClang (string androidAbi)
163+
public static string? MapAndroidAbiToClang (string androidAbi)
164164
{
165-
if (ClangAbiMap.TryGetValue (androidAbi, out string clangAbi)) {
165+
if (ClangAbiMap.TryGetValue (androidAbi, out string? clangAbi)) {
166166
return clangAbi;
167167
}
168168
return null;

tools/assembly-store-reader-mk2/AssemblyStore/AssemblyStoreExplorer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ protected AssemblyStoreExplorer (Stream storeStream, string path)
3636
Is64Bit = reader.Is64Bit;
3737

3838
var dict = new Dictionary<string, AssemblyStoreItem> (StringComparer.Ordinal);
39-
foreach (AssemblyStoreItem item in Assemblies) {
39+
foreach (AssemblyStoreItem item in Assemblies ?? []) {
4040
dict.Add (item.Name, item);
4141
}
4242
AssembliesByName = dict.AsReadOnly ();

tools/decompress-assemblies/main.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static bool UncompressDLL (Stream inputStream, string fileName, string filePath,
5151
Console.Error.WriteLine ($" Failed to decompress LZ4 data of {fileName} (decoded: {decoded})");
5252
retVal = false;
5353
} else {
54-
string outputDir = Path.GetDirectoryName (outputFile);
54+
string? outputDir = Path.GetDirectoryName (outputFile);
5555
if (!String.IsNullOrEmpty (outputDir)) {
5656
Directory.CreateDirectory (outputDir);
5757
}

0 commit comments

Comments
 (0)