diff options
| author | therzok <marius.ungureanu@xamarin.com> | 2019-02-14 15:28:49 +0300 |
|---|---|---|
| committer | therzok <marius.ungureanu@xamarin.com> | 2019-02-14 15:28:49 +0300 |
| commit | 4cc5888183a7292b86825071ccf107208d5b7866 (patch) | |
| tree | 7f56963e6c381e16c4388c435b0db46cc48f1bcf /main/src/addins/MacPlatform/MacPlatform.csproj | |
| parent | 49d9050bff9aceb4735acae54fee12fe2b0f3f78 (diff) | |
| parent | 5c50aaa0adf401054cdcb5eb03edcef9bb487037 (diff) | |
Merge remote-tracking branch 'origin/master' into release-8.0
Conflicts:
main/external/xwt
main/src/addins/MacPlatform/MacPlatform.csproj
main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.csproj
main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/packages.config
main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
main/tests/MonoDevelop.Core.Tests/MonoDevelop.Core.Tests.csproj
main/tests/MonoDevelop.Core.Tests/packages.config
version-checks
Diffstat (limited to 'main/src/addins/MacPlatform/MacPlatform.csproj')
| -rw-r--r-- | main/src/addins/MacPlatform/MacPlatform.csproj | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/main/src/addins/MacPlatform/MacPlatform.csproj b/main/src/addins/MacPlatform/MacPlatform.csproj index 0df060a817..de140b05dd 100644 --- a/main/src/addins/MacPlatform/MacPlatform.csproj +++ b/main/src/addins/MacPlatform/MacPlatform.csproj @@ -25,6 +25,7 @@ <Reference Include="Xamarin.Mac"> <HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath> </Reference> + <Reference Include="System.Net.Http" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj"> @@ -111,6 +112,15 @@ <Compile Include="MacTelemetryDetails.cs" /> <Compile Include="Interop.cs" /> <Compile Include="KernelInterop.cs" /> + <Compile Include="Dialogs\HttpClientOptionsPanel.cs" /> + <Compile Include="Dialogs\HttpClientOptionsWidget.cs" /> + <Compile Include="Dialogs\HttpClientOptionsWidget.UI.cs"> + <DependentUpon>HttpClientOptionsWidget.cs</DependentUpon> + </Compile> + <Compile Include="MacPlatformSettings.cs" /> + <Compile Include="MacHttpMessageHandlerProvider.cs" /> + <Compile Include="NSUrlSessionCredentialsHandler.cs" /> + <Compile Include="BasicAuthenticationHandler.cs" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="MacPlatform.addin.xml" /> |