Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Nuget for MSBuild System #291

Merged
merged 3 commits into from
May 4, 2017
Merged

Update Nuget for MSBuild System #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
afb68f7
Update Nuget for MSBuild System
josesimoes May 4, 2017
3674cbd
Rework solution organisation
josesimoes May 4, 2017
c543877
Add nuget packages to Solution
josesimoes May 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions targets/os/win32/nanoCLR.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -58,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
Expand Down Expand Up @@ -305,10 +308,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}
Expand All @@ -318,8 +318,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}
Expand Down
8 changes: 4 additions & 4 deletions targets/os/win32/netnf/TestApplication/NF.TestApplication.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0029\build\nanoFramework.Tools.MSBuildSystem.props" Condition="Exists('..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0029\build\nanoFramework.Tools.MSBuildSystem.props')" />
<Import Project="..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0031\build\nanoFramework.Tools.MSBuildSystem.props" Condition="Exists('..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0031\build\nanoFramework.Tools.MSBuildSystem.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup Label="Globals">
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -52,13 +52,13 @@
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\nanoFramework.CoreLibrary.1.0.0-preview011\build\nanoFramework.CoreLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\nanoFramework.CoreLibrary.1.0.0-preview011\build\nanoFramework.CoreLibrary.targets'))" />
<Error Condition="!Exists('..\..\packages\nanoFramework.CoreLibrary.1.0.0-preview011\build\nanoFramework.CoreLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\nanoFramework.CoreLibrary.1.0.0-preview011\build\nanoFramework.CoreLibrary.targets'))" />
<Error Condition="!Exists('..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0029\build\nanoFramework.Tools.MSBuildSystem.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0029\build\nanoFramework.Tools.MSBuildSystem.props'))" />
<Error Condition="!Exists('..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0029\build\nanoFramework.Tools.MSBuildSystem.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0029\build\nanoFramework.Tools.MSBuildSystem.targets'))" />
<Error Condition="!Exists('..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0031\build\nanoFramework.Tools.MSBuildSystem.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0031\build\nanoFramework.Tools.MSBuildSystem.props'))" />
<Error Condition="!Exists('..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0031\build\nanoFramework.Tools.MSBuildSystem.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0031\build\nanoFramework.Tools.MSBuildSystem.targets'))" />
</Target>
<Import Project="..\..\packages\nanoFramework.CoreLibrary.1.0.0-preview011\build\nanoFramework.CoreLibrary.targets" Condition="Exists('..\..\packages\nanoFramework.CoreLibrary.1.0.0-preview011\build\nanoFramework.CoreLibrary.targets')" />
<Import Project="..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0029\build\nanoFramework.Tools.MSBuildSystem.targets" Condition="Exists('..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0029\build\nanoFramework.Tools.MSBuildSystem.targets')" />
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<Import Project="..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0031\build\nanoFramework.Tools.MSBuildSystem.targets" Condition="Exists('..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0031\build\nanoFramework.Tools.MSBuildSystem.targets')" />
</Project>
2 changes: 1 addition & 1 deletion targets/os/win32/netnf/TestApplication/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="nanoFramework.CoreLibrary" version="1.0.0-preview011" targetFramework="net46" />
<package id="nanoFramework.Tools.MSBuildSystem" version="1.0.0-preview0029" targetFramework="net46" />
<package id="nanoFramework.Tools.MSBuildSystem" version="1.0.0-preview0031" targetFramework="net46" />
</packages>
5 changes: 5 additions & 0 deletions targets/os/win32/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="nanoFramework.CoreLibrary" version="1.0.0-preview011" targetFramework="net46" />
<package id="nanoFramework.Tools.MSBuildSystem" version="1.0.0-preview0031" targetFramework="net46" />
</packages>