microsoft
/
vscode-mono-debug
зеркало из https://github.com/microsoft/vscode-mono-debug.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Use mono source for debugger-libs (#64)

This commit is contained in:
Jonathan Peppers 2020-07-20 07:31:13 -05:00 коммит произвёл GitHub
Родитель 21a0b1433e
Коммит 13c64be219
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
9 изменённых файлов: 76 добавлений и 20 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
.gitignore поставляемый
Просмотреть файл

@ -12,4 +12,4 @@
*.exe.mdb
mono-debug.userprefs
npm-debug.log
.vs/mono-debug/v15/.suo
.vs/

6
.gitmodules поставляемый Normal file
Просмотреть файл

@ -0,0 +1,6 @@
[submodule "external/debugger-libs"]
path = external/debugger-libs
url = https://github.com/mono/debugger-libs.git
[submodule "external/nrefactory"]
path = external/nrefactory
url = https://github.com/xamarin/NRefactory.git

3
.travis.yml
Просмотреть файл

@ -6,7 +6,7 @@ mono:
solution: mono-debug.sln
git:
submodules: false
submodules: true
before_install:
- git clone https://github.com/creationix/nvm.git ./.nvm
@ -16,6 +16,7 @@ before_install:
install:
- nuget restore mono-debug.sln
- nuget restore external/debugger-libs/debugger-libs.sln
- npm install
script:

1
external/debugger-libs поставляемый Submodule

@ -0,0 +1 @@
Subproject commit b93af7bda25ba6e384dccbea8a664c01b341c5af

1
external/nrefactory поставляемый Submodule

@ -0,0 +1 @@
Subproject commit 60ac8e99c51e43a58a4dc124b9680fb73c2f974b

33
mono-debug.csproj
Просмотреть файл

@ -6,7 +6,7 @@
<ProjectGuid>{6B18B22D-6B1A-4BF9-BD46-DF84EE2181C5}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>VSCodeDebug</RootNamespace>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
@ -40,22 +40,19 @@
<HintPath>packages\ICSharpCode.NRefactory.5.5.1\lib\Net40\ICSharpCode.NRefactory.CSharp.dll</HintPath>
</Reference>
<Reference Include="Mono.Cecil">
<HintPath>packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll</HintPath>
<HintPath>packages\Mono.Cecil.0.10.1\lib\net40\Mono.Cecil.dll</HintPath>
</Reference>
<Reference Include="Mono.Cecil.Mdb">
<HintPath>packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Mdb.dll</HintPath>
<HintPath>packages\Mono.Cecil.0.10.1\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
</Reference>
<Reference Include="Mono.Debugger.Soft">
<HintPath>packages\Mono.Debugger.Soft.1.0.20161020.46\lib\net40\Mono.Debugger.Soft.dll</HintPath>
<Reference Include="Mono.Cecil.Pdb">
<HintPath>packages\Mono.Cecil.0.10.1\lib\net40\Mono.Cecil.Pdb.dll</HintPath>
</Reference>
<Reference Include="Mono.Debugging.Soft">
<HintPath>packages\Mono.Debugging.Soft.1.0.20161020.46\lib\net40\Mono.Debugging.Soft.dll</HintPath>
</Reference>
<Reference Include="Mono.Debugging">
<HintPath>packages\Mono.Debugging.1.0.20161020.46\lib\net40\Mono.Debugging.dll</HintPath>
<Reference Include="Mono.Cecil.Rocks">
<HintPath>packages\Mono.Cecil.0.10.1\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@ -82,4 +79,18 @@
<ItemGroup>
<Folder Include="src\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="external\debugger-libs\Mono.Debugger.Soft\Mono.Debugger.Soft.csproj">
<Project>{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}</Project>
<Name>Mono.Debugger.Soft</Name>
</ProjectReference>
<ProjectReference Include="external\debugger-libs\Mono.Debugging\Mono.Debugging.csproj">
<Project>{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}</Project>
<Name>Mono.Debugging</Name>
</ProjectReference>
<ProjectReference Include="external\debugger-libs\Mono.Debugging.Soft\Mono.Debugging.Soft.csproj">
<Project>{DE40756E-57F6-4AF2-B155-55E3A88CCED8}</Project>
<Name>Mono.Debugging.Soft</Name>
</ProjectReference>
</ItemGroup>
</Project>

39
mono-debug.sln
Просмотреть файл

@ -5,6 +5,18 @@ VisualStudioVersion = 14.0.22823.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mono-debug", "mono-debug.csproj", "{6B18B22D-6B1A-4BF9-BD46-DF84EE2181C5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Debugging.Soft", "external\debugger-libs\Mono.Debugging.Soft\Mono.Debugging.Soft.csproj", "{DE40756E-57F6-4AF2-B155-55E3A88CCED8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Debugger.Soft", "external\debugger-libs\Mono.Debugger.Soft\Mono.Debugger.Soft.csproj", "{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Debugging", "external\debugger-libs\Mono.Debugging\Mono.Debugging.csproj", "{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "external", "external", "{E023475B-7BCC-48DC-9D39-609F6AC4BC37}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory", "external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj", "{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.CSharp", "external\nrefactory\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj", "{53DCA265-3C3C-42F9-B647-F72BA678122B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -15,6 +27,26 @@ Global
{6B18B22D-6B1A-4BF9-BD46-DF84EE2181C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6B18B22D-6B1A-4BF9-BD46-DF84EE2181C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6B18B22D-6B1A-4BF9-BD46-DF84EE2181C5}.Release|Any CPU.Build.0 = Release|Any CPU
{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DE40756E-57F6-4AF2-B155-55E3A88CCED8}.Release|Any CPU.Build.0 = Release|Any CPU
{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Release|Any CPU.Build.0 = Release|Any CPU
{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2}.Release|Any CPU.Build.0 = Release|Any CPU
{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|Any CPU.Build.0 = Release|Any CPU
{53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
Policies = $0
@ -63,4 +95,11 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{372E8E3E-29D5-4B4D-88A2-4711CD628C4E} = {E023475B-7BCC-48DC-9D39-609F6AC4BC37}
{90C99ADB-7D4B-4EB4-98C2-40BD1B14C7D2} = {E023475B-7BCC-48DC-9D39-609F6AC4BC37}
{DE40756E-57F6-4AF2-B155-55E3A88CCED8} = {E023475B-7BCC-48DC-9D39-609F6AC4BC37}
{3B2A5653-EC97-4001-BB9B-D90F1AF2C371} = {E023475B-7BCC-48DC-9D39-609F6AC4BC37}
{53DCA265-3C3C-42F9-B647-F72BA678122B} = {E023475B-7BCC-48DC-9D39-609F6AC4BC37}
EndGlobalSection
EndGlobal

7
packages.config
Просмотреть файл

@ -1,9 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ICSharpCode.NRefactory" version="5.5.1" targetFramework="net45" />
<package id="Mono.Cecil" version="0.9.6.1" targetFramework="net45" />
<package id="Mono.Debugger.Soft" version="1.0.20161020.46" targetFramework="net45" />
<package id="Mono.Debugging" version="1.0.20161020.46" targetFramework="net45" />
<package id="Mono.Debugging.Soft" version="1.0.20161020.46" targetFramework="net45" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
<package id="Mono.Cecil" version="0.10.1" targetFramework="net472" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net472" />
</packages>

4
src/typescript/tests/adapter.test.ts
Просмотреть файл

@ -83,12 +83,12 @@ suite('Node Debug Adapter', () => {
test('should stop on debugger statement', () => {
const PROGRAM = Path.join(DATA_ROOT, 'simple_break/Program.exe');
const DEBUGGER_LINE = 10;
const DEBUGGER_LINE = 11;
return Promise.all([
dc.configurationSequence(),
dc.launch({ program: PROGRAM }),
dc.assertStoppedLocation('step', DEBUGGER_LINE)
dc.assertStoppedLocation('step', { line: DEBUGGER_LINE })
]);
});
});