Skip to content

Commit e7c30d7

Browse files
authored
Fix references throughout the projects (#92)
***NO_CI***
1 parent bf354cd commit e7c30d7

File tree

5 files changed

+13
-29
lines changed

5 files changed

+13
-29
lines changed

Tests/Client/TestClient.nfproj

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
<RootNamespace>TestClient</RootNamespace>
1616
<AssemblyName>TestClient</AssemblyName>
1717
<TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
18-
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
19-
<RestoreLockedMode Condition="'$(TF_BUILD)' == 'True' or '$(ContinuousIntegrationBuild)' == 'True'">true</RestoreLockedMode>
2018
</PropertyGroup>
2119
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
2220
<ItemGroup>
@@ -26,34 +24,34 @@
2624
<Compile Include="Services\EnvironmentalSensorService.cs" />
2725
<Compile Include="Services\TestService.cs" />
2826
</ItemGroup>
29-
<ItemGroup>
30-
<None Include="packages.config" />
31-
</ItemGroup>
3227
<ItemGroup>
3328
<Reference Include="mscorlib, Version=1.15.6.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
3429
<HintPath>..\..\packages\nanoFramework.CoreLibrary.1.15.5\lib\mscorlib.dll</HintPath>
3530
<Private>True</Private>
3631
</Reference>
3732
<Reference Include="nanoFramework.Runtime.Events, Version=1.11.18.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
3833
<HintPath>..\..\packages\nanoFramework.Runtime.Events.1.11.18\lib\nanoFramework.Runtime.Events.dll</HintPath>
39-
<Private>True</Private>
4034
</Reference>
4135
<Reference Include="nanoFramework.Runtime.Native, Version=1.6.12.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
4236
<HintPath>..\..\packages\nanoFramework.Runtime.Native.1.6.12\lib\nanoFramework.Runtime.Native.dll</HintPath>
43-
<Private>True</Private>
4437
</Reference>
4538
<Reference Include="nanoFramework.System.Text, Version=1.2.54.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
4639
<HintPath>..\..\packages\nanoFramework.System.Text.1.2.54\lib\nanoFramework.System.Text.dll</HintPath>
47-
<Private>True</Private>
4840
</Reference>
4941
</ItemGroup>
5042
<ItemGroup>
5143
<ProjectReference Include="..\..\nanoFramework.Device.Bluetooth\nanoFramework.Device.Bluetooth.nfproj" />
5244
</ItemGroup>
45+
<ItemGroup>
46+
<Content Include="packages.lock.json" />
47+
</ItemGroup>
48+
<ItemGroup>
49+
<None Include="packages.config" />
50+
</ItemGroup>
5351
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
5452
<ProjectExtensions>
5553
<ProjectCapabilities>
5654
<ProjectConfigurationsDeclaredAsItems />
5755
</ProjectCapabilities>
5856
</ProjectExtensions>
59-
</Project>
57+
</Project>

Tests/NFUnitTest1/NFUnitTest1.nfproj

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,9 @@
3636
<ItemGroup>
3737
<Reference Include="mscorlib, Version=1.15.6.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
3838
<HintPath>..\..\packages\nanoFramework.CoreLibrary.1.15.5\lib\mscorlib.dll</HintPath>
39-
<Private>True</Private>
40-
</Reference>
41-
<Reference Include="nanoFramework.System.Runtime">
42-
<HintPath>..\..\packages\nanoFramework.System.Runtime.1.0.27\lib\nanoFramework.System.Runtime.dll</HintPath>
4339
</Reference>
44-
<Reference Include="nanoFramework.System.Text, Version=1.2.54.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
40+
<Reference Include="nanoFramework.System.Text, Version=1.2.54.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
4541
<HintPath>..\..\packages\nanoFramework.System.Text.1.2.54\lib\nanoFramework.System.Text.dll</HintPath>
46-
<Private>True</Private>
4742
</Reference>
4843
<Reference Include="nanoFramework.TestFramework, Version=2.1.107.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
4944
<HintPath>..\..\packages\nanoFramework.TestFramework.2.1.107\lib\nanoFramework.TestFramework.dll</HintPath>
@@ -71,4 +66,4 @@
7166
<ProjectConfigurationsDeclaredAsItems />
7267
</ProjectCapabilities>
7368
</ProjectExtensions>
74-
</Project>
69+
</Project>

Tests/NFUnitTest1/packages.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="nanoFramework.CoreLibrary" version="1.15.5" targetFramework="netnano1.0" />
4-
<package id="nanoFramework.System.Runtime" version="1.0.27" targetFramework="netnano1.0" />
54
<package id="nanoFramework.System.Text" version="1.2.54" targetFramework="netnano1.0" />
65
<package id="nanoFramework.TestFramework" version="2.1.107" targetFramework="netnano1.0" developmentDependency="true" />
76
</packages>

Tests/NFUnitTest1/packages.lock.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@
88
"resolved": "1.15.5",
99
"contentHash": "u2+GvAp1uxLrGdILACAZy+EVKOs28EQ52j8Lz7599egXZ3GBGejjnR2ofhjMQwzrJLlgtyrsx8nSLngDfJNsAg=="
1010
},
11-
"nanoFramework.System.Runtime": {
12-
"type": "Direct",
13-
"requested": "[1.0.27, 1.0.27]",
14-
"resolved": "1.0.27",
15-
"contentHash": "aMwvQV6AR+XlDc+dHR/fWWnTe5dc7LDaqZS0ccfmd31Y39dZnmX3iQB2wXWtZGvXLCC+obc3IF3Vc70FiG0raw=="
16-
},
1711
"nanoFramework.System.Text": {
1812
"type": "Direct",
1913
"requested": "[1.2.54, 1.2.54]",

nanoFramework.Device.Bluetooth/nanoFramework.Device.Bluetooth.nfproj

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,26 +133,24 @@
133133
<None Include="key.snk" />
134134
<None Include="packages.config" />
135135
</ItemGroup>
136+
<ItemGroup>
137+
<Content Include="packages.lock.json" />
138+
</ItemGroup>
136139
<ItemGroup>
137140
<Reference Include="mscorlib, Version=1.15.6.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
138141
<HintPath>..\packages\nanoFramework.CoreLibrary.1.15.5\lib\mscorlib.dll</HintPath>
139-
<Private>True</Private>
140142
</Reference>
141143
<Reference Include="nanoFramework.Runtime.Events, Version=1.11.18.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
142144
<HintPath>..\packages\nanoFramework.Runtime.Events.1.11.18\lib\nanoFramework.Runtime.Events.dll</HintPath>
143-
<Private>True</Private>
144145
</Reference>
145146
<Reference Include="nanoFramework.Runtime.Native, Version=1.6.12.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
146147
<HintPath>..\packages\nanoFramework.Runtime.Native.1.6.12\lib\nanoFramework.Runtime.Native.dll</HintPath>
147-
<Private>True</Private>
148148
</Reference>
149149
<Reference Include="nanoFramework.System.Collections, Version=1.5.31.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
150150
<HintPath>..\packages\nanoFramework.System.Collections.1.5.31\lib\nanoFramework.System.Collections.dll</HintPath>
151-
<Private>True</Private>
152151
</Reference>
153152
<Reference Include="nanoFramework.System.Text, Version=1.2.54.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
154153
<HintPath>..\packages\nanoFramework.System.Text.1.2.54\lib\nanoFramework.System.Text.dll</HintPath>
155-
<Private>True</Private>
156154
</Reference>
157155
</ItemGroup>
158156
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
@@ -169,4 +167,4 @@
169167
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.6.139\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.6.139\build\Nerdbank.GitVersioning.targets'))" />
170168
</Target>
171169
<Import Project="..\packages\Nerdbank.GitVersioning.3.6.139\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.6.139\build\Nerdbank.GitVersioning.targets')" />
172-
</Project>
170+
</Project>

0 commit comments

Comments
 (0)