...
 
Commits (6)
    https://gitcode.net/iotsharp/IoTSharp/-/commit/6aec3ec92298d70da3c5fffa3471e07d91a34bea Bump AspNetCore.HealthChecks.System from 7.0.0-rc2.5 to 7.0.0-rc2.6 2023-07-10T11:50:03+00:00 dependabot[bot] 49699333+dependabot[bot]@users.noreply.github.com Bumps [AspNetCore.HealthChecks.System](<a href="https://github.com/Xabaril/AspNetCore.Diagnostics.HealthChecks" rel="nofollow noreferrer noopener" target="_blank">https://github.com/Xabaril/AspNetCore.Diagnostics.HealthChecks</a>) from 7.0.0-rc2.5 to 7.0.0-rc2.6. - [Changelog](<a href="https://github.com/Xabaril/AspNetCore.Diagnostics.HealthChecks/blob/master/doc/ui-changelog.md" rel="nofollow noreferrer noopener" target="_blank">https://github.com/Xabaril/AspNetCore.Diagnostics.HealthChecks/blob/master/doc/ui-changelog.md</a>) - [Commits](<a href="https://github.com/Xabaril/AspNetCore.Diagnostics.HealthChecks/commits" rel="nofollow noreferrer noopener" target="_blank">https://github.com/Xabaril/AspNetCore.Diagnostics.HealthChecks/commits</a>) --- updated-dependencies: - dependency-name: AspNetCore.HealthChecks.System dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: <span data-trailer="Signed-off-by:"><a href="mailto:support@github.com" title="support@github.com"></a><a href="javascript:void(0)" class="avatar s16 avatar-inline identicon bg6" style="text-decoration: none">N</a><a href="mailto:support@github.com" title="support@github.com">dependabot[bot]</a> &lt;<a href="mailto:support@github.com" title="support@github.com">support@github.com</a>&gt;</span> https://gitcode.net/iotsharp/IoTSharp/-/commit/5df0f8fc35f648443aafcc6c8789dfb37b5bf4ae 修复引用包错误导致无法启动的问题。 2023-07-12T18:32:23+08:00 MysticBoy mysticboy@live.com https://gitcode.net/iotsharp/IoTSharp/-/commit/b233f3957a727aba6b121ce1f70c4d385d875aa7 修改包问题。 2023-07-12T18:32:43+08:00 MysticBoy mysticboy@live.com https://gitcode.net/iotsharp/IoTSharp/-/commit/e04d468b708b7f6152c985c7da57b506e7c66dc2 Bump AspNetCore.HealthChecks.Sqlite from 7.0.0-rc2.5 to 7.0.0-rc2.6 2023-07-12T10:33:35+00:00 dependabot[bot] 49699333+dependabot[bot]@users.noreply.github.com Bumps [AspNetCore.HealthChecks.Sqlite](<a href="https://github.com/Xabaril/AspNetCore.Diagnostics.HealthChecks" rel="nofollow noreferrer noopener" target="_blank">https://github.com/Xabaril/AspNetCore.Diagnostics.HealthChecks</a>) from 7.0.0-rc2.5 to 7.0.0-rc2.6. - [Changelog](<a href="https://github.com/Xabaril/AspNetCore.Diagnostics.HealthChecks/blob/master/doc/ui-changelog.md" rel="nofollow noreferrer noopener" target="_blank">https://github.com/Xabaril/AspNetCore.Diagnostics.HealthChecks/blob/master/doc/ui-changelog.md</a>) - [Commits](<a href="https://github.com/Xabaril/AspNetCore.Diagnostics.HealthChecks/commits" rel="nofollow noreferrer noopener" target="_blank">https://github.com/Xabaril/AspNetCore.Diagnostics.HealthChecks/commits</a>) --- updated-dependencies: - dependency-name: AspNetCore.HealthChecks.Sqlite dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: <span data-trailer="Signed-off-by:"><a href="mailto:support@github.com" title="support@github.com"></a><a href="javascript:void(0)" class="avatar s16 avatar-inline identicon bg4" style="text-decoration: none">N</a><a href="mailto:support@github.com" title="support@github.com">dependabot[bot]</a> &lt;<a href="mailto:support@github.com" title="support@github.com">support@github.com</a>&gt;</span> https://gitcode.net/iotsharp/IoTSharp/-/commit/eb34f255835b1951bd6dc9b7d5ce24270f4c2c26 Merge pull request #1052 from IoTSharp/dependabot/nuget/AspNetCore.HealthChec... 2023-07-12T18:34:50+08:00 MysticBoy mysticboy@live.com Bump AspNetCore.HealthChecks.System from 7.0.0-rc2.5 to 7.0.0-rc2.6 https://gitcode.net/iotsharp/IoTSharp/-/commit/ff6269ac31b5689889262076c7a9ec22c83ed41a Merge pull request #1049 from IoTSharp/dependabot/nuget/AspNetCore.HealthChec... 2023-07-12T18:35:02+08:00 MysticBoy mysticboy@live.com Bump AspNetCore.HealthChecks.Sqlite from 7.0.0-rc2.5 to 7.0.0-rc2.6
......@@ -746,3 +746,4 @@ ASALocalRun/
>>>>>>> .theirs
/ClientApp/.eslintrc-auto-import.json
......@@ -4,10 +4,14 @@
<JavaScriptTestRoot>.\</JavaScriptTestRoot>
<JavaScriptTestFramework>Jest</JavaScriptTestFramework>
<!-- Command to run on project build -->
<BuildCommand></BuildCommand>
<BuildCommand>
</BuildCommand>
<!-- Command to create an optimized build of the project that's ready for publishing -->
<ProductionBuildCommand>npm run build</ProductionBuildCommand>
<!-- Folder where production build objects will be placed -->
<BuildOutputFolder>$(MSBuildProjectDirectory)\dist</BuildOutputFolder>
</PropertyGroup>
<ItemGroup>
<None Remove=".eslintrc-auto-import.json" />
</ItemGroup>
</Project>
\ No newline at end of file
// Generated by 'unplugin-auto-import'
export {}
declare global {
const EffectScope: typeof import('vue')['EffectScope']
const ElMessage: typeof import('element-plus/es')['ElMessage']
const acceptHMRUpdate: typeof import('pinia')['acceptHMRUpdate']
const computed: typeof import('vue')['computed']
const createApp: typeof import('vue')['createApp']
const createPinia: typeof import('pinia')['createPinia']
const customRef: typeof import('vue')['customRef']
const defineAsyncComponent: typeof import('vue')['defineAsyncComponent']
const defineComponent: typeof import('vue')['defineComponent']
const defineStore: typeof import('pinia')['defineStore']
const effectScope: typeof import('vue')['effectScope']
const getActivePinia: typeof import('pinia')['getActivePinia']
const getCurrentInstance: typeof import('vue')['getCurrentInstance']
const getCurrentScope: typeof import('vue')['getCurrentScope']
const h: typeof import('vue')['h']
const inject: typeof import('vue')['inject']
const isProxy: typeof import('vue')['isProxy']
const isReactive: typeof import('vue')['isReactive']
const isReadonly: typeof import('vue')['isReadonly']
const isRef: typeof import('vue')['isRef']
const mapActions: typeof import('pinia')['mapActions']
const mapGetters: typeof import('pinia')['mapGetters']
const mapState: typeof import('pinia')['mapState']
const mapStores: typeof import('pinia')['mapStores']
const mapWritableState: typeof import('pinia')['mapWritableState']
const markRaw: typeof import('vue')['markRaw']
const nextTick: typeof import('vue')['nextTick']
const onActivated: typeof import('vue')['onActivated']
const onBeforeMount: typeof import('vue')['onBeforeMount']
const onBeforeRouteLeave: typeof import('vue-router')['onBeforeRouteLeave']
const onBeforeRouteUpdate: typeof import('vue-router')['onBeforeRouteUpdate']
const onBeforeUnmount: typeof import('vue')['onBeforeUnmount']
const onBeforeUpdate: typeof import('vue')['onBeforeUpdate']
const onDeactivated: typeof import('vue')['onDeactivated']
const onErrorCaptured: typeof import('vue')['onErrorCaptured']
const onMounted: typeof import('vue')['onMounted']
const onRenderTracked: typeof import('vue')['onRenderTracked']
const onRenderTriggered: typeof import('vue')['onRenderTriggered']
const onScopeDispose: typeof import('vue')['onScopeDispose']
const onServerPrefetch: typeof import('vue')['onServerPrefetch']
const onUnmounted: typeof import('vue')['onUnmounted']
const onUpdated: typeof import('vue')['onUpdated']
const provide: typeof import('vue')['provide']
const reactive: typeof import('vue')['reactive']
const readonly: typeof import('vue')['readonly']
const ref: typeof import('vue')['ref']
const resolveComponent: typeof import('vue')['resolveComponent']
const resolveDirective: typeof import('vue')['resolveDirective']
const setActivePinia: typeof import('pinia')['setActivePinia']
const setMapStoreSuffix: typeof import('pinia')['setMapStoreSuffix']
const shallowReactive: typeof import('vue')['shallowReactive']
const shallowReadonly: typeof import('vue')['shallowReadonly']
const shallowRef: typeof import('vue')['shallowRef']
const storeToRefs: typeof import('pinia')['storeToRefs']
const toRaw: typeof import('vue')['toRaw']
const toRef: typeof import('vue')['toRef']
const toRefs: typeof import('vue')['toRefs']
const triggerRef: typeof import('vue')['triggerRef']
const unref: typeof import('vue')['unref']
const useAttrs: typeof import('vue')['useAttrs']
const useCssModule: typeof import('vue')['useCssModule']
const useCssVars: typeof import('vue')['useCssVars']
const useLink: typeof import('vue-router')['useLink']
const useRoute: typeof import('vue-router')['useRoute']
const useRouter: typeof import('vue-router')['useRouter']
const useSlots: typeof import('vue')['useSlots']
const watch: typeof import('vue')['watch']
const watchEffect: typeof import('vue')['watchEffect']
const watchPostEffect: typeof import('vue')['watchPostEffect']
const watchSyncEffect: typeof import('vue')['watchSyncEffect']
}
// generated by unplugin-vue-components
// We suggest you to commit this file into source control
// Read more: https://github.com/vuejs/core/pull/3399
import '@vue/runtime-core'
export {}
declare module '@vue/runtime-core' {
export interface GlobalComponents {
AdvancedKeyValue: typeof import('./components/AdvancedKeyValue/AdvancedKeyValue.vue')['default']
AppLogo: typeof import('./components/AppLogo.vue')['default']
Auth: typeof import('./components/auth/auth.vue')['default']
AuthAll: typeof import('./components/auth/authAll.vue')['default']
Auths: typeof import('./components/auth/auths.vue')['default']
Card: typeof import('./components/card/index.vue')['default']
Cropper: typeof import('./components/cropper/index.vue')['default']
Editor: typeof import('./components/editor/index.vue')['default']
ElAlert: typeof import('element-plus/es')['ElAlert']
ElAside: typeof import('element-plus/es')['ElAside']
ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete']
ElBacktop: typeof import('element-plus/es')['ElBacktop']
ElBadge: typeof import('element-plus/es')['ElBadge']
ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
ElButton: typeof import('element-plus/es')['ElButton']
ElCard: typeof import('element-plus/es')['ElCard']
ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
ElCol: typeof import('element-plus/es')['ElCol']
ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
ElContainer: typeof import('element-plus/es')['ElContainer']
ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
ElDialog: typeof import('element-plus/es')['ElDialog']
ElDivider: typeof import('element-plus/es')['ElDivider']
ElDrawer: typeof import('element-plus/es')['ElDrawer']
ElDropdown: typeof import('element-plus/es')['ElDropdown']
ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
ElEmpty: typeof import('element-plus/es')['ElEmpty']
ElForm: typeof import('element-plus/es')['ElForm']
ElFormItem: typeof import('element-plus/es')['ElFormItem']
ElHeader: typeof import('element-plus/es')['ElHeader']
ElIcon: typeof import('element-plus/es')['ElIcon']
ElInput: typeof import('element-plus/es')['ElInput']
ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
ElLink: typeof import('element-plus/es')['ElLink']
ElMain: typeof import('element-plus/es')['ElMain']
ElMenu: typeof import('element-plus/es')['ElMenu']
ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
ElOption: typeof import('element-plus/es')['ElOption']
ElPagination: typeof import('element-plus/es')['ElPagination']
ElPopover: typeof import('element-plus/es')['ElPopover']
ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
ElRow: typeof import('element-plus/es')['ElRow']
ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
ElSelect: typeof import('element-plus/es')['ElSelect']
ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
ElSwitch: typeof import('element-plus/es')['ElSwitch']
ElTable: typeof import('element-plus/es')['ElTable']
ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
ElTabPane: typeof import('element-plus/es')['ElTabPane']
ElTabs: typeof import('element-plus/es')['ElTabs']
ElTag: typeof import('element-plus/es')['ElTag']
ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
IconSelector: typeof import('./components/iconSelector/index.vue')['default']
Monaco: typeof import('./components/monaco/monaco.vue')['default']
NoticeBar: typeof import('./components/noticeBar/index.vue')['default']
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']
SvgIcon: typeof import('./components/svgIcon/index.vue')['default']
ZSelect: typeof import('./components/AdvancedKeyValue/z-select.vue')['default']
ZSwitch: typeof import('./components/AdvancedKeyValue/z-switch.vue')['default']
}
export interface ComponentCustomProperties {
vLoading: typeof import('element-plus/es')['ElLoadingDirective']
}
}
......@@ -8,7 +8,7 @@
<PackageReference Include="AspNetCore.HealthChecks.MySql" Version="7.0.0-rc2.4" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="7.0.0-rc2.7" />
<PackageReference Include="AspNetCore.HealthChecks.UI.MySql.Storage" Version="7.0.0-rc2.7" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="7.0.5" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="7.0.9" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
</ItemGroup>
......
......@@ -7,7 +7,7 @@
<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="7.0.0-rc2.11" />
<PackageReference Include="AspNetCore.HealthChecks.UI.SqlServer.Storage" Version="7.0.0-rc2.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
</ItemGroup>
<ItemGroup>
......
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.Sqlite" Version="7.0.0-rc2.5" />
<PackageReference Include="AspNetCore.HealthChecks.Sqlite" Version="7.0.0-rc2.6" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Sqlite.Storage" Version="7.0.0-rc2.7" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Core" Version="7.0.0-rc2.7" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="7.0.5" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="7.0.9" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\IoTSharp.Data\IoTSharp.Data.csproj" />
......
......@@ -6,19 +6,19 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="7.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="7.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.5">
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.9" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="7.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="7.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.9" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="ShardingCore" Version="7.7.1.10" />
<PackageReference Include="ShardingCore" Version="7.7.1.11" />
</ItemGroup>
......
......@@ -8,19 +8,19 @@
<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="7.0.0-rc2.6" />
<PackageReference Include="CAP.Extensions" Version="1.0.37" />
<PackageReference Include="DotNetCore.CAP.Dashboard" Version="7.1.3" />
<PackageReference Include="DotNetCore.CAP.InMemoryStorage" Version="7.1.3" />
<PackageReference Include="DotNetCore.CAP.Kafka" Version="7.1.3" />
<PackageReference Include="DotNetCore.CAP.MongoDB" Version="7.1.3" />
<PackageReference Include="DotNetCore.CAP.MySql" Version="7.1.3" />
<PackageReference Include="DotNetCore.CAP.PostgreSql" Version="7.1.3" />
<PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="7.1.3" />
<PackageReference Include="DotNetCore.CAP.SqlServer" Version="7.1.3" />
<PackageReference Include="DotNetCore.CAP.AzureServiceBus" Version="7.1.3" />
<PackageReference Include="DotNetCore.CAP.AmazonSQS" Version="7.1.3" />
<PackageReference Include="DotNetCore.CAP.NATS" Version="7.1.3" />
<PackageReference Include="DotNetCore.CAP.RedisStreams" Version="7.1.3" />
<PackageReference Include="DotNetCore.CAP.Pulsar" Version="7.1.3" />
<PackageReference Include="DotNetCore.CAP.Dashboard" Version="7.1.4" />
<PackageReference Include="DotNetCore.CAP.InMemoryStorage" Version="7.1.4" />
<PackageReference Include="DotNetCore.CAP.Kafka" Version="7.1.4" />
<PackageReference Include="DotNetCore.CAP.MongoDB" Version="7.1.4" />
<PackageReference Include="DotNetCore.CAP.MySql" Version="7.1.4" />
<PackageReference Include="DotNetCore.CAP.PostgreSql" Version="7.1.4" />
<PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="7.1.4" />
<PackageReference Include="DotNetCore.CAP.SqlServer" Version="7.1.4" />
<PackageReference Include="DotNetCore.CAP.AzureServiceBus" Version="7.1.4" />
<PackageReference Include="DotNetCore.CAP.AmazonSQS" Version="7.1.4" />
<PackageReference Include="DotNetCore.CAP.NATS" Version="7.1.4" />
<PackageReference Include="DotNetCore.CAP.RedisStreams" Version="7.1.4" />
<PackageReference Include="DotNetCore.CAP.Pulsar" Version="7.1.4" />
<PackageReference Include="EasyCaching.Core" Version="1.9.0" />
<PackageReference Include="AspNetCore.HealthChecks.Kafka" Version="7.0.0-rc2.7" />
<PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="7.0.0-rc2.5" />
......
......@@ -12,7 +12,7 @@
</PropertyGroup>
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.1" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
</ItemGroup>
</Project>
......@@ -12,7 +12,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="7.0.5" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="7.0.9" />
</ItemGroup>
</Project>
......@@ -10,8 +10,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.9" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
......
......@@ -15,7 +15,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Quartz.AspNetCore" Version="3.6.2" />
<PackageReference Include="Quartz.AspNetCore" Version="3.6.3" />
</ItemGroup>
<ItemGroup>
......
......@@ -4,13 +4,13 @@
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CLanguage" Version="0.18.54" />
<PackageReference Include="CS-Script" Version="4.6.5" />
<PackageReference Include="CLanguage" Version="0.19.66" />
<PackageReference Include="CS-Script" Version="4.8.1" />
<PackageReference Include="Jint" Version="3.0.0-beta-2037" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
<PackageReference Include="IronPython" Version="3.4.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
<PackageReference Include="NeoLua" Version="1.3.14" />
......
......@@ -19,7 +19,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MQTTnet" Version="4.2.0.706" />
<PackageReference Include="MQTTnet" Version="4.2.1.781" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
......
......@@ -7,9 +7,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.5" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
<PackageReference Include="MSTest.TestFramework" Version="3.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.9" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageReference Include="MSTest.TestFramework" Version="3.0.4" />
</ItemGroup>
<ItemGroup>
......
......@@ -7,6 +7,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1.Solution Items", "1.Solut
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
appveyor.yml = appveyor.yml
BACKERS.md = BACKERS.md
buildimage.cmd = buildimage.cmd
buildimageqhse.cmd = buildimageqhse.cmd
buildimageuixe.cmd = buildimageuixe.cmd
......
......@@ -96,9 +96,9 @@ namespace IoTSharp
public static void UseIotSharpMqttServer(this IApplicationBuilder app)
{
var mqttEvents = app.ApplicationServices.CreateScope().ServiceProvider.GetService<MQTTService>();
app.UseAttributeRouting(true);
app.UseMqttServer(server =>
{
server.WithAttributeRouting(app.ApplicationServices, true);
server.ClientConnectedAsync += mqttEvents.Server_ClientConnectedAsync;
server.StartedAsync += mqttEvents.Server_Started;
server.StoppedAsync += mqttEvents.Server_Stopped;
......
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
......@@ -49,7 +49,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.System" Version="7.0.0-rc2.5" />
<PackageReference Include="AspNetCore.HealthChecks.System" Version="7.0.0-rc2.6" />
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="7.0.0-rc2.7" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="7.0.0-rc2.7" />
<PackageReference Include="EasyCaching.InMemory" Version="1.9.0" />
......@@ -61,32 +61,32 @@
<PackageReference Include="Jdenticon-net" Version="3.1.2" />
<PackageReference Include="Jdenticon.AspNetCore" Version="3.1.2" />
<PackageReference Include="LiteDB" Version="5.0.16" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.5" />
<PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="7.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.5">
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.9" />
<PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="7.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
<PackageReference Include="MimeMapping" Version="2.0.0" />
<PackageReference Include="MQTTnet" Version="4.2.0.706" />
<PackageReference Include="MQTTnet" Version="4.2.1.781" />
<PackageReference Include="MQTTnet.AspNetCore" Version="4.2.1.781" />
<PackageReference Include="MQTTnet.AspNetCore.Routing" Version="0.4.16" />
<PackageReference Include="MQTTnet.AspNetCore.Routing" Version="0.4.30" />
<PackageReference Include="NSwag.AspNetCore" Version="13.19.0" />
<PackageReference Include="Rin" Version="2.6.0" />
<PackageReference Include="Rin.Mvc" Version="2.6.0" />
<PackageReference Include="RulesEngine" Version="4.0.0" />
<PackageReference Include="RulesEngine" Version="5.0.0" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.3" />
<PackageReference Include="Storage.Net" Version="9.3.0" />
<PackageReference Include="ShardingCore" Version="7.7.1.10" />
<PackageReference Include="ShardingCore" Version="7.7.1.11" />
<PackageReference Include="System.Resources.Extensions" Version="7.0.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0">
<TreatAsUsed>true</TreatAsUsed>
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.5" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.9" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.9" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.9" />
</ItemGroup>
......
......@@ -29,12 +29,12 @@ using IoTSharp.Contracts;
using IoTSharp.EventBus.CAP;
using IoTSharp.EventBus.Shashlik;
using Microsoft.EntityFrameworkCore;
using ShardingCore;
using Storage.Net;
using IoTSharp.Data.TimeSeries;
using IoTSharp.Data.Extensions;
using Quartz;
using IoTSharp.Services;
using Quartz.AspNetCore;
namespace IoTSharp
{
......