Skip to content

Commit 067d064

Browse files
maikebingmaikebing
committed
调整routing项目名称 。 重命名命名空间。
1 parent 17db70d commit 067d064

25 files changed

+36
-42
lines changed

‎ExampleServer/MqttControllers/CatchAllController.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using Microsoft.Extensions.Logging;
2-
using MQTTnet.AspNetCore.AttributeRouting;
2+
using MQTTnet.AspNetCore.Routing;
33
using System.Threading.Tasks;
44

55
namespace ExampleServer.MqttControllers

‎ExampleServer/MqttControllers/MqttWeatherForecastController.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Microsoft.Extensions.Logging;
22
using MQTTnet;
3-
using MQTTnet.AspNetCore.AttributeRouting;
3+
using MQTTnet.AspNetCore.Routing;
44
using System;
55
using System.Threading.Tasks;
66

‎ExampleServer/MqttControllers/ParamMqttWeatherForecastController.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Microsoft.Extensions.Logging;
22
using MQTTnet;
3-
using MQTTnet.AspNetCore.AttributeRouting;
3+
using MQTTnet.AspNetCore.Routing;
44
using System;
55
using System.Threading.Tasks;
66

‎ExampleServer/Startup.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using Microsoft.Extensions.DependencyInjection;
66
using Microsoft.Extensions.Hosting;
77
using MQTTnet.AspNetCore;
8-
using MQTTnet.AspNetCore.AttributeRouting;
8+
using MQTTnet.AspNetCore.Routing;
99
using MQTTnet.Server;
1010

1111
namespace Example

‎Source/Attributes/MqttControllerAttribute.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
using System;
77

8-
namespace MQTTnet.AspNetCore.AttributeRouting
8+
namespace MQTTnet.AspNetCore.Routing
99
{
1010
/// <summary>
1111
/// Indicates that a type and all derived types are used to serve MQTT responses.

‎Source/Attributes/MqttControllerContextAttribute.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using MQTTnet.Server;
33

4-
namespace MQTTnet.AspNetCore.AttributeRouting.Attributes
4+
namespace MQTTnet.AspNetCore.Routing.Attributes
55
{
66
/// <summary>
77
/// When creating a custom controller that does not inherit from <see cref="MqttBaseController"/>, this attribute

‎Source/Attributes/MqttRouteAttribute.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
using System;
77

8-
namespace MQTTnet.AspNetCore.AttributeRouting
8+
namespace MQTTnet.AspNetCore.Routing
99
{
1010
/// <summary>
1111
/// Specifies an attribute route on a controller.

‎Source/Constraints/OptionalTypeRouteConstraint.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) .NET Foundation. All rights reserved. Licensed under the Apache License, Version 2.0. See License.txt
22
// in the project root for license information. // Modifications Copyright (c) Atlas Lift Tech Inc.
33

4-
namespace MQTTnet.AspNetCore.AttributeRouting
4+
namespace MQTTnet.AspNetCore.Routing
55
{
66
/// <summary>
77
/// A route constraint that allows the value to be null or parseable as the specified type.

‎Source/Constraints/RouteConstraint.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System.Collections.Concurrent;
88
using System.Globalization;
99

10-
namespace MQTTnet.AspNetCore.AttributeRouting
10+
namespace MQTTnet.AspNetCore.Routing
1111
{
1212
internal abstract class RouteConstraint
1313
{

‎Source/Constraints/TypeRouteConstraint.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
// Modifications Copyright (c) Atlas Lift Tech Inc. All rights reserved.
55

6-
namespace MQTTnet.AspNetCore.AttributeRouting
6+
namespace MQTTnet.AspNetCore.Routing
77
{
88
/// <summary>
99
/// A route constraint that requires the value to be parseable as a specified type.

‎Source/Extensions/ServiceCollectionExtensions.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
// Copyright (c) Atlas Lift Tech Inc. All rights reserved.
22

33
using Microsoft.Extensions.DependencyInjection;
4-
using MQTTnet.AspNetCore.AttributeRouting.Routing;
4+
using MQTTnet.AspNetCore.Routing;
55
using MQTTnet.Server;
66
using System;
77
using System.Reflection;
88
using System.Runtime.CompilerServices;
99

1010
// This is needed to make internal classes visible to UnitTesting projects
11-
[assembly: InternalsVisibleTo("MQTTnet.AspNetCore.AttributeRouting.Tests, PublicKey=00240000048000009" +
11+
[assembly: InternalsVisibleTo("MQTTnet.AspNetCore.Routing.Tests, PublicKey=00240000048000009" +
1212
"4000000060200000024000052534131000400000100010089369e254b2bf47119265eb7514c522350b2e61beda20ccc9" +
1313
"a9ddc3f8dab153d59d23011476cc939860d9ae7d09d1bade2915961d01f9ec1f1852265e4d54b090f4c427756f7044e8" +
1414
"65ffcd47bf99f18af6361de42003808f7323d20d5d2c66fe494852b5e2438db793ec9fd845b80e1ce5c9b17ff053f386" +
1515
"bc0f06080e9d0ba")]
1616

17-
namespace MQTTnet.AspNetCore.AttributeRouting
17+
namespace MQTTnet.AspNetCore.Routing
1818
{
1919
public static class ServiceCollectionExtensions
2020
{

‎Source/MQTTnet.AspNetCore.Routing.csproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@
1111
<Copyright>Copyright (c) Atlas Lift Tech Inc. 2021</Copyright>
1212
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1313
<PackageTags>MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin Blazor AspNetCore</PackageTags>
14-
<Company>Atlas Lift Tech Inc.</Company>
15-
<Authors>Anton Vishnyak</Authors>
16-
<AssemblyVersion>0.3.16</AssemblyVersion>
17-
<FileVersion>0.3.16</FileVersion>
14+
<Company>Atlas Lift Tech Inc;IoTSharp</Company>
15+
<Authors>Anton Vishnyak;maikebing</Authors>
16+
<AssemblyVersion>0.4.0</AssemblyVersion>
17+
<FileVersion>0.4.0</FileVersion>
1818
<LangVersion>default</LangVersion>
19-
<RepositoryUrl>https://github.com/Atlas-LiftTech/MQTTnet.AspNetCore.AttributeRouting</RepositoryUrl>
19+
<RepositoryUrl>https://github.com/IoTSharp/MQTTnet.AspNetCore.Routing</RepositoryUrl>
2020
<RepositoryType>GIT</RepositoryType>
2121
<PackageReleaseNotes>* Added support for passing an array of assemblies to use in route discovery</PackageReleaseNotes>
22-
<Version>0.3.16</Version>
22+
<Version>0.4.0</Version>
2323
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
24-
<PackageProjectUrl>https://github.com/Atlas-LiftTech/MQTTnet.AspNetCore.AttributeRouting</PackageProjectUrl>
24+
<PackageProjectUrl>https://github.com/IoTSharp/MQTTnet.AspNetCore.Routing</PackageProjectUrl>
2525
<PublishRepositoryUrl>true</PublishRepositoryUrl>
2626
<IncludeSymbols>true</IncludeSymbols>
2727
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -30,7 +30,7 @@
3030
</PropertyGroup>
3131
<ItemGroup>
3232
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
33-
<_Parameter1>MQTTnet.AspNetCore.AttributeRouting.Tests</_Parameter1>
33+
<_Parameter1>MQTTnet.AspNetCore.Routing.Tests</_Parameter1>
3434
</AssemblyAttribute>
3535
</ItemGroup>
3636
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">

‎Source/Routing/IMqttControllerContext.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
using MQTTnet.Server;
44

5-
namespace MQTTnet.AspNetCore.AttributeRouting.Routing
5+
namespace MQTTnet.AspNetCore.Routing
66
{
77
public interface IMqttControllerContext
88
{

‎Source/Routing/ITypeActivatorCache.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using System;
55

6-
namespace MQTTnet.AspNetCore.AttributeRouting.Routing
6+
namespace MQTTnet.AspNetCore.Routing
77
{
88
internal interface ITypeActivatorCache
99
{

‎Source/Routing/MqttBaseController.cs

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
11
// Copyright (c) Atlas Lift Tech Inc. All rights reserved.
22

33
using Microsoft.AspNetCore.Mvc;
4-
using Microsoft.Extensions.DependencyInjection;
5-
using Microsoft.Extensions.Logging;
6-
using Microsoft.Extensions.Options;
7-
using MQTTnet;
8-
using MQTTnet.AspNetCore.AttributeRouting;
9-
using MQTTnet.AspNetCore.AttributeRouting.Attributes;
10-
using MQTTnet.AspNetCore.AttributeRouting.Routing;
4+
using MQTTnet.AspNetCore.Routing.Attributes;
115
using MQTTnet.Server;
126
using System;
137
using System.Collections.Generic;
148
using System.Linq;
159
using System.Threading.Tasks;
1610

17-
namespace MQTTnet.AspNetCore.AttributeRouting
11+
namespace MQTTnet.AspNetCore.Routing
1812
{
1913
[MqttController]
2014
public abstract class MqttBaseController

‎Source/Routing/MqttControllerContext.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
using MQTTnet.Server;
44

5-
namespace MQTTnet.AspNetCore.AttributeRouting.Routing
5+
namespace MQTTnet.AspNetCore.Routing
66
{
77
public class MqttControllerContext : IMqttControllerContext
88
{

‎Source/Routing/MqttRoute.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
using System.Linq;
1010
using System.Reflection;
1111

12-
namespace MQTTnet.AspNetCore.AttributeRouting
12+
namespace MQTTnet.AspNetCore.Routing
1313
{
1414
[DebuggerDisplay("Handler = {Handler}, Template = {Template}")]
1515
internal class MqttRoute

‎Source/Routing/MqttRouteContext.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System.Collections.Generic;
88
using System.Reflection;
99

10-
namespace MQTTnet.AspNetCore.AttributeRouting
10+
namespace MQTTnet.AspNetCore.Routing
1111
{
1212
internal class MqttRouteContext
1313
{

‎Source/Routing/MqttRouteTable.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
// Modifications Copyright (c) Atlas Lift Tech Inc. All rights reserved.
55

6-
namespace MQTTnet.AspNetCore.AttributeRouting
6+
namespace MQTTnet.AspNetCore.Routing
77
{
88
internal class MqttRouteTable
99
{

‎Source/Routing/MqttRouteTableFactory.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using System.Linq;
1111
using System.Reflection;
1212

13-
namespace MQTTnet.AspNetCore.AttributeRouting
13+
namespace MQTTnet.AspNetCore.Routing
1414
{
1515
internal static class MqttRouteTableFactory
1616
{

‎Source/Routing/MqttRouter.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
using Microsoft.Extensions.DependencyInjection;
44
using Microsoft.Extensions.Logging;
5-
using MQTTnet.AspNetCore.AttributeRouting.Attributes;
5+
using MQTTnet.AspNetCore.Routing.Attributes;
66
using MQTTnet.Server;
77
using System;
88
using System.Collections.Generic;
@@ -12,7 +12,7 @@
1212

1313
#nullable enable
1414

15-
namespace MQTTnet.AspNetCore.AttributeRouting.Routing
15+
namespace MQTTnet.AspNetCore.Routing
1616
{
1717
internal class MqttRouter
1818
{

‎Source/Routing/TypeActivatorCache.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System;
88
using System.Collections.Concurrent;
99

10-
namespace MQTTnet.AspNetCore.AttributeRouting.Routing
10+
namespace MQTTnet.AspNetCore.Routing
1111
{
1212
/// <summary>
1313
/// Caches <see cref="ObjectFactory"/> instances produced by <see cref="ActivatorUtilities.CreateFactory(Type, Type[])"/>.

‎Source/Templates/RouteTemplate.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System.Diagnostics;
77
using System.Linq;
88

9-
namespace MQTTnet.AspNetCore.AttributeRouting
9+
namespace MQTTnet.AspNetCore.Routing
1010
{
1111
[DebuggerDisplay("{TemplateText}")]
1212
internal class RouteTemplate : IEquatable<RouteTemplate>

‎Source/Templates/TemplateParser.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System;
77
using System.Collections.Generic;
88

9-
namespace MQTTnet.AspNetCore.AttributeRouting
9+
namespace MQTTnet.AspNetCore.Routing
1010
{
1111
internal class TemplateParser
1212
{

‎Source/Templates/TemplateSegment.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System;
55
using System.Linq;
66

7-
namespace MQTTnet.AspNetCore.AttributeRouting
7+
namespace MQTTnet.AspNetCore.Routing
88
{
99
internal class TemplateSegment : IEquatable<TemplateSegment>
1010
{

0 commit comments

Comments
 (0)