Skip to content

Fix mono master build #112

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 2 commits into from
Jan 3, 2017
Merged

Fix mono master build #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7476a4b
Fixed paths to nunit.framework.dll
akoeplinger Jan 2, 2017
0ce2535
Add DebugType=full to TestJVM.csproj
akoeplinger Jan 2, 2017
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
2 changes: 1 addition & 1 deletion src/Java.Interop.Dynamic/Tests/Java.Interop.Dynamic-Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<ItemGroup>
<Reference Include="System" />
<Reference Include="nunit.framework">
<HintPath>..\..\..\lib\NUnit-2.6.3\bin\nunit.framework.dll</HintPath>
<HintPath>..\..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
Copy link
Contributor

@jonpryor jonpryor Jan 2, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

...what? Java.Interop.Dynamic-Tests doesn't reference nunit.framework?

What's odd is that (1) it does here, and (2) this PR built with the PR builder, so I am very confused:

$ monodis --assemblyref bin/TestDebug/Java.Interop.Dynamic-Tests.dll
...
3: Version=2.6.3.13283
	Name=nunit.framework
	Flags=0x00000000
	Public Key:
0x00000000: 96 D0 9A 1E B7 F4 4A 77

Copy link
Contributor

@jonpryor jonpryor Jan 2, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From the commit message:

the latter one is deprecated as of Mono 4.9.

I guess the problem is that nunit.framework.dll was present in mono, and in mono 4.9 it isn't anymore, which is why this used to work but now it doesn't.

Copy link
Member Author

@akoeplinger akoeplinger Jan 2, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's probably getting the reference from one of the projects that are referenced with my change.

I'll redo this leaving the reference in but just fix the the path.

Copy link
Member Author

@akoeplinger akoeplinger Jan 2, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BTW nunit.framework.dll IS still present in Mono 4.9, it's just that types like TestFixtureAttribute have the Obsolete attribute applied with IsError=true (temporarily, to catch cases like this).

In this case I guess what happens is that since the HintPath doesn't exist it'll instead use the assembly from the GAC, which results in the obsolete error.

</Reference>
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
Expand Down
5 changes: 2 additions & 3 deletions ...arin.Android.Tools.ApiXmlAdjuster/Tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@
<ItemGroup>
<Reference Include="System" />
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
<Package>nunit</Package>
<HintPath>..\..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System.Xml" />
</ItemGroup>
Expand All @@ -54,4 +53,4 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>
</Project>
4 changes: 2 additions & 2 deletions tests/Java.Interop-PerformanceTests/Java.Interop-PerformanceTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<ItemGroup>
<Reference Include="System" />
<Reference Include="nunit.framework">
<HintPath>..\..\lib\NUnit-2.6.3\bin\nunit.framework.dll</HintPath>
<HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
Copy link
Contributor

@jonpryor jonpryor Jan 2, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes like this make me wonder how this repo ever built... :-/

</Reference>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -62,4 +62,4 @@
<Name>TestJVM</Name>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
3 changes: 2 additions & 1 deletion tests/TestJVM/TestJVM.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<OutputPath>..\..\bin\TestDebug</OutputPath>
<ErrorReport>prompt</ErrorReport>
<DefineTrace>false</DefineTrace>
Expand All @@ -38,7 +39,7 @@
<ItemGroup>
<Reference Include="System" />
<Reference Include="nunit.framework">
<HintPath>..\..\..\lib\NUnit-2.6.3\bin\nunit.framework.dll</HintPath>
<HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
Expand Down
3 changes: 1 addition & 2 deletions tools/generator/Tests/generator-Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="nunit.framework">
<HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
<Package>nunit</Package>
<HintPath>..\..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 3 additions & 1 deletion tools/logcat-parse/Tests/LogcatParse-Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="nunit.framework" />
<Reference Include="nunit.framework">
<HintPath>..\..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="GrefsTest.cs" />
Expand Down