Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitmodules3
-rw-r--r--main/Main.sln19
m---------main/external/Newtonsoft.Json0
-rw-r--r--main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj8
-rw-r--r--main/src/core/MonoDevelop.Core/packages.config4
-rw-r--r--main/tests/UserInterfaceTests/UserInterfaceTests.csproj10
-rw-r--r--main/tests/UserInterfaceTests/packages.config4
7 files changed, 18 insertions, 30 deletions
diff --git a/.gitmodules b/.gitmodules
index 95b3ca824c..a242c7786e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -8,9 +8,6 @@
[submodule "main/external/mdtestharness"]
path = main/external/mdtestharness
url = git://github.com/mono/mdtestharness.git
-[submodule "main/external/Newtonsoft.Json"]
- path = main/external/Newtonsoft.Json
- url = git://github.com/mono/Newtonsoft.Json.git
[submodule "main/external/nrefactory"]
path = main/external/nrefactory
url = git://github.com/icsharpcode/NRefactory.git
diff --git a/main/Main.sln b/main/Main.sln
index e630ed2173..eb5b819017 100644
--- a/main/Main.sln
+++ b/main/Main.sln
@@ -209,8 +209,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Debugger.Soft", "exter
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Decompiler", "contrib\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj", "{984CC812-9470-4A13-AFF9-CC44068D666C}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Newtonsoft.Json", "external\Newtonsoft.Json\Src\Newtonsoft.Json\Newtonsoft.Json.csproj", "{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IKVM.Reflection", "external\ikvm\reflect\IKVM.Reflection.csproj", "{4CB170EF-DFE6-4A56-9E1B-A85449E827A7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xwt", "Xwt", "{67A32B53-F719-4ECB-B5E1-FD0B04FEE258}"
@@ -1301,22 +1299,6 @@ Global
{A85C9721-C054-4BD8-A1F3-0227615F0A36}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
{A85C9721-C054-4BD8-A1F3-0227615F0A36}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
{A85C9721-C054-4BD8-A1F3-0227615F0A36}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
- {A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
- {A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
- {A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
- {A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
- {A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
- {A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
- {A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.Release|Any CPU.Build.0 = Release|Any CPU
- {A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
- {A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
- {A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
- {A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
- {A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
- {A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1978,7 +1960,6 @@ Global
{AA0C00CB-8699-4F37-BFAE-40CA87ACC06D} = {DA5A3BAC-74C9-4EF9-B2FF-BFA4BF38F80F}
{372E8E3E-29D5-4B4D-88A2-4711CD628C4E} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
{984CC812-9470-4A13-AFF9-CC44068D666C} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
- {A9AE40FF-1A21-414A-9FE7-3BE13644CC6D} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
{4CB170EF-DFE6-4A56-9E1B-A85449E827A7} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
{67A32B53-F719-4ECB-B5E1-FD0B04FEE258} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
{D07C8309-996F-484E-BDA1-26BBAF69D29B} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
diff --git a/main/external/Newtonsoft.Json b/main/external/Newtonsoft.Json
deleted file mode 160000
-Subproject c1258cac02e540a7c22375f2c726c6c3a9a9f09
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
index 0c85dd6cd5..85d70f49fd 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
@@ -85,6 +85,9 @@
<Reference Include="System.Web" />
<Reference Include="System.ServiceModel" />
<Reference Include="Microsoft.CSharp" />
+ <Reference Include="Newtonsoft.Json">
+ <HintPath>..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="MonoDevelop.Core\StringParserService.cs" />
@@ -481,6 +484,7 @@
<None Include="Makefile.am" />
<None Include="MonoDevelop.Projects.Formats.MSBuild.Conditions\InvalidProjectFileException.cs" />
<None Include="BuildVariables.cs.in" />
+ <None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="MonoDevelop.Core.addin.xml">
@@ -527,10 +531,6 @@
<Project>{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}</Project>
<Name>Mono.Cecil.Mdb</Name>
</ProjectReference>
- <ProjectReference Include="..\..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Newtonsoft.Json.csproj">
- <Project>{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}</Project>
- <Name>Newtonsoft.Json</Name>
- </ProjectReference>
<ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
<Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
<Name>ICSharpCode.NRefactory</Name>
diff --git a/main/src/core/MonoDevelop.Core/packages.config b/main/src/core/MonoDevelop.Core/packages.config
new file mode 100644
index 0000000000..19c5e2c394
--- /dev/null
+++ b/main/src/core/MonoDevelop.Core/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
+</packages> \ No newline at end of file
diff --git a/main/tests/UserInterfaceTests/UserInterfaceTests.csproj b/main/tests/UserInterfaceTests/UserInterfaceTests.csproj
index bfad023db3..41f7fa891f 100644
--- a/main/tests/UserInterfaceTests/UserInterfaceTests.csproj
+++ b/main/tests/UserInterfaceTests/UserInterfaceTests.csproj
@@ -43,6 +43,9 @@
<Reference Include="nunit.core.interfaces">
<HintPath>..\..\external\mdtestharness\lib\nunit.core.interfaces.dll</HintPath>
</Reference>
+ <Reference Include="Newtonsoft.Json">
+ <HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="UITestBase.cs" />
@@ -80,12 +83,11 @@
<Project>{0413DB7D-8B35-423F-9752-D75C9225E7DE}</Project>
<Name>MonoDevelop.VersionControl.Git</Name>
</ProjectReference>
- <ProjectReference Include="..\..\external\Newtonsoft.Json\Src\Newtonsoft.Json\Newtonsoft.Json.csproj">
- <Project>{A9AE40FF-1A21-414A-9FE7-3BE13644CC6D}</Project>
- <Name>Newtonsoft.Json</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="New Folder\" />
</ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
</Project> \ No newline at end of file
diff --git a/main/tests/UserInterfaceTests/packages.config b/main/tests/UserInterfaceTests/packages.config
new file mode 100644
index 0000000000..27ac881e50
--- /dev/null
+++ b/main/tests/UserInterfaceTests/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
+</packages> \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-22 05:24:41 +0300