Bump VSMac to 8.1.0.2742 to fix msbuild issues by radical · Pull Request #6279 · dotnet/macios

radical · 2019-06-12T19:59:56Z

No description provided.

monojenkins · 2019-06-12T20:45:36Z

Build failure
❌ Build failed or was aborted

VincentDondain

There seems to be a mismatch between the version you're trying to install 8.1.0.2742 and the version you're forcing 8.1.0.2472

radical · 2019-06-12T20:50:41Z

@VincentDondain heh thanks. silly typo 😬

VincentDondain

LGTM, hopefully that solves the msbuild issues.

radical · 2019-06-12T20:53:34Z

If it does, then great. Else I will be debugging on this PR itself, since I can't reproduce this locally at all!

This is required to get the support for the msbuild `ToolsVersion` change from `15.0` to `Current`.

Test failure with updated msbuild and vsmac 8.1: ``` Xamarin.iOS.Tasks.NativeReferencesNoEmbedding("iPhone").ShouldNotUnnecessarilyRebuildBindingProject(True) Binding project build did not create package? Expected: True But was: False at Xamarin.iOS.Tasks.NativeReferencesNoEmbedding.ShouldNotUnnecessarilyRebuildBindingProject (System.Boolean framework) [0x000a0] in <74b8f7d8a53e40109916d305bb4d7403>:0 at (wrapper managed-to-native) System.Reflection.RuntimeMethodInfo.InternalInvoke(System.Reflection.RuntimeMethodInfo,object,object[],System.Exception&) at System.Reflection.RuntimeMethodInfo.Invoke (System.Object obj, System.Reflection.BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo cul ture) [0x0006a] in <0519fa732e8845b6a809ce9180f541db>:0 ``` The test builds the project multiple times. Before the 3rd build, the project file's timestamp is updated and expects that the binding package will be rebuilt. But it is not, because the target `_CreateBindingResourcePackage` doesn't depend on that project file. So, add that to the target inputs.

Fix errors seen during `nuget restore` for tests: ``` Users/builder/jenkins/workspace/xamarin-macios-pr-builder/tests/xammac_tests/xammac_tests.csproj(213,3): error MSB4024: The imported project file "/Library/Frameworks/Mono.framework/External/xbuild/Xamarin/Mac/Xamarin.Mac.CSharp.targets" could not be loaded. Could not find file "/Library/Frameworks/Mono.framework/External/xbuild/Xamarin/Mac/Xamarin.Mac.CSharp.targets" ```

radical · 2019-06-18T20:14:25Z

The Test Report page (https://jenkins.mono-project.com/job/xamarin-macios-pr-builder/10329/Test_20Report/):

Problem accessing /job/xamarin-macios-pr-builder/10329/Test_20Report/index.html. Reason:

    Not Found

@VincentDondain any idea what might be wrong here?

rolfbjarne

This looks good, but I'll merge master in this branch, which should at least fix the api comparison errors.

I'm not sure why the previous commit's test results aren't available, but maybe new ones will have some glue.

monojenkins · 2019-06-18T22:26:26Z

Build failure
✅ Build succeeded
✅ API Diff (from stable)
🔥 Failed to compare API and create generator diff 🔥
    ** Error: Working directory isn't clean:
    HEAD detached at 0d986b8
    Untracked files:
    (use "git add ..." to include in what will be committed)

    tests/bcl-test/BCL tests group 1.csproj
    tests/bcl-test/BCL tests group 2.csproj
    tests/bcl-test/BCL tests group 3.csproj
    tests/bcl-test/BCL tests group 4.csproj
    tests/bcl-test/BCL tests group 6.csproj
    tests/bcl-test/Mac OS X BCL tests group 1-mac-full.csproj
    tests/bcl-test/Mac OS X BCL tests group 1-mac-modern.csproj
    tests/bcl-test/Mac OS X BCL tests group 2-mac-full.csproj
    tests/bcl-test/Mac OS X BCL tests group 2-mac-modern.csproj
    tests/bcl-test/Mac OS X BCL tests group 3-mac-full.csproj
    tests/bcl-test/Mac OS X BCL tests group 3-mac-modern.csproj
    tests/bcl-test/Mac OS X BCL tests group 4-mac-full.csproj
    tests/bcl-test/Mac OS X BCL tests group 4-mac-modern.csproj
    tests/bcl-test/generated/
    tests/bcl-test/mscorlib-mac-full.csproj
    tests/bcl-test/mscorlib-mac-modern.csproj
    tests/bcl-test/mscorlib.csproj

    nothing added to commit but untracked files present (use "git add" to track)
    Search for Comparing API & creating generator diff in the log to view the complete log.
🔥 Test run failed 🔥

Test results

1 tests failed, 98 tests passed.

Failed tests

Xtro/Mac: Failed (Test run failed.)

rolfbjarne · 2019-06-19T05:06:03Z

Test failure is unrelated

Xtro: https://github.com/xamarin/maccore/issues/1742

rolfbjarne · 2019-06-19T05:08:16Z

@monojenkins backport d16-2

monojenkins · 2019-06-19T05:31:34Z

@rolfbjarne backporting to d16-2 failed, the patch results in conflicts:

Applying: Bump VSMac to 8.1.0.2742 to fix msbuild issues
Using index info to reconstruct a base tree...
M	Make.config
Falling back to patching base and 3-way merge...
Auto-merging Make.config
CONFLICT (content): Merge conflict in Make.config
error: Failed to merge in the changes.
Patch failed at 0001 Bump VSMac to 8.1.0.2742 to fix msbuild issues

Please backport manually!

* Bump VSMac to 8.1.0.2742 to fix msbuild issues This is required to get the support for the msbuild `ToolsVersion` change from `15.0` to `Current`. * [tests][msbuild] Fix Binding resources test with updated msbuild Test failure with updated msbuild and vsmac 8.1: ``` Xamarin.iOS.Tasks.NativeReferencesNoEmbedding("iPhone").ShouldNotUnnecessarilyRebuildBindingProject(True) Binding project build did not create package? Expected: True But was: False at Xamarin.iOS.Tasks.NativeReferencesNoEmbedding.ShouldNotUnnecessarilyRebuildBindingProject (System.Boolean framework) [0x000a0] in <74b8f7d8a53e40109916d305bb4d7403>:0 at (wrapper managed-to-native) System.Reflection.RuntimeMethodInfo.InternalInvoke(System.Reflection.RuntimeMethodInfo,object,object[],System.Exception&) at System.Reflection.RuntimeMethodInfo.Invoke (System.Object obj, System.Reflection.BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo cul ture) [0x0006a] in <0519fa732e8845b6a809ce9180f541db>:0 ``` The test builds the project multiple times. Before the 3rd build, the project file's timestamp is updated and expects that the binding package will be rebuilt. But it is not, because the target `_CreateBindingResourcePackage` doesn't depend on that project file. So, add that to the target inputs. * [nuget] Use xibuild to run nuget Fix errors seen during `nuget restore` for tests: ``` Users/builder/jenkins/workspace/xamarin-macios-pr-builder/tests/xammac_tests/xammac_tests.csproj(213,3): error MSB4024: The imported project file "/Library/Frameworks/Mono.framework/External/xbuild/Xamarin/Mac/Xamarin.Mac.CSharp.targets" could not be loaded. Could not find file "/Library/Frameworks/Mono.framework/External/xbuild/Xamarin/Mac/Xamarin.Mac.CSharp.targets" ```

* Bump VSMac to 8.1.0.2742 to fix msbuild issues (#6279) * Bump VSMac to 8.1.0.2742 to fix msbuild issues This is required to get the support for the msbuild `ToolsVersion` change from `15.0` to `Current`. * [tests][msbuild] Fix Binding resources test with updated msbuild Test failure with updated msbuild and vsmac 8.1: ``` Xamarin.iOS.Tasks.NativeReferencesNoEmbedding("iPhone").ShouldNotUnnecessarilyRebuildBindingProject(True) Binding project build did not create package? Expected: True But was: False at Xamarin.iOS.Tasks.NativeReferencesNoEmbedding.ShouldNotUnnecessarilyRebuildBindingProject (System.Boolean framework) [0x000a0] in <74b8f7d8a53e40109916d305bb4d7403>:0 at (wrapper managed-to-native) System.Reflection.RuntimeMethodInfo.InternalInvoke(System.Reflection.RuntimeMethodInfo,object,object[],System.Exception&) at System.Reflection.RuntimeMethodInfo.Invoke (System.Object obj, System.Reflection.BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo cul ture) [0x0006a] in <0519fa732e8845b6a809ce9180f541db>:0 ``` The test builds the project multiple times. Before the 3rd build, the project file's timestamp is updated and expects that the binding package will be rebuilt. But it is not, because the target `_CreateBindingResourcePackage` doesn't depend on that project file. So, add that to the target inputs. * [nuget] Use xibuild to run nuget Fix errors seen during `nuget restore` for tests: ``` Users/builder/jenkins/workspace/xamarin-macios-pr-builder/tests/xammac_tests/xammac_tests.csproj(213,3): error MSB4024: The imported project file "/Library/Frameworks/Mono.framework/External/xbuild/Xamarin/Mac/Xamarin.Mac.CSharp.targets" could not be loaded. Could not find file "/Library/Frameworks/Mono.framework/External/xbuild/Xamarin/Mac/Xamarin.Mac.CSharp.targets" ``` * [xibuild] Fix incorrect mscorlib.dll being used (#6068) * [xibuild] Fix incorrect mscorlib.dll being used The `GuiUnit_NET_4_5` project, when built with `xibuild` uses the wrong `mscorlib.dll`. From #5760 (comment) : ``` - mscorlib.dll is being used from mono/4.5 and the other system assemblies are from mono/4.5-api - GuiNet* project is built with xibuild What is happening here is: xibuild sets[1] `SetToolsetProperty ("TargetFrameworkRootPath", FrameworksDirectory + Path.DirectorySeparatorChar);` which points to `/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/xbuild-frameworks`. This causes $(FrameworkPathOverride) to be set[2] to `/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/xbuild-frameworks/.NETFramework/v4.5`, but that doesn't have a mscorlib.dll, so it gets reset[3] to /Library/Frameworks/Mono.framework/Versions/5.22.0/lib/mono/4.5/. If we don't set TargetFrameworkRoothPath, then we get `FrameworkPathOverride = /Library/Frameworks/Mono.framework/Versions/5.22.0/lib/mono/4.5-api`, causing `_ExplicitReference=/Library/Frameworks/Mono.framework/Versions/5.22.0/lib/mono/4.5-api/mscorlib.dll`(correct one) to be used. ``` Fixes #5760 1. https://github.com/xamarin/xamarin-macios/blob/master/tools/xibuild/Main.cs#L209 2. https://github.com/mono/msbuild/blob/xplat-master/src/Tasks/Microsoft.Common.CurrentVersion.targets#L79 3. https://github.com/mono/msbuild/blob/xplat-master/src/Tasks/Microsoft.Common.CurrentVersion.targets#L84 * Revert "Workaround #5760 in generator csproj" This reverts commit 9bd927b. The previous commit for xibuild removes the need for this. * [xibuild] Handle "incorrectly" cased msbuild property names (#6202) msbuild property names are case insensitive. While generating the custom app.config, in `SetToolsetProperty(..)` we try to update the property if it already exists. But the name lookup was case sensitive, thus causing the lookup to fail, resulting in two entries for the same property name differing only in case. Eg. `MSBuildSDKsPath` vs `MSBuildSdksPath`. Fixed to ignore case. Fixes mono/mono#14765 .

* Bump VSMac to 8.1.0.2742 to fix msbuild issues This is required to get the support for the msbuild `ToolsVersion` change from `15.0` to `Current`. * [tests][msbuild] Fix Binding resources test with updated msbuild Test failure with updated msbuild and vsmac 8.1: ``` Xamarin.iOS.Tasks.NativeReferencesNoEmbedding("iPhone").ShouldNotUnnecessarilyRebuildBindingProject(True) Binding project build did not create package? Expected: True But was: False at Xamarin.iOS.Tasks.NativeReferencesNoEmbedding.ShouldNotUnnecessarilyRebuildBindingProject (System.Boolean framework) [0x000a0] in <74b8f7d8a53e40109916d305bb4d7403>:0 at (wrapper managed-to-native) System.Reflection.RuntimeMethodInfo.InternalInvoke(System.Reflection.RuntimeMethodInfo,object,object[],System.Exception&) at System.Reflection.RuntimeMethodInfo.Invoke (System.Object obj, System.Reflection.BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo cul ture) [0x0006a] in <0519fa732e8845b6a809ce9180f541db>:0 ``` The test builds the project multiple times. Before the 3rd build, the project file's timestamp is updated and expects that the binding package will be rebuilt. But it is not, because the target `_CreateBindingResourcePackage` doesn't depend on that project file. So, add that to the target inputs. * [nuget] Use xibuild to run nuget Fix errors seen during `nuget restore` for tests: ``` Users/builder/jenkins/workspace/xamarin-macios-pr-builder/tests/xammac_tests/xammac_tests.csproj(213,3): error MSB4024: The imported project file "/Library/Frameworks/Mono.framework/External/xbuild/Xamarin/Mac/Xamarin.Mac.CSharp.targets" could not be loaded. Could not find file "/Library/Frameworks/Mono.framework/External/xbuild/Xamarin/Mac/Xamarin.Mac.CSharp.targets" ```

VincentDondain suggested changes Jun 12, 2019

View reviewed changes

VincentDondain approved these changes Jun 12, 2019

View reviewed changes

This comment has been minimized.

Sign in to view

VincentDondain mentioned this pull request Jun 17, 2019

[tests] Sample tests are failing on the GenerateDepsFile task #6336

Closed

radical force-pushed the bump-vsmac-8.1 branch from 22f7aa5 to 96de132 Compare June 18, 2019 10:16

radical mentioned this pull request Jun 18, 2019

[nuget] Use xibuild to run nuget #6313

Closed

radical added 2 commits June 18, 2019 06:22

Bump VSMac to 8.1.0.2742 to fix msbuild issues

b063028

This is required to get the support for the msbuild `ToolsVersion` change from `15.0` to `Current`.

radical force-pushed the bump-vsmac-8.1 branch from 96de132 to 87d1dfe Compare June 18, 2019 10:23

This comment has been minimized.

Sign in to view

radical force-pushed the bump-vsmac-8.1 branch from 87d1dfe to cee83d0 Compare June 18, 2019 13:22

This comment has been minimized.

Sign in to view

radical marked this pull request as ready for review June 18, 2019 20:14

radical requested review from chamons, emaf, jstedfast, kzu and rolfbjarne as code owners June 18, 2019 20:14

Merge remote-tracking branch 'origin/master' into bump-vsmac-8.1

242217d

rolfbjarne approved these changes Jun 18, 2019

View reviewed changes

rolfbjarne merged commit e271d5e into dotnet:master Jun 19, 2019

radical deleted the bump-vsmac-8.1 branch June 19, 2019 05:10

rolfbjarne mentioned this pull request Jun 19, 2019

[xcode11] iOS/msbuild test failures #6325

Closed

rolfbjarne mentioned this pull request Jun 19, 2019

[d16-2] Bump VSMac to 8.1.0.2742 to fix msbuild issues (#6279) #6361

Merged

rolfbjarne mentioned this pull request Jun 26, 2019

[d16-3] Bump VSMac to 8.1.0.2742 to fix msbuild issues (#6279) #6427

Merged

Conversation

radical commented Jun 12, 2019

Uh oh!

monojenkins commented Jun 12, 2019

Uh oh!

VincentDondain left a comment

Choose a reason for hiding this comment

Uh oh!

radical commented Jun 12, 2019

Uh oh!

VincentDondain left a comment

Choose a reason for hiding this comment

Uh oh!

radical commented Jun 12, 2019

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

radical commented Jun 18, 2019

Uh oh!

rolfbjarne left a comment

Choose a reason for hiding this comment

Uh oh!

monojenkins commented Jun 18, 2019

Test results

Failed tests

Uh oh!

rolfbjarne commented Jun 19, 2019

Uh oh!

rolfbjarne commented Jun 19, 2019

Uh oh!

monojenkins commented Jun 19, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants