Skip to content

Commit 1559560

Browse files
CoryCharltonCoryCharlton
authored
Updating namespaces for nanoFramework.DependencyInjection (#332)
1 parent 9086696 commit 1559560

26 files changed

+78
-126
lines changed

‎samples/DependencyInjection/Simple/Program.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
//
55

66
using System.Diagnostics;
7-
8-
using nanoFramework.DependencyInjection;
7+
using Microsoft.Extensions.DependencyInjection;
98

109
namespace nanoFramework.Simple
1110
{
@@ -24,9 +23,7 @@ public static void Main()
2423
service.ServiceObject.Three = "3";
2524

2625
// create an updated instance of the root object
27-
var instance = (RootObject)ActivatorUtilities.CreateInstance(
28-
serviceProvider, typeof(RootObject), 1, "2"
29-
);
26+
var instance = (RootObject)ActivatorUtilities.CreateInstance(serviceProvider, typeof(RootObject), 1, "2");
3027

3128
Debug.WriteLine($"One: {instance.One}");
3229
Debug.WriteLine($"Two: {instance.Two}");

‎samples/DependencyInjection/Simple/Simple.nfproj

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,18 @@
2121
<Compile Include="Program.cs" />
2222
<Compile Include="Properties\AssemblyInfo.cs" />
2323
</ItemGroup>
24-
<ItemGroup>
25-
<None Include="packages.config" />
26-
</ItemGroup>
2724
<ItemGroup>
2825
<Reference Include="mscorlib, Version=1.14.3.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
2926
<HintPath>packages\nanoFramework.CoreLibrary.1.14.2\lib\mscorlib.dll</HintPath>
3027
<Private>True</Private>
3128
</Reference>
32-
<Reference Include="nanoFramework.DependencyInjection, Version=1.0.35.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
33-
<HintPath>packages\nanoFramework.DependencyInjection.1.0.35\lib\nanoFramework.DependencyInjection.dll</HintPath>
34-
<Private>True</Private>
29+
<Reference Include="nanoFramework.DependencyInjection">
30+
<HintPath>packages\nanoFramework.DependencyInjection.1.1.1\lib\nanoFramework.DependencyInjection.dll</HintPath>
3531
</Reference>
3632
</ItemGroup>
33+
<ItemGroup>
34+
<None Include="packages.config" />
35+
</ItemGroup>
3736
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
3837
<ProjectExtensions>
3938
<ProjectCapabilities>

‎samples/DependencyInjection/Simple/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="nanoFramework.CoreLibrary" version="1.14.2" targetFramework="netnano1.0" />
4-
<package id="nanoFramework.DependencyInjection" version="1.0.35" targetFramework="netnano1.0" />
4+
<package id="nanoFramework.DependencyInjection" version="1.1.1" targetFramework="netnano1.0" />
55
</packages>

‎samples/DependencyInjection/SlowBlink/Program.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
// See LICENSE file in the project root for full license information.
44
//
55

6+
using Microsoft.Extensions.DependencyInjection;
67
using nanoFramework.Logging.Debug;
7-
using nanoFramework.DependencyInjection;
8-
98
using Microsoft.Extensions.Logging;
109

1110
namespace nanoFramework.SlowBlink

‎samples/DependencyInjection/SlowBlink/SlowBlink.nfproj

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,20 @@
2525
<Compile Include="Properties\AssemblyInfo.cs" />
2626
</ItemGroup>
2727
<ItemGroup>
28-
<Reference Include="mscorlib, Version=1.14.3.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
28+
<Reference Include="mscorlib">
2929
<HintPath>packages\nanoFramework.CoreLibrary.1.14.2\lib\mscorlib.dll</HintPath>
30-
<Private>True</Private>
3130
</Reference>
32-
<Reference Include="nanoFramework.DependencyInjection, Version=1.0.35.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
33-
<HintPath>packages\nanoFramework.DependencyInjection.1.0.35\lib\nanoFramework.DependencyInjection.dll</HintPath>
34-
<Private>True</Private>
31+
<Reference Include="nanoFramework.DependencyInjection">
32+
<HintPath>packages\nanoFramework.DependencyInjection.1.1.1\lib\nanoFramework.DependencyInjection.dll</HintPath>
3533
</Reference>
36-
<Reference Include="nanoFramework.Logging, Version=1.1.63.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
34+
<Reference Include="nanoFramework.Logging">
3735
<HintPath>packages\nanoFramework.Logging.1.1.63\lib\nanoFramework.Logging.dll</HintPath>
38-
<Private>True</Private>
3936
</Reference>
40-
<Reference Include="nanoFramework.Runtime.Events, Version=1.11.6.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
37+
<Reference Include="nanoFramework.Runtime.Events">
4138
<HintPath>packages\nanoFramework.Runtime.Events.1.11.6\lib\nanoFramework.Runtime.Events.dll</HintPath>
42-
<Private>True</Private>
4339
</Reference>
44-
<Reference Include="System.Device.Gpio, Version=1.1.28.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
40+
<Reference Include="System.Device.Gpio">
4541
<HintPath>packages\nanoFramework.System.Device.Gpio.1.1.28\lib\System.Device.Gpio.dll</HintPath>
46-
<Private>True</Private>
4742
</Reference>
4843
</ItemGroup>
4944
<ItemGroup>

‎samples/DependencyInjection/SlowBlink/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="nanoFramework.CoreLibrary" version="1.14.2" targetFramework="netnano1.0" />
4-
<package id="nanoFramework.DependencyInjection" version="1.0.35" targetFramework="netnano1.0" />
4+
<package id="nanoFramework.DependencyInjection" version="1.1.1" targetFramework="netnano1.0" />
55
<package id="nanoFramework.Logging" version="1.1.63" targetFramework="netnano1.0" />
66
<package id="nanoFramework.Runtime.Events" version="1.11.6" targetFramework="netnano1.0" />
77
<package id="nanoFramework.System.Device.Gpio" version="1.1.28" targetFramework="netnano1.0" />

‎samples/Hosting/Logging/Extensions/ServiceCollectionExtensions.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
//
55

66
using System;
7-
7+
using Microsoft.Extensions.DependencyInjection;
88
using nanoFramework.Logging.Debug;
9-
using nanoFramework.DependencyInjection;
10-
119
using Microsoft.Extensions.Logging;
1210

1311
namespace nanoFramework.Logging

‎samples/Hosting/Logging/Logging.nfproj

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,11 @@
2828
<HintPath>packages\nanoFramework.CoreLibrary.1.14.2\lib\mscorlib.dll</HintPath>
2929
<Private>True</Private>
3030
</Reference>
31-
<Reference Include="nanoFramework.DependencyInjection, Version=1.0.35.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
32-
<HintPath>packages\nanoFramework.DependencyInjection.1.0.35\lib\nanoFramework.DependencyInjection.dll</HintPath>
33-
<Private>True</Private>
31+
<Reference Include="nanoFramework.DependencyInjection">
32+
<HintPath>packages\nanoFramework.DependencyInjection.1.1.1\lib\nanoFramework.DependencyInjection.dll</HintPath>
3433
</Reference>
35-
<Reference Include="nanoFramework.Hosting, Version=1.0.25.62121, Culture=neutral, PublicKeyToken=c07d481e9758c731">
36-
<HintPath>packages\nanoFramework.Hosting.1.0.25\lib\nanoFramework.Hosting.dll</HintPath>
37-
<Private>True</Private>
34+
<Reference Include="nanoFramework.Hosting">
35+
<HintPath>packages\nanoFramework.Hosting.1.0.38\lib\nanoFramework.Hosting.dll</HintPath>
3836
</Reference>
3937
<Reference Include="nanoFramework.Logging, Version=1.1.63.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
4038
<HintPath>packages\nanoFramework.Logging.1.1.63\lib\nanoFramework.Logging.dll</HintPath>

‎samples/Hosting/Logging/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Reflection;
2-
using System.Runtime.CompilerServices;
32
using System.Runtime.InteropServices;
43

54
// General Information about an assembly is controlled through the following

‎samples/Hosting/Logging/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="nanoFramework.CoreLibrary" version="1.14.2" targetFramework="netnano1.0" />
4-
<package id="nanoFramework.DependencyInjection" version="1.0.35" targetFramework="netnano1.0" />
5-
<package id="nanoFramework.Hosting" version="1.0.25" targetFramework="netnano1.0" />
4+
<package id="nanoFramework.DependencyInjection" version="1.1.1" targetFramework="netnano1.0" />
5+
<package id="nanoFramework.Hosting" version="1.0.38" targetFramework="netnano1.0" />
66
<package id="nanoFramework.Logging" version="1.1.63" targetFramework="netnano1.0" />
77
</packages>

0 commit comments

Comments
 (0)