Skip to content
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.

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

[msbuild] Add reference to System.Drawing.Common.dll to XI projects. #6011

Merged

Commits on May 8, 2019

  1. [msbuild] Add reference to System.Drawing.Common.dll to XI projects.

    Fixes mono/mono#13483 :
    
    ```
    @akoeplinger: Since we moved types from Mono.Android.dll and
    Xamarin.iOS/WatchOS/TVOS.dll to System.Drawing.Common.dll user projects
    would fail to compile. We need to add some msbuild logic to add a
    reference to the assembly automatically.
    ```
    radical committed May 8, 2019
    Configuration menu
    Copy the full SHA
    9279664 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6f70dbf View commit details
    Browse the repository at this point in the history
  3. [msbuild] Update Xamarin.iOS.Tasks.TargetTests.GetReferencedAssemblie…

    …s_* tests.
    
    We're including a new assembly, which means the
    Xamarin.iOS.Tasks.TargetTests.GetReferencedAssemblies_* must be updated
    accordingly.
    
    Also modify these tests so that test assert that fails lists the actual
    assembly that's missing, i.e. instead of this:
    
        1) Test Failure : Xamarin.iOS.Tasks.TargetTests.GetReferencedAssemblies_Executable
             xamarin#1
          Expected: 6
          But was:  7
    
    we now print:
    
        1) Test Failure : Xamarin.iOS.Tasks.TargetTests.GetReferencedAssemblies_Executable
             References
          Expected: equivalent to < "mscorlib.dll", "MyLibrary.dll", "System.Core.dll", "System.dll", "System.Xml.dll", "Xamarin.iOS.dll" >
          But was:  < "mscorlib.dll", "MyLibrary.dll", "System.Core.dll", "System.dll", "System.Drawing.Common.dll", "System.Xml.dll", "Xamarin.iOS.dll" >
    rolfbjarne committed May 8, 2019
    Configuration menu
    Copy the full SHA
    3d8eb8b View commit details
    Browse the repository at this point in the history
  4. [tests] Adjust Xamarin.MMP.Tests.AssemblyReferencesTests.ShouldNotAll…

    …owReference_ToSystemDrawing.
    
    The test was verifying that referencing System.Drawing.dll and trying to use
    System.Drawing.RectangleF would fail to compile (because System.Drawing.dll
    shouldn't be resolved in this case).
    
    The addition of System.Drawing.Common.dll breaks this assumption, because now
    we ship System.Drawing.RectangleF, so the code that was supposed to fail to
    compile works just fine instead.
    
    So modify the test to verify that there's no System.Drawing.dll in the final
    bundle.
    rolfbjarne committed May 8, 2019
    Configuration menu
    Copy the full SHA
    4211284 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    5bafdd4 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2019

  1. [msbuild] Create a way out if automatically referencing System.Drawin…

    …g.Common.dll causes problems.
    rolfbjarne committed May 9, 2019
    Configuration menu
    Copy the full SHA
    bae0abb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d7838a3 View commit details
    Browse the repository at this point in the history