Skip to content
This repository has been archived by the owner on Oct 27, 2023. It is now read-only.

Remove Newtonsoft.Json APIs from System.Net.Http.Formatting #7

Merged
merged 1 commit into from May 18, 2018

Conversation

radical
Copy link
Member

@radical radical commented May 18, 2018

  • Also, remove 3 methods that referenced Newtonsoft.Json types

Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=23668

Copy link
Member

@akoeplinger akoeplinger left a comment

Choose a reason for hiding this comment

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

You'll need to regenerate the .dll which is checked in. Run make -C mono CSC="mono <path to mono>/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.1.0/tools/csc.exe"

- Also, remove 3 methods that referenced Newtonsoft.Json types

- Also, updated mono/System.Net.Http.Formatting.dll. generated with:

	`make -C mono CSC="mono <path to mono>/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.1.0/tools/csc.exe"

.. based on mono#7 (review) .

Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=23668
@radical
Copy link
Member Author

radical commented May 18, 2018

@akoeplinger generated the assembly.

@radical radical closed this May 18, 2018
@radical radical reopened this May 18, 2018
@akoeplinger akoeplinger merged commit 3cb3efa into mono:master May 18, 2018
@radical radical deleted the remove-newtonsoft branch May 21, 2018 03:34
@marek-safar
Copy link
Member

@radical please bump the submodule dependency in Mono too

radical added a commit to radical/mono that referenced this pull request May 29, 2018
radical added a commit to radical/mono that referenced this pull request May 29, 2018
baulig pushed a commit to baulig/mono that referenced this pull request May 31, 2018
commit 6cffdd6
Author: Martin Baulig <mabaul@microsoft.com>
Date:   Wed May 30 18:07:56 2018 -0400

    Move `HashCode` into `corlib.dll.sources` and make most of the profiles platform-specific.

commit e274fe9
Author: Martin Baulig <mabaul@microsoft.com>
Date:   Wed May 30 18:49:20 2018 -0400

    [build]: Make 'gensources' look for platform-specific .sources files as well.

commit 91e2f08
Author: Martin Baulig <mabaul@microsoft.com>
Date:   Wed May 30 18:01:52 2018 -0400

    Bump corefx.

commit 365b5df
Author: Martin Baulig <mabaul@microsoft.com>
Date:   Wed May 30 16:23:02 2018 -0400

    Fix the .sources mess.

commit 31517dc
Author: Martin Baulig <mabaul@microsoft.com>
Date:   Wed May 30 16:20:36 2018 -0400

    Split; this is just the code change.

commit 29b18f1
Author: Alexis Christoforides <alexis@thenull.net>
Date:   Fri May 25 04:57:24 2018 -0400

    [corefx] Import System.Hashcode (mono#8822)

    * [System.Native] Add pal_random

    * Bring HashCode.cs.

    * Use platform-specific .sources files.

    * Bump API snapshot submodule

commit e8e1e16
Author: Martin Baulig <mabaul@microsoft.com>
Date:   Thu May 24 17:29:52 2018 -0400

    Bump CoreFX and bring HashCode.cs.

commit 42b9868
Merge: 7912154 bc4a1b3
Author: Alexis Christoforides <alexis@thenull.net>
Date:   Wed May 30 15:31:49 2018 -0400

    Merge pull request mono#8719 from mono/fix-gh-8712

    [System.IO] Finish initializing all FileSystemWatchers, not just the f…

commit 7912154
Author: Marek Safar <marek.safar@gmail.com>
Date:   Tue May 29 13:57:45 2018 +0200

    [acceptance-tests] Bump roslyn tests to match bundled version

commit bc4a1b3
Author: Alexis Christoforides <alexis@thenull.net>
Date:   Wed May 30 09:54:02 2018 -0400

    [System.IO] Dispatch events asynchronously in FileSystemWatcher.DispatchEvents()

    This used to happen in RaiseEvents(), but some CoreFX FSW tests require that a derived FSW be able to fire its event synchronously.

commit 2fe6c6b
Author: Alexis Christoforides <alexis@thenull.net>
Date:   Thu May 17 20:09:41 2018 -0400

    [System.IO] Prevent the CoreFX bridge from even try-entering a monitor.

    In the case of the FSEvent FileSystemWatcher, the CFRunLoop event loop thread has already an interrupt handler installed in the icall, and mono_monitor_try_enter  may try to install one as well which is not supported. So we create separate event tasks before we use the Operation() method.

commit 2731ac9
Author: Bernhard Urban <bernhard.urban@xamarin.com>
Date:   Wed May 30 15:40:09 2018 +0200

    [native crash] limit output of process mapping (mono#8910)

    [native crash] limit output of process mapping

    less noise

commit a7f8569
Author: Bernhard Urban <bernhard.urban@xamarin.com>
Date:   Wed May 30 15:25:08 2018 +0200

    [native crash] dump memory around instruction pointer (mono#8911)

    [native crash] dump memory around instruction pointer

    It can help to identify issues in generated code. We don't want to ship a disassembler, so we just do a hexdump. It looks like this:

    ```
    Memory around native instruction pointer (0x10ca1b50e):
    0x10ca1b4fe  48 c7 04 24 00 00 00 00 48 8b 44 24 10 48 8b f8  H..$....H.D$.H..
    0x10ca1b50e  83 38 00 48 8d 64 24 00 49 bb 3a b5 a1 0c 01 00  .8.H.d$.I.:.....
    0x10ca1b51e  00 00 41 ff d3 48 89 04 24 e9 00 00 00 00 48 8b  ..A..H..$.....H.
    0x10ca1b52e  04 24 e9 00 00 00 00 48 83 c4 18 c3 e8 c1 1c 53  .$.....H.......S
    ```

    Offline tools can be used to disassemble the code.

commit 3a8218e
Author: Alexander Köplinger <alex.koeplinger@outlook.com>
Date:   Wed May 30 02:01:07 2018 +0200

    [bcl] Fix ONO_PATH warning during resgen (mono#8933)

    We'd get the following warning during the build:

    ```
    '/Users/alexander/dev/mono/mcs/class/System.Data.Services.Client/ONO_PATH' in MONO_PATH doesn't exist or has wrong permissions.
    ```

    The reason is that we didn't escape the $ symbol in the resgen template
    so the embedded $$MONO_PATH in the RESGEN variable ended up being mangled.

    I'm kinda surprised this worked at all for so many years ¯\_(ツ)_/¯

commit f37db9c
Author: Marek Safar <marek.safar@gmail.com>
Date:   Wed May 30 00:31:51 2018 +0200

    [System.Web] Fix bug with not preserving state of CheckBoxList after postback because of value beeing rendered (mono#8928)

commit 6a7bd7b
Author: Marek Safar <marek.safar@gmail.com>
Date:   Wed May 30 00:22:36 2018 +0200

    [Facades] Adds few netcore extensions (mono#8907)

    * [Facades] Adds few netcore extensions

    Fixes mono#7947

    * Bump API snapshot submodule

    * [csproj] Update project files

commit 4adf710
Author: Ankit Jain <radical@gmail.com>
Date:   Tue May 29 18:10:37 2018 -0400

    Bump binary-reference-assemblies (mono#8929)

    Includes the fix for https://bugzilla.xamarin.com/show_bug.cgi?id=23668
    via mono/reference-assemblies#7

commit dd6fe29
Author: Ankit Jain <radical@gmail.com>
Date:   Tue May 29 18:09:31 2018 -0400

    [roslyn][msbuild] Copy the new Microsoft.Managed.Core.targets file in roslyn. (mono#8931)

    Fixes mono#8897 .

commit 183d994
Author: Alexis Christoforides <alexis@thenull.net>
Date:   Tue May 15 07:50:39 2018 -0400

    [System.IO] Finish initializing all FileSystemWatchers, not just the first one

    Fixes mono#8712
baulig pushed a commit to baulig/mono that referenced this pull request May 31, 2018
commit da2de44
Author: Martin Baulig <mabaul@microsoft.com>
Date:   Thu May 31 10:46:00 2018 -0400

    [corlib]: Add `System.HashCode` - revisiting mono#8822 and mono#8879. (mono#8934)

    Enable `System.HashCode` again, cleanup the `.sources` files and fix the Windows build.

commit e5cd5a9
Author: Martin Baulig <mabaul@microsoft.com>
Date:   Wed May 30 18:49:20 2018 -0400

    [build]: Make 'gensources' look for platform-specific .sources files as well.

commit 23fd728
Author: Nick Craver <nrcraver@gmail.com>
Date:   Wed May 30 21:29:17 2018 -0400

    Issue template: update help link to https://

    Since GitHub pages rolled out HTTPS support, links to `www.mono-project.com` can now be `https://` :) This also removes a `www.` 301 users currently hits.

commit c972668
Author: Zoltan Varga <vargaz@gmail.com>
Date:   Wed May 30 19:52:50 2018 -0400

    [runtime] Fix the --enable-minimal=aot build. (mono#8952)

    Fixes mono#8430.

commit 3a630bf
Author: monojenkins <jo.shields+jenkins@xamarin.com>
Date:   Wed May 30 21:59:09 2018 +0000

    Bump API snapshot submodule

commit 8afcf1b
Author: EgorBo <egorbo@gmail.com>
Date:   Wed May 30 21:05:12 2018 +0300

    remove `implicit operator String (ReadOnlySpan<char> value)`

commit 42b9868
Merge: 7912154 bc4a1b3
Author: Alexis Christoforides <alexis@thenull.net>
Date:   Wed May 30 15:31:49 2018 -0400

    Merge pull request mono#8719 from mono/fix-gh-8712

    [System.IO] Finish initializing all FileSystemWatchers, not just the f…

commit 7912154
Author: Marek Safar <marek.safar@gmail.com>
Date:   Tue May 29 13:57:45 2018 +0200

    [acceptance-tests] Bump roslyn tests to match bundled version

commit bc4a1b3
Author: Alexis Christoforides <alexis@thenull.net>
Date:   Wed May 30 09:54:02 2018 -0400

    [System.IO] Dispatch events asynchronously in FileSystemWatcher.DispatchEvents()

    This used to happen in RaiseEvents(), but some CoreFX FSW tests require that a derived FSW be able to fire its event synchronously.

commit 2fe6c6b
Author: Alexis Christoforides <alexis@thenull.net>
Date:   Thu May 17 20:09:41 2018 -0400

    [System.IO] Prevent the CoreFX bridge from even try-entering a monitor.

    In the case of the FSEvent FileSystemWatcher, the CFRunLoop event loop thread has already an interrupt handler installed in the icall, and mono_monitor_try_enter  may try to install one as well which is not supported. So we create separate event tasks before we use the Operation() method.

commit 2731ac9
Author: Bernhard Urban <bernhard.urban@xamarin.com>
Date:   Wed May 30 15:40:09 2018 +0200

    [native crash] limit output of process mapping (mono#8910)

    [native crash] limit output of process mapping

    less noise

commit a7f8569
Author: Bernhard Urban <bernhard.urban@xamarin.com>
Date:   Wed May 30 15:25:08 2018 +0200

    [native crash] dump memory around instruction pointer (mono#8911)

    [native crash] dump memory around instruction pointer

    It can help to identify issues in generated code. We don't want to ship a disassembler, so we just do a hexdump. It looks like this:

    ```
    Memory around native instruction pointer (0x10ca1b50e):
    0x10ca1b4fe  48 c7 04 24 00 00 00 00 48 8b 44 24 10 48 8b f8  H..$....H.D$.H..
    0x10ca1b50e  83 38 00 48 8d 64 24 00 49 bb 3a b5 a1 0c 01 00  .8.H.d$.I.:.....
    0x10ca1b51e  00 00 41 ff d3 48 89 04 24 e9 00 00 00 00 48 8b  ..A..H..$.....H.
    0x10ca1b52e  04 24 e9 00 00 00 00 48 83 c4 18 c3 e8 c1 1c 53  .$.....H.......S
    ```

    Offline tools can be used to disassemble the code.

commit 3a8218e
Author: Alexander Köplinger <alex.koeplinger@outlook.com>
Date:   Wed May 30 02:01:07 2018 +0200

    [bcl] Fix ONO_PATH warning during resgen (mono#8933)

    We'd get the following warning during the build:

    ```
    '/Users/alexander/dev/mono/mcs/class/System.Data.Services.Client/ONO_PATH' in MONO_PATH doesn't exist or has wrong permissions.
    ```

    The reason is that we didn't escape the $ symbol in the resgen template
    so the embedded $$MONO_PATH in the RESGEN variable ended up being mangled.

    I'm kinda surprised this worked at all for so many years ¯\_(ツ)_/¯

commit f37db9c
Author: Marek Safar <marek.safar@gmail.com>
Date:   Wed May 30 00:31:51 2018 +0200

    [System.Web] Fix bug with not preserving state of CheckBoxList after postback because of value beeing rendered (mono#8928)

commit 6a7bd7b
Author: Marek Safar <marek.safar@gmail.com>
Date:   Wed May 30 00:22:36 2018 +0200

    [Facades] Adds few netcore extensions (mono#8907)

    * [Facades] Adds few netcore extensions

    Fixes mono#7947

    * Bump API snapshot submodule

    * [csproj] Update project files

commit 4adf710
Author: Ankit Jain <radical@gmail.com>
Date:   Tue May 29 18:10:37 2018 -0400

    Bump binary-reference-assemblies (mono#8929)

    Includes the fix for https://bugzilla.xamarin.com/show_bug.cgi?id=23668
    via mono/reference-assemblies#7

commit dd6fe29
Author: Ankit Jain <radical@gmail.com>
Date:   Tue May 29 18:09:31 2018 -0400

    [roslyn][msbuild] Copy the new Microsoft.Managed.Core.targets file in roslyn. (mono#8931)

    Fixes mono#8897 .

commit 183d994
Author: Alexis Christoforides <alexis@thenull.net>
Date:   Tue May 15 07:50:39 2018 -0400

    [System.IO] Finish initializing all FileSystemWatchers, not just the first one

    Fixes mono#8712
baulig pushed a commit to baulig/mono that referenced this pull request May 31, 2018
commit 349fd61
Author: Martin Baulig <mabaul@microsoft.com>
Date:   Thu May 31 16:04:16 2018 -0400

    [corefx] Enable HashCode on all profiles.

    * HashCode.cs has been moved into `corlib.dll.sources`.

    * Add `PLATFORMS = darwin linux win32` to the following profiles:
      basic, orbis, testing_aot_full, testing_aot_hybrid, unreal, wasm.

    * Add per-platform sources which are now used by all profiles which
      do not have an explicit profile-platform sources file:
      - `darwin_corlib.dll.sources`
      - `linux_corlib.dll.sources`
      - `win32_corlib.dll.sources`

    * Add new `monodroid_corlib.dll.sources`.

    * Add new `xammac_net_4_5_corlib.dll.sources`.

    * Remove `testing_aot_full_corlib_test.dll.sources`.

    * Add the platform-specific non-cryptographic RNG to all profiles.

commit da2de44
Author: Martin Baulig <mabaul@microsoft.com>
Date:   Thu May 31 10:46:00 2018 -0400

    [corlib]: Add `System.HashCode` - revisiting mono#8822 and mono#8879. (mono#8934)

    Enable `System.HashCode` again, cleanup the `.sources` files and fix the Windows build.

commit e5cd5a9
Author: Martin Baulig <mabaul@microsoft.com>
Date:   Wed May 30 18:49:20 2018 -0400

    [build]: Make 'gensources' look for platform-specific .sources files as well.

commit 23fd728
Author: Nick Craver <nrcraver@gmail.com>
Date:   Wed May 30 21:29:17 2018 -0400

    Issue template: update help link to https://

    Since GitHub pages rolled out HTTPS support, links to `www.mono-project.com` can now be `https://` :) This also removes a `www.` 301 users currently hits.

commit c972668
Author: Zoltan Varga <vargaz@gmail.com>
Date:   Wed May 30 19:52:50 2018 -0400

    [runtime] Fix the --enable-minimal=aot build. (mono#8952)

    Fixes mono#8430.

commit 3a630bf
Author: monojenkins <jo.shields+jenkins@xamarin.com>
Date:   Wed May 30 21:59:09 2018 +0000

    Bump API snapshot submodule

commit 8afcf1b
Author: EgorBo <egorbo@gmail.com>
Date:   Wed May 30 21:05:12 2018 +0300

    remove `implicit operator String (ReadOnlySpan<char> value)`

commit 42b9868
Merge: 7912154 bc4a1b3
Author: Alexis Christoforides <alexis@thenull.net>
Date:   Wed May 30 15:31:49 2018 -0400

    Merge pull request mono#8719 from mono/fix-gh-8712

    [System.IO] Finish initializing all FileSystemWatchers, not just the f…

commit 7912154
Author: Marek Safar <marek.safar@gmail.com>
Date:   Tue May 29 13:57:45 2018 +0200

    [acceptance-tests] Bump roslyn tests to match bundled version

commit bc4a1b3
Author: Alexis Christoforides <alexis@thenull.net>
Date:   Wed May 30 09:54:02 2018 -0400

    [System.IO] Dispatch events asynchronously in FileSystemWatcher.DispatchEvents()

    This used to happen in RaiseEvents(), but some CoreFX FSW tests require that a derived FSW be able to fire its event synchronously.

commit 2fe6c6b
Author: Alexis Christoforides <alexis@thenull.net>
Date:   Thu May 17 20:09:41 2018 -0400

    [System.IO] Prevent the CoreFX bridge from even try-entering a monitor.

    In the case of the FSEvent FileSystemWatcher, the CFRunLoop event loop thread has already an interrupt handler installed in the icall, and mono_monitor_try_enter  may try to install one as well which is not supported. So we create separate event tasks before we use the Operation() method.

commit 2731ac9
Author: Bernhard Urban <bernhard.urban@xamarin.com>
Date:   Wed May 30 15:40:09 2018 +0200

    [native crash] limit output of process mapping (mono#8910)

    [native crash] limit output of process mapping

    less noise

commit a7f8569
Author: Bernhard Urban <bernhard.urban@xamarin.com>
Date:   Wed May 30 15:25:08 2018 +0200

    [native crash] dump memory around instruction pointer (mono#8911)

    [native crash] dump memory around instruction pointer

    It can help to identify issues in generated code. We don't want to ship a disassembler, so we just do a hexdump. It looks like this:

    ```
    Memory around native instruction pointer (0x10ca1b50e):
    0x10ca1b4fe  48 c7 04 24 00 00 00 00 48 8b 44 24 10 48 8b f8  H..$....H.D$.H..
    0x10ca1b50e  83 38 00 48 8d 64 24 00 49 bb 3a b5 a1 0c 01 00  .8.H.d$.I.:.....
    0x10ca1b51e  00 00 41 ff d3 48 89 04 24 e9 00 00 00 00 48 8b  ..A..H..$.....H.
    0x10ca1b52e  04 24 e9 00 00 00 00 48 83 c4 18 c3 e8 c1 1c 53  .$.....H.......S
    ```

    Offline tools can be used to disassemble the code.

commit 3a8218e
Author: Alexander Köplinger <alex.koeplinger@outlook.com>
Date:   Wed May 30 02:01:07 2018 +0200

    [bcl] Fix ONO_PATH warning during resgen (mono#8933)

    We'd get the following warning during the build:

    ```
    '/Users/alexander/dev/mono/mcs/class/System.Data.Services.Client/ONO_PATH' in MONO_PATH doesn't exist or has wrong permissions.
    ```

    The reason is that we didn't escape the $ symbol in the resgen template
    so the embedded $$MONO_PATH in the RESGEN variable ended up being mangled.

    I'm kinda surprised this worked at all for so many years ¯\_(ツ)_/¯

commit f37db9c
Author: Marek Safar <marek.safar@gmail.com>
Date:   Wed May 30 00:31:51 2018 +0200

    [System.Web] Fix bug with not preserving state of CheckBoxList after postback because of value beeing rendered (mono#8928)

commit 6a7bd7b
Author: Marek Safar <marek.safar@gmail.com>
Date:   Wed May 30 00:22:36 2018 +0200

    [Facades] Adds few netcore extensions (mono#8907)

    * [Facades] Adds few netcore extensions

    Fixes mono#7947

    * Bump API snapshot submodule

    * [csproj] Update project files

commit 4adf710
Author: Ankit Jain <radical@gmail.com>
Date:   Tue May 29 18:10:37 2018 -0400

    Bump binary-reference-assemblies (mono#8929)

    Includes the fix for https://bugzilla.xamarin.com/show_bug.cgi?id=23668
    via mono/reference-assemblies#7

commit dd6fe29
Author: Ankit Jain <radical@gmail.com>
Date:   Tue May 29 18:09:31 2018 -0400

    [roslyn][msbuild] Copy the new Microsoft.Managed.Core.targets file in roslyn. (mono#8931)

    Fixes mono#8897 .

commit 183d994
Author: Alexis Christoforides <alexis@thenull.net>
Date:   Tue May 15 07:50:39 2018 -0400

    [System.IO] Finish initializing all FileSystemWatchers, not just the first one

    Fixes mono#8712
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants