[remap-assembly-ref] use Mono.Cecil from NuGet (#5525)
BCL Test phases are failing with: remap-assembly-ref.cs(3,12): error CS0234: The type or namespace name 'Cecil' does not exist in the namespace 'Mono' (are you missing an assembly reference?) The problem being `Mono.Cecil.dll` does not actually exist: warning MSB3245: Could not resolve this reference. Could not locate the assembly "Mono.Cecil". Check to make sure the assembly exists on disk. If this reference is required by your code, you may get compilation errors. This appears to have started failing since49e570d8
. Commit19c3b731
fixed the issue with needing `/restore`, but this is the next issue... Reviewing a build log from before49e570d8
, it *only* worked because the build was pulling `Mono.Cecil.dll` from Mono's GAC: Task ResolveAssemblyReference Reference found at search path location "{GAC}". ... Considered "/Users/runner/work/1/s/external/mono/sdks/out/android-bcl/monodroid_tools/Mono.Cecil.dll", but it didn't exist. ... OutputItems ReferencePath /Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/gac/Mono.Cecil/0.11.1.0__0738eb9f132ed756/Mono.Cecil.dll Switching to `Microsoft.NET.Sdk` prevented the probing of the GAC, because `$(AssemblySearchPaths)` [does not contain `{GAC}][0]` in dotnet/sdk. To fix the problem, we should just use a `@(PackageReference)` for Mono.Cecil in this tool. I also updated `Step_DetermineAzurePipelinesTestJobs`, so changes to `build-tools` will run all tests. Co-authored-by: Radek Doulik <radekdoulik@gmail.com> [0]:ee455863aa/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props (L90-L91)
This commit is contained in:
Родитель
469ada9006
Коммит
549f2ced9e
|
@ -126,6 +126,7 @@
|
|||
<_TestsBundleName Condition=" '$(BundleAssemblies)' == 'true' ">-Bundle</_TestsBundleName>
|
||||
<TestsFlavor>$(_TestsProfiledAotName)$(_TestsAotName)$(_TestsBundleName)</TestsFlavor>
|
||||
<LibZipSharpVersion>1.0.20</LibZipSharpVersion>
|
||||
<MonoCecilVersion>0.11.2</MonoCecilVersion>
|
||||
<NuGetApiPackageVersion>5.4.0</NuGetApiPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
|
@ -198,7 +199,7 @@
|
|||
<AndroidSupportedTargetAotAbisSplit>$(AndroidSupportedTargetAotAbis.Split(':'))</AndroidSupportedTargetAotAbisSplit>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<RemapAssemblyRefToolExecutable>$(MSBuildThisFileDirectory)bin\Build$(Configuration)\remap-assembly-ref.exe</RemapAssemblyRefToolExecutable>
|
||||
<RemapAssemblyRefToolExecutable>$(MSBuildThisFileDirectory)bin\Build$(Configuration)\remap-assembly-ref\remap-assembly-ref.exe</RemapAssemblyRefToolExecutable>
|
||||
<RemapAssemblyRefTool>$(ManagedRuntime) $(ManagedRuntimeArgs) "$(RemapAssemblyRefToolExecutable)"</RemapAssemblyRefTool>
|
||||
</PropertyGroup>
|
||||
|
||||
|
|
|
@ -6,15 +6,13 @@
|
|||
<OutputType>Exe</OutputType>
|
||||
<RootNamespace>remapassemblyref</RootNamespace>
|
||||
<AssemblyName>remap-assembly-ref</AssemblyName>
|
||||
<OutputPath>..\..\bin\Build$(Configuration)</OutputPath>
|
||||
<OutputPath>..\..\bin\Build$(Configuration)\remap-assembly-ref</OutputPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="..\..\Configuration.props" />
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="Mono.Cecil">
|
||||
<HintPath>$(XamarinAndroidSourcePath)external\mono\sdks\out\android-bcl\monodroid_tools\Mono.Cecil.dll</HintPath>
|
||||
</Reference>
|
||||
<PackageReference Include="Mono.Cecil" Version="$(MonoCecilVersion)" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
@ -48,7 +48,7 @@ namespace Xamarin.Android.Prepare
|
|||
// BCL: Runs BCL tests on emulator
|
||||
// TimeZone: Runs timezone unit tests on emulator
|
||||
// Designer: Runs designer integration tests
|
||||
if (file == ".external" || file == "Configuration.props") {
|
||||
if (file == ".external" || file == "Configuration.props" || file.Contains ("build-tools/")) {
|
||||
testAreas.Add ("MSBuild");
|
||||
testAreas.Add ("MSBuildDevice");
|
||||
testAreas.Add ("BCL");
|
||||
|
@ -56,12 +56,6 @@ namespace Xamarin.Android.Prepare
|
|||
testAreas.Add ("Designer");
|
||||
}
|
||||
|
||||
if (file.Contains ("build-tools/installers")) {
|
||||
testAreas.Add ("MSBuild");
|
||||
testAreas.Add ("MSBuildDevice");
|
||||
testAreas.Add ("Designer");
|
||||
}
|
||||
|
||||
if (file.Contains ("external/Java.Interop")) {
|
||||
testAreas.Add ("MSBuild");
|
||||
testAreas.Add ("MSBuildDevice");
|
||||
|
|
Загрузка…
Ссылка в новой задаче