diff options
| author | David Pugh <dpugh@microsoft.com> | 2017-03-21 05:03:41 +0300 |
|---|---|---|
| committer | David Pugh <dpugh@microsoft.com> | 2017-03-21 05:03:41 +0300 |
| commit | a715da47e4d52b289dcca8c0ed36a717033acaa1 (patch) | |
| tree | f31f8ef5de049438d3e053abaa2e1cc6e256572b /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj | |
| parent | eb3ab6872180b345e8adeab443c03031b3d3da30 (diff) | |
| parent | cf099698a7c8e704138316a7abd8ff0bfafaa780 (diff) | |
Merge remote-tracking branch 'origin/vNext-webtools-platform' into dev/dpugh/movetv
# Conflicts:
# main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/TextEditorData.cs
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj index d92710c8ea..a4c68cf46e 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj @@ -140,9 +140,30 @@ <Reference Include="WindowsBase" Condition=" '$(Configuration)' == 'DebugWin32' Or '$(Configuration)' == 'ReleaseWin32' " /> <Reference Include="WindowsFormsIntegration" Condition=" '$(Configuration)' == 'DebugWin32' Or '$(Configuration)' == 'ReleaseWin32' " /> <Reference Include="System.Xaml" /> + <Reference Include="Microsoft.VisualStudio.CoreUtility"> + <HintPath>..\..\..\packages\Microsoft.VisualStudio.CoreUtility.15.0.26201\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath> + <Private>True</Private> + <SpecificVersion>False</SpecificVersion> + </Reference> + <Reference Include="Microsoft.VisualStudio.Text.Data"> + <HintPath>..\..\..\packages\Microsoft.VisualStudio.Text.Data.15.0.26201\lib\net45\Microsoft.VisualStudio.Text.Data.dll</HintPath> + <Private>True</Private> + <SpecificVersion>False</SpecificVersion> + </Reference> + <Reference Include="Microsoft.VisualStudio.Text.Logic"> + <HintPath>..\..\..\packages\Microsoft.VisualStudio.Text.Logic.15.0.26201\lib\net45\Microsoft.VisualStudio.Text.Logic.dll</HintPath> + <Private>True</Private> + <SpecificVersion>False</SpecificVersion> + </Reference> + <Reference Include="Microsoft.VisualStudio.Text.UI"> + <HintPath>..\..\..\packages\Microsoft.VisualStudio.Text.UI.15.0.26201\lib\net45\Microsoft.VisualStudio.Text.UI.dll</HintPath> + <Private>True</Private> + <SpecificVersion>False</SpecificVersion> + </Reference> + <Reference Include="System.ComponentModel.Composition" /> <Reference Include="ICSharpCode.SharpZipLib"> - <HintPath>..\..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath> - <Private>False</Private> + <HintPath>..\..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath> + <Private>False</Private> </Reference> <Reference Include="System.Collections.Immutable"> <HintPath>..\..\..\build\bin\System.Collections.Immutable.dll</HintPath> @@ -9410,6 +9431,7 @@ <None Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\objective-c\language-configuration.json" /> <None Include="MonoDevelop.Ide.Editor.Highlighting\VSCodeImport\objective-c\package.json" /> </ItemGroup> + <Import Project="..\..\core\Mono.TextEditor.Platform\Mono.TextEditor.Platform.Def.projitems" Label="Platform" Condition="Exists('..\..\core\Mono.TextEditor.Platform\Mono.TextEditor.Platform.Def.projitems')" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Target Name="AfterBuild"> <Copy SourceFiles="@(Data)" DestinationFolder="..\..\..\build\data\%(Data.RelativeDir)" /> |