调整routing项目名称 。 重命名命名空间。

maikebing · maikebing · commit 067d064e26fb · 2022-09-12T14:22:16.000+08:00
diff --git a/ExampleServer/MqttControllers/CatchAllController.cs b/ExampleServer/MqttControllers/CatchAllController.cs
@@ -1,5 +1,5 @@
 ﻿using Microsoft.Extensions.Logging;
-using MQTTnet.AspNetCore.AttributeRouting;
+using MQTTnet.AspNetCore.Routing;
 using System.Threading.Tasks;
 
 namespace ExampleServer.MqttControllers
diff --git a/ExampleServer/MqttControllers/MqttWeatherForecastController.cs b/ExampleServer/MqttControllers/MqttWeatherForecastController.cs
@@ -1,6 +1,6 @@
 ﻿using Microsoft.Extensions.Logging;
 using MQTTnet;
-using MQTTnet.AspNetCore.AttributeRouting;
+using MQTTnet.AspNetCore.Routing;
 using System;
 using System.Threading.Tasks;
 
diff --git a/ExampleServer/MqttControllers/ParamMqttWeatherForecastController.cs b/ExampleServer/MqttControllers/ParamMqttWeatherForecastController.cs
@@ -1,6 +1,6 @@
 ﻿using Microsoft.Extensions.Logging;
 using MQTTnet;
-using MQTTnet.AspNetCore.AttributeRouting;
+using MQTTnet.AspNetCore.Routing;
 using System;
 using System.Threading.Tasks;
 
diff --git a/ExampleServer/Startup.cs b/ExampleServer/Startup.cs
@@ -5,7 +5,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using MQTTnet.AspNetCore;
-using MQTTnet.AspNetCore.AttributeRouting;
+using MQTTnet.AspNetCore.Routing;
 using MQTTnet.Server;
 
 namespace Example
diff --git a/Source/Attributes/MqttControllerAttribute.cs b/Source/Attributes/MqttControllerAttribute.cs
@@ -5,7 +5,7 @@
 
 using System;
 
-namespace MQTTnet.AspNetCore.AttributeRouting
+namespace MQTTnet.AspNetCore.Routing
 {
     /// <summary>
     /// Indicates that a type and all derived types are used to serve MQTT responses.
diff --git a/Source/Attributes/MqttControllerContextAttribute.cs b/Source/Attributes/MqttControllerContextAttribute.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using MQTTnet.Server;
 
-namespace MQTTnet.AspNetCore.AttributeRouting.Attributes
+namespace MQTTnet.AspNetCore.Routing.Attributes
 {
     /// <summary>
     /// When creating a custom controller that does not inherit from <see cref="MqttBaseController"/>, this attribute
diff --git a/Source/Attributes/MqttRouteAttribute.cs b/Source/Attributes/MqttRouteAttribute.cs
@@ -5,7 +5,7 @@
 
 using System;
 
-namespace MQTTnet.AspNetCore.AttributeRouting
+namespace MQTTnet.AspNetCore.Routing
 {
     /// <summary>
     /// Specifies an attribute route on a controller.
diff --git a/Source/Constraints/OptionalTypeRouteConstraint.cs b/Source/Constraints/OptionalTypeRouteConstraint.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) .NET Foundation. All rights reserved. Licensed under the Apache License, Version 2.0. See License.txt
 // in the project root for license information. // Modifications Copyright (c) Atlas Lift Tech Inc.
 
-namespace MQTTnet.AspNetCore.AttributeRouting
+namespace MQTTnet.AspNetCore.Routing
 {
     /// <summary>
     /// A route constraint that allows the value to be null or parseable as the specified type.
diff --git a/Source/Constraints/RouteConstraint.cs b/Source/Constraints/RouteConstraint.cs
@@ -7,7 +7,7 @@
 using System.Collections.Concurrent;
 using System.Globalization;
 
-namespace MQTTnet.AspNetCore.AttributeRouting
+namespace MQTTnet.AspNetCore.Routing
 {
     internal abstract class RouteConstraint
     {
diff --git a/Source/Constraints/TypeRouteConstraint.cs b/Source/Constraints/TypeRouteConstraint.cs
@@ -3,7 +3,7 @@
 
 // Modifications Copyright (c) Atlas Lift Tech Inc. All rights reserved.
 
-namespace MQTTnet.AspNetCore.AttributeRouting
+namespace MQTTnet.AspNetCore.Routing
 {
     /// <summary>
     /// A route constraint that requires the value to be parseable as a specified type.
diff --git a/Source/Extensions/ServiceCollectionExtensions.cs b/Source/Extensions/ServiceCollectionExtensions.cs
@@ -1,20 +1,20 @@
 ﻿// Copyright (c) Atlas Lift Tech Inc. All rights reserved.
 
 using Microsoft.Extensions.DependencyInjection;
-using MQTTnet.AspNetCore.AttributeRouting.Routing;
+using MQTTnet.AspNetCore.Routing;
 using MQTTnet.Server;
 using System;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
 // This is needed to make internal classes visible to UnitTesting projects
-[assembly: InternalsVisibleTo("MQTTnet.AspNetCore.AttributeRouting.Tests, PublicKey=00240000048000009" +
+[assembly: InternalsVisibleTo("MQTTnet.AspNetCore.Routing.Tests, PublicKey=00240000048000009" +
     "4000000060200000024000052534131000400000100010089369e254b2bf47119265eb7514c522350b2e61beda20ccc9" +
     "a9ddc3f8dab153d59d23011476cc939860d9ae7d09d1bade2915961d01f9ec1f1852265e4d54b090f4c427756f7044e8" +
     "65ffcd47bf99f18af6361de42003808f7323d20d5d2c66fe494852b5e2438db793ec9fd845b80e1ce5c9b17ff053f386" +
     "bc0f06080e9d0ba")]
 
-namespace MQTTnet.AspNetCore.AttributeRouting
+namespace MQTTnet.AspNetCore.Routing
 {
     public static class ServiceCollectionExtensions
     {
diff --git a/Source/MQTTnet.AspNetCore.Routing.csproj b/Source/MQTTnet.AspNetCore.Routing.csproj
@@ -11,17 +11,17 @@
 		<Copyright>Copyright (c) Atlas Lift Tech Inc. 2021</Copyright>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<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>
-		<Company>Atlas Lift Tech Inc.</Company>
-		<Authors>Anton Vishnyak</Authors>
-		<AssemblyVersion>0.3.16</AssemblyVersion>
-		<FileVersion>0.3.16</FileVersion>
+		<Company>Atlas Lift Tech Inc;IoTSharp</Company>
+		<Authors>Anton Vishnyak;maikebing</Authors>
+		<AssemblyVersion>0.4.0</AssemblyVersion>
+		<FileVersion>0.4.0</FileVersion>
 		<LangVersion>default</LangVersion>
-		<RepositoryUrl>https://github.com/Atlas-LiftTech/MQTTnet.AspNetCore.AttributeRouting</RepositoryUrl>
+		<RepositoryUrl>https://github.com/IoTSharp/MQTTnet.AspNetCore.Routing</RepositoryUrl>
 		<RepositoryType>GIT</RepositoryType>
 		<PackageReleaseNotes>* Added support for passing an array of assemblies to use in route discovery</PackageReleaseNotes>
-		<Version>0.3.16</Version>
+		<Version>0.4.0</Version>
 		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-		<PackageProjectUrl>https://github.com/Atlas-LiftTech/MQTTnet.AspNetCore.AttributeRouting</PackageProjectUrl>
+		<PackageProjectUrl>https://github.com/IoTSharp/MQTTnet.AspNetCore.Routing</PackageProjectUrl>
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
 		<IncludeSymbols>true</IncludeSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -30,7 +30,7 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
-			<_Parameter1>MQTTnet.AspNetCore.AttributeRouting.Tests</_Parameter1>
+			<_Parameter1>MQTTnet.AspNetCore.Routing.Tests</_Parameter1>
 		</AssemblyAttribute>
 	</ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
diff --git a/Source/Routing/IMqttControllerContext.cs b/Source/Routing/IMqttControllerContext.cs
@@ -2,7 +2,7 @@
 
 using MQTTnet.Server;
 
-namespace MQTTnet.AspNetCore.AttributeRouting.Routing
+namespace MQTTnet.AspNetCore.Routing
 {
     public interface IMqttControllerContext
     {
diff --git a/Source/Routing/ITypeActivatorCache.cs b/Source/Routing/ITypeActivatorCache.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace MQTTnet.AspNetCore.AttributeRouting.Routing
+namespace MQTTnet.AspNetCore.Routing
 {
     internal interface ITypeActivatorCache
     {
diff --git a/Source/Routing/MqttBaseController.cs b/Source/Routing/MqttBaseController.cs
@@ -1,20 +1,14 @@
 ﻿// Copyright (c) Atlas Lift Tech Inc. All rights reserved.
 
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using MQTTnet;
-using MQTTnet.AspNetCore.AttributeRouting;
-using MQTTnet.AspNetCore.AttributeRouting.Attributes;
-using MQTTnet.AspNetCore.AttributeRouting.Routing;
+using MQTTnet.AspNetCore.Routing.Attributes;
 using MQTTnet.Server;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace MQTTnet.AspNetCore.AttributeRouting
+namespace MQTTnet.AspNetCore.Routing
 {
     [MqttController]
     public abstract class MqttBaseController
diff --git a/Source/Routing/MqttControllerContext.cs b/Source/Routing/MqttControllerContext.cs
@@ -2,7 +2,7 @@
 
 using MQTTnet.Server;
 
-namespace MQTTnet.AspNetCore.AttributeRouting.Routing
+namespace MQTTnet.AspNetCore.Routing
 {
     public class MqttControllerContext : IMqttControllerContext
     {
diff --git a/Source/Routing/MqttRoute.cs b/Source/Routing/MqttRoute.cs
@@ -9,7 +9,7 @@
 using System.Linq;
 using System.Reflection;
 
-namespace MQTTnet.AspNetCore.AttributeRouting
+namespace MQTTnet.AspNetCore.Routing
 {
     [DebuggerDisplay("Handler = {Handler}, Template = {Template}")]
     internal class MqttRoute
diff --git a/Source/Routing/MqttRouteContext.cs b/Source/Routing/MqttRouteContext.cs
@@ -7,7 +7,7 @@
 using System.Collections.Generic;
 using System.Reflection;
 
-namespace MQTTnet.AspNetCore.AttributeRouting
+namespace MQTTnet.AspNetCore.Routing
 {
     internal class MqttRouteContext
     {
diff --git a/Source/Routing/MqttRouteTable.cs b/Source/Routing/MqttRouteTable.cs
@@ -3,7 +3,7 @@
 
 // Modifications Copyright (c) Atlas Lift Tech Inc. All rights reserved.
 
-namespace MQTTnet.AspNetCore.AttributeRouting
+namespace MQTTnet.AspNetCore.Routing
 {
     internal class MqttRouteTable
     {
diff --git a/Source/Routing/MqttRouteTableFactory.cs b/Source/Routing/MqttRouteTableFactory.cs
@@ -10,7 +10,7 @@
 using System.Linq;
 using System.Reflection;
 
-namespace MQTTnet.AspNetCore.AttributeRouting
+namespace MQTTnet.AspNetCore.Routing
 {
     internal static class MqttRouteTableFactory
     {
diff --git a/Source/Routing/MqttRouter.cs b/Source/Routing/MqttRouter.cs
@@ -2,7 +2,7 @@
 
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using MQTTnet.AspNetCore.AttributeRouting.Attributes;
+using MQTTnet.AspNetCore.Routing.Attributes;
 using MQTTnet.Server;
 using System;
 using System.Collections.Generic;
@@ -12,7 +12,7 @@
 
 #nullable enable
 
-namespace MQTTnet.AspNetCore.AttributeRouting.Routing
+namespace MQTTnet.AspNetCore.Routing
 {
     internal class MqttRouter
     {
diff --git a/Source/Routing/TypeActivatorCache.cs b/Source/Routing/TypeActivatorCache.cs
@@ -7,7 +7,7 @@
 using System;
 using System.Collections.Concurrent;
 
-namespace MQTTnet.AspNetCore.AttributeRouting.Routing
+namespace MQTTnet.AspNetCore.Routing
 {
     /// <summary>
     /// Caches <see cref="ObjectFactory"/> instances produced by <see cref="ActivatorUtilities.CreateFactory(Type, Type[])"/>.
diff --git a/Source/Templates/RouteTemplate.cs b/Source/Templates/RouteTemplate.cs
@@ -6,7 +6,7 @@
 using System.Diagnostics;
 using System.Linq;
 
-namespace MQTTnet.AspNetCore.AttributeRouting
+namespace MQTTnet.AspNetCore.Routing
 {
     [DebuggerDisplay("{TemplateText}")]
     internal class RouteTemplate : IEquatable<RouteTemplate>
diff --git a/Source/Templates/TemplateParser.cs b/Source/Templates/TemplateParser.cs
@@ -6,7 +6,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace MQTTnet.AspNetCore.AttributeRouting
+namespace MQTTnet.AspNetCore.Routing
 {
     internal class TemplateParser
     {
diff --git a/Source/Templates/TemplateSegment.cs b/Source/Templates/TemplateSegment.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Linq;
 
-namespace MQTTnet.AspNetCore.AttributeRouting
+namespace MQTTnet.AspNetCore.Routing
 {
     internal class TemplateSegment : IEquatable<TemplateSegment>
     {

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`using System;`
`7`	`7`
`8`		`-namespace MQTTnet.AspNetCore.AttributeRouting`
	`8`	`+namespace MQTTnet.AspNetCore.Routing`
`9`	`9`	`{`
`10`	`10`	`/// <summary>`
`11`	`11`	`/// Indicates that a type and all derived types are used to serve MQTT responses.`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using MQTTnet.Server;`
`3`	`3`
`4`		`-namespace MQTTnet.AspNetCore.AttributeRouting.Attributes`
	`4`	`+namespace MQTTnet.AspNetCore.Routing.Attributes`
`5`	`5`	`{`
`6`	`6`	`/// <summary>`
`7`	`7`	`/// When creating a custom controller that does not inherit from <see cref="MqttBaseController"/>, this attribute`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`// Copyright (c) .NET Foundation. All rights reserved. Licensed under the Apache License, Version 2.0. See License.txt`
`2`	`2`	`// in the project root for license information. // Modifications Copyright (c) Atlas Lift Tech Inc.`
`3`	`3`
`4`		`-namespace MQTTnet.AspNetCore.AttributeRouting`
	`4`	`+namespace MQTTnet.AspNetCore.Routing`
`5`	`5`	`{`
`6`	`6`	`/// <summary>`
`7`	`7`	`/// A route constraint that allows the value to be null or parseable as the specified type.`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`using System.Collections.Concurrent;`
`8`	`8`	`using System.Globalization;`
`9`	`9`
`10`		`-namespace MQTTnet.AspNetCore.AttributeRouting`
	`10`	`+namespace MQTTnet.AspNetCore.Routing`
`11`	`11`	`{`
`12`	`12`	`internal abstract class RouteConstraint`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`// Modifications Copyright (c) Atlas Lift Tech Inc. All rights reserved.`
`5`	`5`
`6`		`-namespace MQTTnet.AspNetCore.AttributeRouting`
	`6`	`+namespace MQTTnet.AspNetCore.Routing`
`7`	`7`	`{`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// A route constraint that requires the value to be parseable as a specified type.`