Skip to content

Commit

Permalink
Update Nuget packages (#318)
Browse files Browse the repository at this point in the history
- and path to core lib

Signed-off-by: José Simões <[email protected]>
  • Loading branch information
josesimoes authored May 11, 2017
1 parent a78cfb8 commit c058444
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion targets/os/win32/nanoCLR/CLRStartup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ struct Settings
// just need to update the path on the package folder as the version changes //
// ************************************************************************* //
vec.push_back(L"-load");
vec.push_back(L"..\\packages\\nanoFramework.CoreLibrary.1.0.0-preview011\\build\\mscorlib.pe");
vec.push_back(L"..\\packages\\nanoFramework.CoreLibrary.1.0.0-preview014\\build\\mscorlib.pe");

//vec.push_back(L"-load");
//vec.push_back(L"C:\\Program Files (x86)\\Microsoft .NET Micro Framework\\v4.4\\Assemblies\\le\\Microsoft.SPOT.Native.pe");
Expand Down
20 changes: 10 additions & 10 deletions targets/os/win32/netnf/TestApplication/NF.TestApplication.csproj
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-preview0035\build\nanoFramework.Tools.MSBuildSystem.props" Condition="Exists('..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0035\build\nanoFramework.Tools.MSBuildSystem.props')" />
<Import Project="..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0038\build\nanoFramework.Tools.MSBuildSystem.props" Condition="Exists('..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0038\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 @@ -46,18 +46,18 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="packages\nanoFramework.CoreLibrary.1.0.0-preview013\build\nanoFramework.CoreLibrary.targets" Condition="Exists('packages\nanoFramework.CoreLibrary.1.0.0-preview011\build\nanoFramework.CoreLibrary.targets')" />
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<Import Project="..\..\packages\nanoFramework.CoreLibrary.1.0.0-preview014\build\nanoFramework.CoreLibrary.targets" Condition="Exists('..\..\packages\nanoFramework.CoreLibrary.1.0.0-preview014\build\nanoFramework.CoreLibrary.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\nanoFramework.CoreLibrary.1.0.0-preview013\build\nanoFramework.CoreLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\nanoFramework.CoreLibrary.1.0.0-preview013\build\nanoFramework.CoreLibrary.targets'))" />
<Error Condition="!Exists('..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0035\build\nanoFramework.Tools.MSBuildSystem.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0035\build\nanoFramework.Tools.MSBuildSystem.props'))" />
<Error Condition="!Exists('..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0035\build\nanoFramework.Tools.MSBuildSystem.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0035\build\nanoFramework.Tools.MSBuildSystem.targets'))" />
<Error Condition="!Exists('..\..\packages\nanoFramework.CoreLibrary.1.0.0-preview014\build\nanoFramework.CoreLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\nanoFramework.CoreLibrary.1.0.0-preview014\build\nanoFramework.CoreLibrary.targets'))" />
<Error Condition="!Exists('..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0038\build\nanoFramework.Tools.MSBuildSystem.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0038\build\nanoFramework.Tools.MSBuildSystem.props'))" />
<Error Condition="!Exists('..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0038\build\nanoFramework.Tools.MSBuildSystem.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0038\build\nanoFramework.Tools.MSBuildSystem.targets'))" />
</Target>
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<Import Project="..\..\packages\nanoFramework.CoreLibrary.1.0.0-preview013\build\nanoFramework.CoreLibrary.targets" Condition="Exists('..\..\packages\nanoFramework.CoreLibrary.1.0.0-preview013\build\nanoFramework.CoreLibrary.targets')" />
<Import Project="..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0035\build\nanoFramework.Tools.MSBuildSystem.targets" Condition="Exists('..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0035\build\nanoFramework.Tools.MSBuildSystem.targets')" />
<Import Project="..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0038\build\nanoFramework.Tools.MSBuildSystem.targets" Condition="Exists('..\..\packages\nanoFramework.Tools.MSBuildSystem.1.0.0-preview0038\build\nanoFramework.Tools.MSBuildSystem.targets')" />
</Project>
4 changes: 2 additions & 2 deletions targets/os/win32/netnf/TestApplication/packages.config
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-preview013" targetFramework="net46" />
<package id="nanoFramework.Tools.MSBuildSystem" version="1.0.0-preview0035" targetFramework="net46" />
<package id="nanoFramework.CoreLibrary" version="1.0.0-preview014" targetFramework="net46" />
<package id="nanoFramework.Tools.MSBuildSystem" version="1.0.0-preview0038" targetFramework="net46" />
</packages>

0 comments on commit c058444

Please sign in to comment.