From afb68f7e021f92e6561eba30bc6ff44b4c64f34e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Thu, 4 May 2017 18:47:23 +0100 Subject: [PATCH 1/3] Update Nuget for MSBuild System MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Simões --- .../win32/netnf/TestApplication/NF.TestApplication.csproj | 8 ++++---- targets/os/win32/netnf/TestApplication/packages.config | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/targets/os/win32/netnf/TestApplication/NF.TestApplication.csproj b/targets/os/win32/netnf/TestApplication/NF.TestApplication.csproj index e74be3b21b..91e90f2045 100644 --- a/targets/os/win32/netnf/TestApplication/NF.TestApplication.csproj +++ b/targets/os/win32/netnf/TestApplication/NF.TestApplication.csproj @@ -1,6 +1,6 @@  - + Debug @@ -52,13 +52,13 @@ - - + + - + \ No newline at end of file diff --git a/targets/os/win32/netnf/TestApplication/packages.config b/targets/os/win32/netnf/TestApplication/packages.config index 62a1b9908f..c758858030 100644 --- a/targets/os/win32/netnf/TestApplication/packages.config +++ b/targets/os/win32/netnf/TestApplication/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file From 3674cbde21edc0de991e137570ef34f14ccbf4b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Thu, 4 May 2017 19:00:27 +0100 Subject: [PATCH 2/3] Rework solution organisation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Simões --- targets/os/win32/nanoCLR.sln | 7 ------- 1 file changed, 7 deletions(-) diff --git a/targets/os/win32/nanoCLR.sln b/targets/os/win32/nanoCLR.sln index 70e09fcda3..302f89d66a 100644 --- a/targets/os/win32/nanoCLR.sln +++ b/targets/os/win32/nanoCLR.sln @@ -8,8 +8,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nanoCLR", "nanoCLR\nanoCLR. {247F9798-E240-4D5B-956D-35E5EAD21CE2} = {247F9798-E240-4D5B-956D-35E5EAD21CE2} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nanoCLR", "nanoCLR", "{11C6630D-C836-44FA-8A79-7574F175DAF2}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "..\..\..\src\CLR\Core\Core.vcxproj", "{89CF8BDB-9C8A-4D18-BC3E-4312C5BD34B1}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CorLib", "..\..\..\src\CLR\CorLib\CorLib.vcxproj", "{58E950CC-2FF6-423C-B006-A70A19272F20}" @@ -305,10 +303,7 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {89CF8BDB-9C8A-4D18-BC3E-4312C5BD34B1} = {11C6630D-C836-44FA-8A79-7574F175DAF2} - {58E950CC-2FF6-423C-B006-A70A19272F20} = {11C6630D-C836-44FA-8A79-7574F175DAF2} {A5E9AE41-F4FA-40CE-AD82-A7861EBA007B} = {76169580-0DE3-48D0-9545-8FC438C54094} - {2A840DC3-FFA8-4562-BD13-AB2B0BA02CB6} = {11C6630D-C836-44FA-8A79-7574F175DAF2} {131001E3-0201-451F-A87B-951D1C5C3EEE} = {76169580-0DE3-48D0-9545-8FC438C54094} {DD397EC4-844B-4B59-A67B-CAD6B46F1F00} = {76169580-0DE3-48D0-9545-8FC438C54094} {2337C4A4-3AB4-4014-9C29-9EBE32F4510E} = {76169580-0DE3-48D0-9545-8FC438C54094} @@ -318,8 +313,6 @@ Global {6DD5CA4F-2AE9-44D3-B9D7-A2A4A35FC5B2} = {76169580-0DE3-48D0-9545-8FC438C54094} {ED4C887A-EC09-465B-B5D9-075450ADC52D} = {76169580-0DE3-48D0-9545-8FC438C54094} {16BF6131-A3B8-4B97-B867-E45669FB48BD} = {76169580-0DE3-48D0-9545-8FC438C54094} - {76169580-0DE3-48D0-9545-8FC438C54094} = {11C6630D-C836-44FA-8A79-7574F175DAF2} - {2662E293-2538-40C2-9472-D936B1220EC2} = {11C6630D-C836-44FA-8A79-7574F175DAF2} {6DABCBF1-245A-4E76-BD36-8BC300C7DD82} = {2662E293-2538-40C2-9472-D936B1220EC2} {C97A9845-02DC-46E4-B219-BF5EA8FB28E3} = {2662E293-2538-40C2-9472-D936B1220EC2} {4646F661-9505-45C2-9573-8409A9DD1149} = {2662E293-2538-40C2-9472-D936B1220EC2} From c5438774ea2fc4e1c19ea5bd231f49dbdfd7561a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Thu, 4 May 2017 19:03:33 +0100 Subject: [PATCH 3/3] Add nuget packages to Solution MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - this is to ease solution restore Signed-off-by: José Simões --- targets/os/win32/nanoCLR.sln | 5 +++++ targets/os/win32/packages.config | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 targets/os/win32/packages.config diff --git a/targets/os/win32/nanoCLR.sln b/targets/os/win32/nanoCLR.sln index 302f89d66a..5b87786727 100644 --- a/targets/os/win32/nanoCLR.sln +++ b/targets/os/win32/nanoCLR.sln @@ -56,6 +56,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Serialization_stub", "..\.. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NF.TestApplication", "netnf\TestApplication\NF.TestApplication.csproj", "{247F9798-E240-4D5B-956D-35E5EAD21CE2}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{A5089650-2C81-4C04-ABA9-AABCEBDA3AA4}" + ProjectSection(SolutionItems) = preProject + packages.config = packages.config + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/targets/os/win32/packages.config b/targets/os/win32/packages.config new file mode 100644 index 0000000000..c758858030 --- /dev/null +++ b/targets/os/win32/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file