From 6b67c4ca0038c654bed6dbf49659832dd7882a2c Mon Sep 17 00:00:00 2001 From: josesimoes Date: Wed, 27 Nov 2024 13:24:45 +0000 Subject: [PATCH] Add nf debugger library to projects - Add nf-debugger repo as sub-module. - Add project to solutions (unloaded). --- .gitmodules | 3 +++ azure-pipelines.yml | 1 + nanoFramework.TestAdapter.sln | 12 ++++++++++++ nf-debugger | 1 + poc/NFUnit Test DemoByReference.sln | 12 ++++++++++++ 5 files changed, 29 insertions(+) create mode 100644 .gitmodules create mode 160000 nf-debugger diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..3d954980 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "nf-debugger"] + path = nf-debugger + url = https://github.com/nanoframework/nf-debugger diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 55fb2bf4..16792755 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -102,6 +102,7 @@ jobs: steps: - checkout: self + submodules: true - script: | git config --global user.email "nanoframework@outlook.com" diff --git a/nanoFramework.TestAdapter.sln b/nanoFramework.TestAdapter.sln index f2612c7a..72fe6662 100644 --- a/nanoFramework.TestAdapter.sln +++ b/nanoFramework.TestAdapter.sln @@ -15,6 +15,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution version.json = version.json EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nf-debugger", "nf-debugger", "{7DBC8C74-B06F-46B6-A1CB-77875B9207C8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nanoFramework.Tools.DebugLibrary.Net", "nf-debugger\nanoFramework.Tools.DebugLibrary.Net\nanoFramework.Tools.DebugLibrary.Net.csproj", "{A22843DD-F495-40DA-92EB-F8F4CAA13A0C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -25,15 +29,23 @@ Global {7B3026CA-1CBB-4F28-AC42-29CD22710877}.Debug|Any CPU.Build.0 = Debug|Any CPU {7B3026CA-1CBB-4F28-AC42-29CD22710877}.Release|Any CPU.ActiveCfg = Release|Any CPU {7B3026CA-1CBB-4F28-AC42-29CD22710877}.Release|Any CPU.Build.0 = Release|Any CPU + {A22843DD-F495-40DA-92EB-F8F4CAA13A0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A22843DD-F495-40DA-92EB-F8F4CAA13A0C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A22843DD-F495-40DA-92EB-F8F4CAA13A0C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A22843DD-F495-40DA-92EB-F8F4CAA13A0C}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {A22843DD-F495-40DA-92EB-F8F4CAA13A0C} = {7DBC8C74-B06F-46B6-A1CB-77875B9207C8} + EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8DC0B70D-F42F-4257-A336-60E93BE828D2} EndGlobalSection GlobalSection(SharedMSBuildProjectFiles) = preSolution source\TestFrameworkShared\TestFrameworkShared.projitems*{55f048b5-6739-43c5-a93d-db61db8e912f}*SharedItemsImports = 13 source\TestFrameworkShared\TestFrameworkShared.projitems*{7b3026ca-1cbb-4f28-ac42-29cd22710877}*SharedItemsImports = 5 + nf-debugger\nanoFramework.Tools.DebugLibrary.Shared\nanoFramework.Tools.DebugLibrary.Net.projitems*{a22843dd-f495-40da-92eb-f8f4caa13a0c}*SharedItemsImports = 5 EndGlobalSection EndGlobal diff --git a/nf-debugger b/nf-debugger new file mode 160000 index 00000000..1b5012bd --- /dev/null +++ b/nf-debugger @@ -0,0 +1 @@ +Subproject commit 1b5012bd6869e84122940d1f1d8eaf438301b419 diff --git a/poc/NFUnit Test DemoByReference.sln b/poc/NFUnit Test DemoByReference.sln index eaf4f172..b42177e3 100644 --- a/poc/NFUnit Test DemoByReference.sln +++ b/poc/NFUnit Test DemoByReference.sln @@ -16,6 +16,10 @@ Project("{11A8DD76-328B-46DF-9F39-F559912D0360}") = "nanoFramework.UnitTestLaunc EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nanoFramework.TestAdapter", "..\source\TestAdapter\nanoFramework.TestAdapter.csproj", "{F967DD1C-F1E4-4FE0-AFCD-15544CED3B91}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nf-debugger", "nf-debugger", "{751D2DBB-0E46-48E4-8E3B-28A258C7C4F6}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nanoFramework.Tools.DebugLibrary.Net", "..\nf-debugger\nanoFramework.Tools.DebugLibrary.Net\nanoFramework.Tools.DebugLibrary.Net.csproj", "{7579C679-471D-4B10-AB26-D314A8245D34}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -44,15 +48,23 @@ Global {F967DD1C-F1E4-4FE0-AFCD-15544CED3B91}.Debug|Any CPU.Build.0 = Debug|Any CPU {F967DD1C-F1E4-4FE0-AFCD-15544CED3B91}.Release|Any CPU.ActiveCfg = Release|Any CPU {F967DD1C-F1E4-4FE0-AFCD-15544CED3B91}.Release|Any CPU.Build.0 = Release|Any CPU + {7579C679-471D-4B10-AB26-D314A8245D34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7579C679-471D-4B10-AB26-D314A8245D34}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7579C679-471D-4B10-AB26-D314A8245D34}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7579C679-471D-4B10-AB26-D314A8245D34}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {7579C679-471D-4B10-AB26-D314A8245D34} = {751D2DBB-0E46-48E4-8E3B-28A258C7C4F6} + EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {280DA13F-AFF7-4D5D-BA7F-BFC5E8F19995} EndGlobalSection GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\source\TestFrameworkShared\TestFrameworkShared.projitems*{55f048b5-6739-43c5-a93d-db61db8e912f}*SharedItemsImports = 13 + ..\nf-debugger\nanoFramework.Tools.DebugLibrary.Shared\nanoFramework.Tools.DebugLibrary.Net.projitems*{7579c679-471d-4b10-ab26-d314a8245d34}*SharedItemsImports = 5 ..\source\TestFrameworkShared\TestFrameworkShared.projitems*{f967dd1c-f1e4-4fe0-afcd-15544ced3b91}*SharedItemsImports = 5 EndGlobalSection EndGlobal