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.

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

Bumps nanoFramework.CoreLibrary from 1.1.1 to 1.2.0 #49

Merged
merged 1 commit into from
Apr 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion source/nanoFramework.Runtime.Native.DELIVERABLES.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<tags>
</tags>
<dependencies>
<dependency id="nanoFramework.CoreLibrary" version="[1.1.1]" />
<dependency id="nanoFramework.CoreLibrary" version="[1.2.0]" />
</dependencies>
</metadata>
<files>
Expand Down
2 changes: 1 addition & 1 deletion source/nanoFramework.Runtime.Native.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<summary>nanoFramework.Runtime.Native assembly for nanoFramework C# projects</summary>
<tags>nanoFramework C# csharp netmf netnf nanoFramework.Runtime.Native</tags>
<dependencies>
<dependency id="nanoFramework.CoreLibrary" version="[1.1.1]" />
<dependency id="nanoFramework.CoreLibrary" version="[1.2.0]" />
</dependencies>
</metadata>
<files>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
</NFMDP_PE_ExcludeClassByName>
</ItemGroup>
<ItemGroup>
<NFMDP_PE_LoadHints Include="..\packages\nanoFramework.CoreLibrary.1.1.1\lib\mscorlib.dll">
<NFMDP_PE_LoadHints Include="..\packages\nanoFramework.CoreLibrary.1.2.0\lib\mscorlib.dll">
<InProject>false</InProject>
</NFMDP_PE_LoadHints>
</ItemGroup>
Expand All @@ -72,8 +72,8 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Reference Include="mscorlib, Version=1.1.1.7, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\packages\nanoFramework.CoreLibrary.1.1.1\lib\mscorlib.dll</HintPath>
<Reference Include="mscorlib, Version=1.2.0.2, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>..\packages\nanoFramework.CoreLibrary.1.2.0\lib\mscorlib.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
Expand All @@ -83,11 +83,11 @@
<ProjectConfigurationsDeclaredAsItems />
</ProjectCapabilities>
</ProjectExtensions>
<Import Project="..\packages\Nerdbank.GitVersioning.3.0.4-beta\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.0.4-beta\build\Nerdbank.GitVersioning.targets')" />
<Import Project="..\packages\Nerdbank.GitVersioning.3.0.6-beta\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.0.6-beta\build\Nerdbank.GitVersioning.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable 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\Nerdbank.GitVersioning.3.0.4-beta\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.0.4-beta\build\Nerdbank.GitVersioning.targets'))" />
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.0.6-beta\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.0.6-beta\build\Nerdbank.GitVersioning.targets'))" />
</Target>
</Project>
4 changes: 2 additions & 2 deletions source/nanoFramework.Runtime.Native/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.1.1" targetFramework="netnanoframework10" />
<package id="Nerdbank.GitVersioning" version="3.0.4-beta" developmentDependency="true" targetFramework="netnanoframework10" />
<package id="nanoFramework.CoreLibrary" version="1.2.0" targetFramework="netnanoframework10" />
<package id="Nerdbank.GitVersioning" version="3.0.6-beta" developmentDependency="true" targetFramework="netnanoframework10" />
</packages>