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

Jump to bottom

Updating namespaces for nanoFramework.DependencyInjection #332

Merged
merged 2 commits into from
Nov 8, 2023
Merged

Updating namespaces for nanoFramework.DependencyInjection #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cd0a51
Updating namespaces for #nanoframework/nanoFramework.DependencyInject…
CoryCharlton Nov 4, 2023
100eeb9
Updating nanoFramework.DependencyInjection namespaces
CoryCharlton Nov 6, 2023
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
7 changes: 2 additions & 5 deletions samples/DependencyInjection/Simple/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
//

using System.Diagnostics;

using nanoFramework.DependencyInjection;
using Microsoft.Extensions.DependencyInjection;

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

// create an updated instance of the root object
var instance = (RootObject)ActivatorUtilities.CreateInstance(
serviceProvider, typeof(RootObject), 1, "2"
);
var instance = (RootObject)ActivatorUtilities.CreateInstance(serviceProvider, typeof(RootObject), 1, "2");

Debug.WriteLine($"One: {instance.One}");
Debug.WriteLine($"Two: {instance.Two}");
Expand Down
11 changes: 5 additions & 6 deletions samples/DependencyInjection/Simple/Simple.nfproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,18 @@
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Reference Include="mscorlib, Version=1.14.3.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>packages\nanoFramework.CoreLibrary.1.14.2\lib\mscorlib.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nanoFramework.DependencyInjection, Version=1.0.35.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>packages\nanoFramework.DependencyInjection.1.0.35\lib\nanoFramework.DependencyInjection.dll</HintPath>
<Private>True</Private>
<Reference Include="nanoFramework.DependencyInjection">
josesimoes marked this conversation as resolved.
Show resolved Hide resolved
<HintPath>packages\nanoFramework.DependencyInjection.1.1.1\lib\nanoFramework.DependencyInjection.dll</HintPath>
josesimoes marked this conversation as resolved.
Show resolved Hide resolved
</Reference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
<ProjectExtensions>
<ProjectCapabilities>
Expand Down
2 changes: 1 addition & 1 deletion samples/DependencyInjection/Simple/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.14.2" targetFramework="netnano1.0" />
<package id="nanoFramework.DependencyInjection" version="1.0.35" targetFramework="netnano1.0" />
<package id="nanoFramework.DependencyInjection" version="1.1.1" targetFramework="netnano1.0" />
</packages>
3 changes: 1 addition & 2 deletions samples/DependencyInjection/SlowBlink/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
// See LICENSE file in the project root for full license information.
//

using Microsoft.Extensions.DependencyInjection;
using nanoFramework.Logging.Debug;
using nanoFramework.DependencyInjection;

using Microsoft.Extensions.Logging;

namespace nanoFramework.SlowBlink
Expand Down
17 changes: 6 additions & 11 deletions samples/DependencyInjection/SlowBlink/SlowBlink.nfproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,20 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="mscorlib, Version=1.14.3.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<Reference Include="mscorlib">
josesimoes marked this conversation as resolved.
Show resolved Hide resolved
<HintPath>packages\nanoFramework.CoreLibrary.1.14.2\lib\mscorlib.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nanoFramework.DependencyInjection, Version=1.0.35.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>packages\nanoFramework.DependencyInjection.1.0.35\lib\nanoFramework.DependencyInjection.dll</HintPath>
<Private>True</Private>
<Reference Include="nanoFramework.DependencyInjection">
<HintPath>packages\nanoFramework.DependencyInjection.1.1.1\lib\nanoFramework.DependencyInjection.dll</HintPath>
</Reference>
<Reference Include="nanoFramework.Logging, Version=1.1.63.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<Reference Include="nanoFramework.Logging">
<HintPath>packages\nanoFramework.Logging.1.1.63\lib\nanoFramework.Logging.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nanoFramework.Runtime.Events, Version=1.11.6.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<Reference Include="nanoFramework.Runtime.Events">
<HintPath>packages\nanoFramework.Runtime.Events.1.11.6\lib\nanoFramework.Runtime.Events.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Device.Gpio, Version=1.1.28.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<Reference Include="System.Device.Gpio">
<HintPath>packages\nanoFramework.System.Device.Gpio.1.1.28\lib\System.Device.Gpio.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/DependencyInjection/SlowBlink/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="nanoFramework.CoreLibrary" version="1.14.2" targetFramework="netnano1.0" />
<package id="nanoFramework.DependencyInjection" version="1.0.35" targetFramework="netnano1.0" />
<package id="nanoFramework.DependencyInjection" version="1.1.1" targetFramework="netnano1.0" />
<package id="nanoFramework.Logging" version="1.1.63" targetFramework="netnano1.0" />
<package id="nanoFramework.Runtime.Events" version="1.11.6" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Device.Gpio" version="1.1.28" targetFramework="netnano1.0" />
Expand Down
4 changes: 1 addition & 3 deletions samples/Hosting/Logging/Extensions/ServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@
//

using System;

using Microsoft.Extensions.DependencyInjection;
using nanoFramework.Logging.Debug;
using nanoFramework.DependencyInjection;

using Microsoft.Extensions.Logging;

namespace nanoFramework.Logging
Expand Down
10 changes: 4 additions & 6 deletions samples/Hosting/Logging/Logging.nfproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,11 @@
<HintPath>packages\nanoFramework.CoreLibrary.1.14.2\lib\mscorlib.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nanoFramework.DependencyInjection, Version=1.0.35.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>packages\nanoFramework.DependencyInjection.1.0.35\lib\nanoFramework.DependencyInjection.dll</HintPath>
<Private>True</Private>
<Reference Include="nanoFramework.DependencyInjection">
<HintPath>packages\nanoFramework.DependencyInjection.1.1.1\lib\nanoFramework.DependencyInjection.dll</HintPath>
</Reference>
<Reference Include="nanoFramework.Hosting, Version=1.0.25.62121, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>packages\nanoFramework.Hosting.1.0.25\lib\nanoFramework.Hosting.dll</HintPath>
<Private>True</Private>
<Reference Include="nanoFramework.Hosting">
<HintPath>packages\nanoFramework.Hosting.1.0.38\lib\nanoFramework.Hosting.dll</HintPath>
</Reference>
<Reference Include="nanoFramework.Logging, Version=1.1.63.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>packages\nanoFramework.Logging.1.1.63\lib\nanoFramework.Logging.dll</HintPath>
Expand Down
1 change: 0 additions & 1 deletion samples/Hosting/Logging/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
Expand Down
4 changes: 2 additions & 2 deletions samples/Hosting/Logging/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="nanoFramework.CoreLibrary" version="1.14.2" targetFramework="netnano1.0" />
<package id="nanoFramework.DependencyInjection" version="1.0.35" targetFramework="netnano1.0" />
<package id="nanoFramework.Hosting" version="1.0.25" targetFramework="netnano1.0" />
<package id="nanoFramework.DependencyInjection" version="1.1.1" targetFramework="netnano1.0" />
<package id="nanoFramework.Hosting" version="1.0.38" targetFramework="netnano1.0" />
<package id="nanoFramework.Logging" version="1.1.63" targetFramework="netnano1.0" />
</packages>
2 changes: 1 addition & 1 deletion samples/Hosting/SensorQueue/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// See LICENSE file in the project root for full license information.
//

using Microsoft.Extensions.DependencyInjection;
using nanoFramework.Hosting;
using nanoFramework.DependencyInjection;

namespace Hosting
{
Expand Down
22 changes: 9 additions & 13 deletions samples/Hosting/SensorQueue/SensorQueue.nfproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,26 +26,22 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Reference Include="mscorlib, Version=1.14.3.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<Reference Include="mscorlib">
<HintPath>packages\nanoFramework.CoreLibrary.1.14.2\lib\mscorlib.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nanoFramework.DependencyInjection, Version=1.0.35.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>packages\nanoFramework.DependencyInjection.1.0.35\lib\nanoFramework.DependencyInjection.dll</HintPath>
<Private>True</Private>
<Reference Include="nanoFramework.DependencyInjection">
<HintPath>packages\nanoFramework.DependencyInjection.1.1.1\lib\nanoFramework.DependencyInjection.dll</HintPath>
</Reference>
<Reference Include="nanoFramework.Hosting, Version=1.0.25.62121, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>packages\nanoFramework.Hosting.1.0.25\lib\nanoFramework.Hosting.dll</HintPath>
<Private>True</Private>
<Reference Include="nanoFramework.Hosting">
<HintPath>packages\nanoFramework.Hosting.1.0.38\lib\nanoFramework.Hosting.dll</HintPath>
</Reference>
<Reference Include="nanoFramework.System.Collections, Version=1.5.18.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<Reference Include="nanoFramework.System.Collections">
<HintPath>packages\nanoFramework.System.Collections.1.5.18\lib\nanoFramework.System.Collections.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
<ProjectExtensions>
<ProjectCapabilities>
Expand Down
4 changes: 2 additions & 2 deletions samples/Hosting/SensorQueue/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="nanoFramework.CoreLibrary" version="1.14.2" targetFramework="netnano1.0" />
<package id="nanoFramework.DependencyInjection" version="1.0.35" targetFramework="netnano1.0" />
<package id="nanoFramework.Hosting" version="1.0.25" targetFramework="netnano1.0" />
<package id="nanoFramework.DependencyInjection" version="1.1.1" targetFramework="netnano1.0" />
<package id="nanoFramework.Hosting" version="1.0.38" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Collections" version="1.5.18" targetFramework="netnano1.0" />
</packages>
3 changes: 1 addition & 2 deletions samples/Hosting/Simple/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
using System.Threading;
using System.Device.Gpio;
using System.Diagnostics;

using Microsoft.Extensions.DependencyInjection;
using nanoFramework.Hosting;
using nanoFramework.DependencyInjection;

namespace Hosting
{
Expand Down
19 changes: 7 additions & 12 deletions samples/Hosting/Simple/Simple.nfproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,25 +22,20 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="mscorlib, Version=1.14.3.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<Reference Include="mscorlib">
<HintPath>packages\nanoFramework.CoreLibrary.1.14.2\lib\mscorlib.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nanoFramework.DependencyInjection, Version=1.0.35.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>packages\nanoFramework.DependencyInjection.1.0.35\lib\nanoFramework.DependencyInjection.dll</HintPath>
<Private>True</Private>
<Reference Include="nanoFramework.DependencyInjection">
<HintPath>packages\nanoFramework.DependencyInjection.1.1.1\lib\nanoFramework.DependencyInjection.dll</HintPath>
</Reference>
<Reference Include="nanoFramework.Hosting, Version=1.0.25.62121, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>packages\nanoFramework.Hosting.1.0.25\lib\nanoFramework.Hosting.dll</HintPath>
<Private>True</Private>
<Reference Include="nanoFramework.Hosting">
<HintPath>packages\nanoFramework.Hosting.1.0.38\lib\nanoFramework.Hosting.dll</HintPath>
</Reference>
<Reference Include="nanoFramework.Runtime.Events, Version=1.11.6.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<Reference Include="nanoFramework.Runtime.Events">
<HintPath>packages\nanoFramework.Runtime.Events.1.11.6\lib\nanoFramework.Runtime.Events.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Device.Gpio, Version=1.1.28.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<Reference Include="System.Device.Gpio">
<HintPath>packages\nanoFramework.System.Device.Gpio.1.1.28\lib\System.Device.Gpio.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions samples/Hosting/Simple/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="nanoFramework.CoreLibrary" version="1.14.2" targetFramework="netnano1.0" />
<package id="nanoFramework.DependencyInjection" version="1.0.35" targetFramework="netnano1.0" />
<package id="nanoFramework.Hosting" version="1.0.25" targetFramework="netnano1.0" />
<package id="nanoFramework.DependencyInjection" version="1.1.1" targetFramework="netnano1.0" />
<package id="nanoFramework.Hosting" version="1.0.38" targetFramework="netnano1.0" />
<package id="nanoFramework.Runtime.Events" version="1.11.6" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Device.Gpio" version="1.1.28" targetFramework="netnano1.0" />
</packages>
2 changes: 1 addition & 1 deletion samples/Hosting/SlowBlink/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// See LICENSE file in the project root for full license information.
//

using Microsoft.Extensions.DependencyInjection;
using nanoFramework.Hosting;
using nanoFramework.DependencyInjection;

namespace Hosting
{
Expand Down
23 changes: 7 additions & 16 deletions samples/Hosting/SlowBlink/SlowBlink.nfproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,29 +25,20 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="mscorlib, Version=1.14.3.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<Reference Include="mscorlib">
<HintPath>packages\nanoFramework.CoreLibrary.1.14.2\lib\mscorlib.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nanoFramework.DependencyInjection, Version=1.0.35.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>packages\nanoFramework.DependencyInjection.1.0.35\lib\nanoFramework.DependencyInjection.dll</HintPath>
<Private>True</Private>
<Reference Include="nanoFramework.DependencyInjection">
<HintPath>packages\nanoFramework.DependencyInjection.1.1.1\lib\nanoFramework.DependencyInjection.dll</HintPath>
</Reference>
<Reference Include="nanoFramework.Hosting, Version=1.0.25.62121, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>packages\nanoFramework.Hosting.1.0.25\lib\nanoFramework.Hosting.dll</HintPath>
<Private>True</Private>
<Reference Include="nanoFramework.Hosting">
<HintPath>packages\nanoFramework.Hosting.1.0.38\lib\nanoFramework.Hosting.dll</HintPath>
</Reference>
<Reference Include="nanoFramework.Logging, Version=1.1.63.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<HintPath>packages\nanoFramework.Logging.1.1.63\lib\nanoFramework.Logging.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nanoFramework.Runtime.Events, Version=1.11.6.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<Reference Include="nanoFramework.Runtime.Events">
<HintPath>packages\nanoFramework.Runtime.Events.1.11.6\lib\nanoFramework.Runtime.Events.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Device.Gpio, Version=1.1.28.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
<Reference Include="System.Device.Gpio">
<HintPath>packages\nanoFramework.System.Device.Gpio.1.1.28\lib\System.Device.Gpio.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
5 changes: 2 additions & 3 deletions samples/Hosting/SlowBlink/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="nanoFramework.CoreLibrary" version="1.14.2" targetFramework="netnano1.0" />
<package id="nanoFramework.DependencyInjection" version="1.0.35" targetFramework="netnano1.0" />
<package id="nanoFramework.Hosting" version="1.0.25" targetFramework="netnano1.0" />
<package id="nanoFramework.Logging" version="1.1.63" targetFramework="netnano1.0" />
<package id="nanoFramework.DependencyInjection" version="1.1.1" targetFramework="netnano1.0" />
<package id="nanoFramework.Hosting" version="1.0.38" targetFramework="netnano1.0" />
<package id="nanoFramework.Runtime.Events" version="1.11.6" targetFramework="netnano1.0" />
<package id="nanoFramework.System.Device.Gpio" version="1.1.28" targetFramework="netnano1.0" />
</packages>
5 changes: 1 addition & 4 deletions samples/Webserver/WebServer.DI/ITextService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using System;
using System.Text;

namespace nanoFramework.WebServer.Sample
namespace nanoFramework.WebServer.Sample
{
public interface ITextService
{
Expand Down
5 changes: 1 addition & 4 deletions samples/Webserver/WebServer.DI/ITextServiceSingleton.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using System;
using System.Text;

namespace nanoFramework.WebServer.Sample
namespace nanoFramework.WebServer.Sample
{
public interface ITextServiceSingleton
{
Expand Down
2 changes: 1 addition & 1 deletion samples/Webserver/WebServer.DI/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

using System.Threading;
using nanoFramework.Networking;
using nanoFramework.DependencyInjection;
using System;
using Microsoft.Extensions.DependencyInjection;

namespace nanoFramework.WebServer.Sample
{
Expand Down
1 change: 0 additions & 1 deletion samples/Webserver/WebServer.DI/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System.Reflection;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
Expand Down
Loading