diff --git a/IoTSharp.sln b/IoTSharp.sln index cef3c15ee36b92ad38962d8fa3db20eb09b4e3b0..edd0262fc85b15a966c468ec7490330452e029c2 100644 --- a/IoTSharp.sln +++ b/IoTSharp.sln @@ -13,7 +13,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution roadmap.md = roadmap.md EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IoTSharp.Test", "IoTSharp.Test\IoTSharp.Test.csproj", "{70DFF66F-6791-4713-81F3-DD7A64B59185}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IoTSharp.Test", "IoTSharp.Test\IoTSharp.Test.csproj", "{70DFF66F-6791-4713-81F3-DD7A64B59185}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IoTSharp", "IoTSharp\IoTSharp.csproj", "{CCD2C255-72D2-4A25-B0E9-E30FBEF774C7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -29,6 +31,10 @@ Global {70DFF66F-6791-4713-81F3-DD7A64B59185}.Debug|Any CPU.Build.0 = Debug|Any CPU {70DFF66F-6791-4713-81F3-DD7A64B59185}.Release|Any CPU.ActiveCfg = Release|Any CPU {70DFF66F-6791-4713-81F3-DD7A64B59185}.Release|Any CPU.Build.0 = Release|Any CPU + {CCD2C255-72D2-4A25-B0E9-E30FBEF774C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CCD2C255-72D2-4A25-B0E9-E30FBEF774C7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CCD2C255-72D2-4A25-B0E9-E30FBEF774C7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CCD2C255-72D2-4A25-B0E9-E30FBEF774C7}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/IoTSharp.Hub/AppSettings.cs b/IoTSharp/AppSettings.cs similarity index 100% rename from IoTSharp.Hub/AppSettings.cs rename to IoTSharp/AppSettings.cs diff --git a/IoTSharp.Hub/Clients/RpcClient.cs b/IoTSharp/Clients/RpcClient.cs similarity index 100% rename from IoTSharp.Hub/Clients/RpcClient.cs rename to IoTSharp/Clients/RpcClient.cs diff --git a/IoTSharp.Hub/Controllers/AccountController.cs b/IoTSharp/Controllers/AccountController.cs similarity index 100% rename from IoTSharp.Hub/Controllers/AccountController.cs rename to IoTSharp/Controllers/AccountController.cs diff --git a/IoTSharp.Hub/Controllers/CustomersController.cs b/IoTSharp/Controllers/CustomersController.cs similarity index 100% rename from IoTSharp.Hub/Controllers/CustomersController.cs rename to IoTSharp/Controllers/CustomersController.cs diff --git a/IoTSharp.Hub/Controllers/DevicesController.cs b/IoTSharp/Controllers/DevicesController.cs similarity index 100% rename from IoTSharp.Hub/Controllers/DevicesController.cs rename to IoTSharp/Controllers/DevicesController.cs diff --git a/IoTSharp.Hub/Controllers/InstallerController.cs b/IoTSharp/Controllers/InstallerController.cs similarity index 100% rename from IoTSharp.Hub/Controllers/InstallerController.cs rename to IoTSharp/Controllers/InstallerController.cs diff --git a/IoTSharp.Hub/Controllers/TenantsController.cs b/IoTSharp/Controllers/TenantsController.cs similarity index 100% rename from IoTSharp.Hub/Controllers/TenantsController.cs rename to IoTSharp/Controllers/TenantsController.cs diff --git a/IoTSharp.Hub/Data/ApplicationDBInitializer.cs b/IoTSharp/Data/ApplicationDBInitializer.cs similarity index 100% rename from IoTSharp.Hub/Data/ApplicationDBInitializer.cs rename to IoTSharp/Data/ApplicationDBInitializer.cs diff --git a/IoTSharp.Hub/Data/ApplicationDbContext.cs b/IoTSharp/Data/ApplicationDbContext.cs similarity index 100% rename from IoTSharp.Hub/Data/ApplicationDbContext.cs rename to IoTSharp/Data/ApplicationDbContext.cs diff --git a/IoTSharp.Hub/Data/AttributeData.cs b/IoTSharp/Data/AttributeData.cs similarity index 100% rename from IoTSharp.Hub/Data/AttributeData.cs rename to IoTSharp/Data/AttributeData.cs diff --git a/IoTSharp.Hub/Data/AttributeLatest.cs b/IoTSharp/Data/AttributeLatest.cs similarity index 100% rename from IoTSharp.Hub/Data/AttributeLatest.cs rename to IoTSharp/Data/AttributeLatest.cs diff --git a/IoTSharp.Hub/Data/AuditLog.cs b/IoTSharp/Data/AuditLog.cs similarity index 100% rename from IoTSharp.Hub/Data/AuditLog.cs rename to IoTSharp/Data/AuditLog.cs diff --git a/IoTSharp.Hub/Data/Customer.cs b/IoTSharp/Data/Customer.cs similarity index 100% rename from IoTSharp.Hub/Data/Customer.cs rename to IoTSharp/Data/Customer.cs diff --git a/IoTSharp.Hub/Data/DataStorage.cs b/IoTSharp/Data/DataStorage.cs similarity index 100% rename from IoTSharp.Hub/Data/DataStorage.cs rename to IoTSharp/Data/DataStorage.cs diff --git a/IoTSharp.Hub/Data/Device.cs b/IoTSharp/Data/Device.cs similarity index 100% rename from IoTSharp.Hub/Data/Device.cs rename to IoTSharp/Data/Device.cs diff --git a/IoTSharp.Hub/Data/DeviceIdentity.cs b/IoTSharp/Data/DeviceIdentity.cs similarity index 100% rename from IoTSharp.Hub/Data/DeviceIdentity.cs rename to IoTSharp/Data/DeviceIdentity.cs diff --git a/IoTSharp.Hub/Data/Enums.cs b/IoTSharp/Data/Enums.cs similarity index 100% rename from IoTSharp.Hub/Data/Enums.cs rename to IoTSharp/Data/Enums.cs diff --git a/IoTSharp.Hub/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs b/IoTSharp/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs similarity index 100% rename from IoTSharp.Hub/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs rename to IoTSharp/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs diff --git a/IoTSharp.Hub/Data/Migrations/00000000000000_CreateIdentitySchema.cs b/IoTSharp/Data/Migrations/00000000000000_CreateIdentitySchema.cs similarity index 100% rename from IoTSharp.Hub/Data/Migrations/00000000000000_CreateIdentitySchema.cs rename to IoTSharp/Data/Migrations/00000000000000_CreateIdentitySchema.cs diff --git a/IoTSharp.Hub/Data/Migrations/20190103085249_AddDataTable.Designer.cs b/IoTSharp/Data/Migrations/20190103085249_AddDataTable.Designer.cs similarity index 100% rename from IoTSharp.Hub/Data/Migrations/20190103085249_AddDataTable.Designer.cs rename to IoTSharp/Data/Migrations/20190103085249_AddDataTable.Designer.cs diff --git a/IoTSharp.Hub/Data/Migrations/20190103085249_AddDataTable.cs b/IoTSharp/Data/Migrations/20190103085249_AddDataTable.cs similarity index 100% rename from IoTSharp.Hub/Data/Migrations/20190103085249_AddDataTable.cs rename to IoTSharp/Data/Migrations/20190103085249_AddDataTable.cs diff --git a/IoTSharp.Hub/Data/Migrations/20190103092505_AddDiscriminator.Designer.cs b/IoTSharp/Data/Migrations/20190103092505_AddDiscriminator.Designer.cs similarity index 100% rename from IoTSharp.Hub/Data/Migrations/20190103092505_AddDiscriminator.Designer.cs rename to IoTSharp/Data/Migrations/20190103092505_AddDiscriminator.Designer.cs diff --git a/IoTSharp.Hub/Data/Migrations/20190103092505_AddDiscriminator.cs b/IoTSharp/Data/Migrations/20190103092505_AddDiscriminator.cs similarity index 100% rename from IoTSharp.Hub/Data/Migrations/20190103092505_AddDiscriminator.cs rename to IoTSharp/Data/Migrations/20190103092505_AddDiscriminator.cs diff --git a/IoTSharp.Hub/Data/Migrations/20190104081406_ModifyRelationship.Designer.cs b/IoTSharp/Data/Migrations/20190104081406_ModifyRelationship.Designer.cs similarity index 100% rename from IoTSharp.Hub/Data/Migrations/20190104081406_ModifyRelationship.Designer.cs rename to IoTSharp/Data/Migrations/20190104081406_ModifyRelationship.Designer.cs diff --git a/IoTSharp.Hub/Data/Migrations/20190104081406_ModifyRelationship.cs b/IoTSharp/Data/Migrations/20190104081406_ModifyRelationship.cs similarity index 100% rename from IoTSharp.Hub/Data/Migrations/20190104081406_ModifyRelationship.cs rename to IoTSharp/Data/Migrations/20190104081406_ModifyRelationship.cs diff --git a/IoTSharp.Hub/Data/Migrations/20190108071914_AddRole.Designer.cs b/IoTSharp/Data/Migrations/20190108071914_AddRole.Designer.cs similarity index 100% rename from IoTSharp.Hub/Data/Migrations/20190108071914_AddRole.Designer.cs rename to IoTSharp/Data/Migrations/20190108071914_AddRole.Designer.cs diff --git a/IoTSharp.Hub/Data/Migrations/20190108071914_AddRole.cs b/IoTSharp/Data/Migrations/20190108071914_AddRole.cs similarity index 100% rename from IoTSharp.Hub/Data/Migrations/20190108071914_AddRole.cs rename to IoTSharp/Data/Migrations/20190108071914_AddRole.cs diff --git a/IoTSharp.Hub/Data/Migrations/20190118115805_AddDeviceIdentity.Designer.cs b/IoTSharp/Data/Migrations/20190118115805_AddDeviceIdentity.Designer.cs similarity index 100% rename from IoTSharp.Hub/Data/Migrations/20190118115805_AddDeviceIdentity.Designer.cs rename to IoTSharp/Data/Migrations/20190118115805_AddDeviceIdentity.Designer.cs diff --git a/IoTSharp.Hub/Data/Migrations/20190118115805_AddDeviceIdentity.cs b/IoTSharp/Data/Migrations/20190118115805_AddDeviceIdentity.cs similarity index 100% rename from IoTSharp.Hub/Data/Migrations/20190118115805_AddDeviceIdentity.cs rename to IoTSharp/Data/Migrations/20190118115805_AddDeviceIdentity.cs diff --git a/IoTSharp.Hub/Data/Migrations/20190129085237_AuditLog.Designer.cs b/IoTSharp/Data/Migrations/20190129085237_AuditLog.Designer.cs similarity index 100% rename from IoTSharp.Hub/Data/Migrations/20190129085237_AuditLog.Designer.cs rename to IoTSharp/Data/Migrations/20190129085237_AuditLog.Designer.cs diff --git a/IoTSharp.Hub/Data/Migrations/20190129085237_AuditLog.cs b/IoTSharp/Data/Migrations/20190129085237_AuditLog.cs similarity index 100% rename from IoTSharp.Hub/Data/Migrations/20190129085237_AuditLog.cs rename to IoTSharp/Data/Migrations/20190129085237_AuditLog.cs diff --git a/IoTSharp.Hub/Data/Migrations/20190131022355_Value_DateTime.Designer.cs b/IoTSharp/Data/Migrations/20190131022355_Value_DateTime.Designer.cs similarity index 100% rename from IoTSharp.Hub/Data/Migrations/20190131022355_Value_DateTime.Designer.cs rename to IoTSharp/Data/Migrations/20190131022355_Value_DateTime.Designer.cs diff --git a/IoTSharp.Hub/Data/Migrations/20190131022355_Value_DateTime.cs b/IoTSharp/Data/Migrations/20190131022355_Value_DateTime.cs similarity index 100% rename from IoTSharp.Hub/Data/Migrations/20190131022355_Value_DateTime.cs rename to IoTSharp/Data/Migrations/20190131022355_Value_DateTime.cs diff --git a/IoTSharp.Hub/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/IoTSharp/Data/Migrations/ApplicationDbContextModelSnapshot.cs similarity index 100% rename from IoTSharp.Hub/Data/Migrations/ApplicationDbContextModelSnapshot.cs rename to IoTSharp/Data/Migrations/ApplicationDbContextModelSnapshot.cs diff --git a/IoTSharp.Hub/Data/Relationship.cs b/IoTSharp/Data/Relationship.cs similarity index 100% rename from IoTSharp.Hub/Data/Relationship.cs rename to IoTSharp/Data/Relationship.cs diff --git a/IoTSharp.Hub/Data/TelemetryData.cs b/IoTSharp/Data/TelemetryData.cs similarity index 100% rename from IoTSharp.Hub/Data/TelemetryData.cs rename to IoTSharp/Data/TelemetryData.cs diff --git a/IoTSharp.Hub/Data/TelemetryLatest.cs b/IoTSharp/Data/TelemetryLatest.cs similarity index 100% rename from IoTSharp.Hub/Data/TelemetryLatest.cs rename to IoTSharp/Data/TelemetryLatest.cs diff --git a/IoTSharp.Hub/Data/Tenant.cs b/IoTSharp/Data/Tenant.cs similarity index 100% rename from IoTSharp.Hub/Data/Tenant.cs rename to IoTSharp/Data/Tenant.cs diff --git a/IoTSharp.Hub/Dtos/AccountDto.cs b/IoTSharp/Dtos/AccountDto.cs similarity index 100% rename from IoTSharp.Hub/Dtos/AccountDto.cs rename to IoTSharp/Dtos/AccountDto.cs diff --git a/IoTSharp.Hub/Dtos/ApiResult.cs b/IoTSharp/Dtos/ApiResult.cs similarity index 100% rename from IoTSharp.Hub/Dtos/ApiResult.cs rename to IoTSharp/Dtos/ApiResult.cs diff --git a/IoTSharp.Hub/Dtos/CustomerDto.cs b/IoTSharp/Dtos/CustomerDto.cs similarity index 100% rename from IoTSharp.Hub/Dtos/CustomerDto.cs rename to IoTSharp/Dtos/CustomerDto.cs diff --git a/IoTSharp.Hub/Dtos/UserInfoDto.cs b/IoTSharp/Dtos/UserInfoDto.cs similarity index 100% rename from IoTSharp.Hub/Dtos/UserInfoDto.cs rename to IoTSharp/Dtos/UserInfoDto.cs diff --git a/IoTSharp.Hub/Extensions/DataExtension.cs b/IoTSharp/Extensions/DataExtension.cs similarity index 100% rename from IoTSharp.Hub/Extensions/DataExtension.cs rename to IoTSharp/Extensions/DataExtension.cs diff --git a/IoTSharp.Hub/Extensions/IoTSharpExtension.cs b/IoTSharp/Extensions/IoTSharpExtension.cs similarity index 100% rename from IoTSharp.Hub/Extensions/IoTSharpExtension.cs rename to IoTSharp/Extensions/IoTSharpExtension.cs diff --git a/IoTSharp.Hub/Extensions/MiscExtension.cs b/IoTSharp/Extensions/MiscExtension.cs similarity index 100% rename from IoTSharp.Hub/Extensions/MiscExtension.cs rename to IoTSharp/Extensions/MiscExtension.cs diff --git a/IoTSharp.Hub/Extensions/MqttExtension.cs b/IoTSharp/Extensions/MqttExtension.cs similarity index 100% rename from IoTSharp.Hub/Extensions/MqttExtension.cs rename to IoTSharp/Extensions/MqttExtension.cs diff --git a/IoTSharp.Hub/Extensions/TokenExtension.cs b/IoTSharp/Extensions/TokenExtension.cs similarity index 100% rename from IoTSharp.Hub/Extensions/TokenExtension.cs rename to IoTSharp/Extensions/TokenExtension.cs diff --git a/IoTSharp.Hub/IoTSharp.Hub.csproj b/IoTSharp/IoTSharp.Hub.csproj similarity index 100% rename from IoTSharp.Hub/IoTSharp.Hub.csproj rename to IoTSharp/IoTSharp.Hub.csproj diff --git a/IoTSharp.Hub/Program.cs b/IoTSharp/Program.cs similarity index 100% rename from IoTSharp.Hub/Program.cs rename to IoTSharp/Program.cs diff --git a/IoTSharp.Hub/Properties/Resources.Designer.cs b/IoTSharp/Properties/Resources.Designer.cs similarity index 100% rename from IoTSharp.Hub/Properties/Resources.Designer.cs rename to IoTSharp/Properties/Resources.Designer.cs diff --git a/IoTSharp.Hub/Properties/Resources.resx b/IoTSharp/Properties/Resources.resx similarity index 100% rename from IoTSharp.Hub/Properties/Resources.resx rename to IoTSharp/Properties/Resources.resx diff --git a/IoTSharp.Hub/Startup.cs b/IoTSharp/Startup.cs similarity index 100% rename from IoTSharp.Hub/Startup.cs rename to IoTSharp/Startup.cs diff --git a/IoTSharp.Hub/appsettings.Development.json b/IoTSharp/appsettings.Development.json similarity index 100% rename from IoTSharp.Hub/appsettings.Development.json rename to IoTSharp/appsettings.Development.json diff --git a/IoTSharp.Hub/appsettings.json b/IoTSharp/appsettings.json similarity index 100% rename from IoTSharp.Hub/appsettings.json rename to IoTSharp/appsettings.json diff --git a/IoTSharp.Hub/iotsharp.service b/IoTSharp/iotsharp.service similarity index 100% rename from IoTSharp.Hub/iotsharp.service rename to IoTSharp/iotsharp.service diff --git a/IoTSharp.Hub/wwwroot/default.html b/IoTSharp/wwwroot/default.html similarity index 100% rename from IoTSharp.Hub/wwwroot/default.html rename to IoTSharp/wwwroot/default.html