Skip to content

Commit

Permalink
$ git merge v2 -X ours
Browse files Browse the repository at this point in the history
  • Loading branch information
@n0099
n0099 committed Oct 9, 2024
2 parents 6bb58e5 + ef9938e commit 716033d
Show file tree
Hide file tree
Showing 7 changed files with 573 additions and 603 deletions.
24 changes: 12 additions & 12 deletions c#/crawler/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,10 @@
},
"Microsoft.EntityFrameworkCore.Relational": {
"type": "Transitive",
"resolved": "8.0.4",
"contentHash": "aWLT6e9a8oMzXgF0YQpYYa3mDeU+yb2UQSQ+RrIgyGgSpzPfSKgpA7v2kOVDuZr2AQ6NNAlWPaBG7wZuKQI96w==",
"resolved": "8.0.8",
"contentHash": "3WnrwdXxKg4L98cDx0lNEEau8U2lsfuBJCs0Yzht+5XVTmahboM7MukKfQHAzVsHUPszm6ci929S7Qas0WfVHA==",
"dependencies": {
"Microsoft.EntityFrameworkCore": "8.0.4",
"Microsoft.EntityFrameworkCore": "8.0.8",
"Microsoft.Extensions.Configuration.Abstractions": "8.0.0"
}
},
Expand Down Expand Up @@ -478,21 +478,21 @@
},
"Npgsql": {
"type": "Transitive",
"resolved": "8.0.3",
"contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==",
"resolved": "8.0.4",
"contentHash": "vaYEUlF/pB9m8bs21wQv3Da0kMHT4A9USe47VfY/L2BO97xz5KfIxhEu22QS9d68ZrLxvtL3wQDfDLPr2OjbjA==",
"dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "8.0.0"
}
},
"Npgsql.EntityFrameworkCore.PostgreSQL": {
"type": "Transitive",
"resolved": "8.0.4",
"contentHash": "/hHd9MqTRVDgIpsToCcxMDxZqla0HAQACiITkq1+L9J2hmHKV6lBAPlauF+dlNSfHpus7rrljWx4nAanKD6qAw==",
"resolved": "8.0.8",
"contentHash": "D5WWJZJTgZYUmGv66BARXbTlinp2a5f5RueJqGYoHuWJw02J0i2va/RA+8N4A5hLORK5YKMRqXhFWtKsZdrksw==",
"dependencies": {
"Microsoft.EntityFrameworkCore": "8.0.4",
"Microsoft.EntityFrameworkCore.Abstractions": "8.0.4",
"Microsoft.EntityFrameworkCore.Relational": "8.0.4",
"Npgsql": "8.0.3"
"Microsoft.EntityFrameworkCore": "8.0.8",
"Microsoft.EntityFrameworkCore.Abstractions": "8.0.8",
"Microsoft.EntityFrameworkCore.Relational": "8.0.8",
"Npgsql": "8.0.4"
}
},
"SuperLinq": {
Expand Down Expand Up @@ -553,7 +553,7 @@
"Microsoft.EntityFrameworkCore": "[8.0.8, )",
"Microsoft.Extensions.Hosting": "[8.0.0, )",
"NLog.Extensions.Logging": "[5.3.14, )",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[8.0.4, )",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[8.0.8, )",
"SuperLinq": "[6.2.0, )"
}
}
Expand Down
40 changes: 20 additions & 20 deletions c#/imagePipeline/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@
},
"Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite": {
"type": "Direct",
"requested": "[8.0.4, )",
"resolved": "8.0.4",
"contentHash": "H4k6jTunSNB8VXW5GqFyq+fWUcz/u6CenUlk9vi+C5TXdMJAXbBIclcUlITjVPd/XRQvT0UnVrt8njEYrwdMRA==",
"requested": "[8.0.8, )",
"resolved": "8.0.8",
"contentHash": "hMljtFEu1n+Yr2vmRQgxIOs4qyisqkNwPFjlhIyrc/3xvT7bCQmG2F0Mt3FCW6dykRd5wHk3No3YWlx0AYDqeQ==",
"dependencies": {
"Npgsql.EntityFrameworkCore.PostgreSQL": "8.0.4",
"Npgsql.NetTopologySuite": "8.0.3"
"Npgsql.EntityFrameworkCore.PostgreSQL": "8.0.8",
"Npgsql.NetTopologySuite": "8.0.4"
}
},
"OpenCvSharp4": {
Expand Down Expand Up @@ -183,10 +183,10 @@
},
"Microsoft.EntityFrameworkCore.Relational": {
"type": "Transitive",
"resolved": "8.0.4",
"contentHash": "aWLT6e9a8oMzXgF0YQpYYa3mDeU+yb2UQSQ+RrIgyGgSpzPfSKgpA7v2kOVDuZr2AQ6NNAlWPaBG7wZuKQI96w==",
"resolved": "8.0.8",
"contentHash": "3WnrwdXxKg4L98cDx0lNEEau8U2lsfuBJCs0Yzht+5XVTmahboM7MukKfQHAzVsHUPszm6ci929S7Qas0WfVHA==",
"dependencies": {
"Microsoft.EntityFrameworkCore": "8.0.4",
"Microsoft.EntityFrameworkCore": "8.0.8",
"Microsoft.Extensions.Configuration.Abstractions": "8.0.0"
}
},
Expand Down Expand Up @@ -548,31 +548,31 @@
},
"Npgsql": {
"type": "Transitive",
"resolved": "8.0.3",
"contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==",
"resolved": "8.0.4",
"contentHash": "vaYEUlF/pB9m8bs21wQv3Da0kMHT4A9USe47VfY/L2BO97xz5KfIxhEu22QS9d68ZrLxvtL3wQDfDLPr2OjbjA==",
"dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "8.0.0"
}
},
"Npgsql.EntityFrameworkCore.PostgreSQL": {
"type": "Transitive",
"resolved": "8.0.4",
"contentHash": "/hHd9MqTRVDgIpsToCcxMDxZqla0HAQACiITkq1+L9J2hmHKV6lBAPlauF+dlNSfHpus7rrljWx4nAanKD6qAw==",
"resolved": "8.0.8",
"contentHash": "D5WWJZJTgZYUmGv66BARXbTlinp2a5f5RueJqGYoHuWJw02J0i2va/RA+8N4A5hLORK5YKMRqXhFWtKsZdrksw==",
"dependencies": {
"Microsoft.EntityFrameworkCore": "8.0.4",
"Microsoft.EntityFrameworkCore.Abstractions": "8.0.4",
"Microsoft.EntityFrameworkCore.Relational": "8.0.4",
"Npgsql": "8.0.3"
"Microsoft.EntityFrameworkCore": "8.0.8",
"Microsoft.EntityFrameworkCore.Abstractions": "8.0.8",
"Microsoft.EntityFrameworkCore.Relational": "8.0.8",
"Npgsql": "8.0.4"
}
},
"Npgsql.NetTopologySuite": {
"type": "Transitive",
"resolved": "8.0.3",
"contentHash": "Lvz8BOojjhbn9hA9D7+NLUfj5poKhU4wAgKWC9Gj5fFt73JZpMBdm9tea0yyXPR89GYa7nhYpPYP2L28lBb1Wg==",
"resolved": "8.0.4",
"contentHash": "3henjF4ffHaHi0Ovdq8pQKEVHidlKCXar5bso28ZVqnZSGgjAABZrqy6cR1DRcOZ78tVsZS/aJAun10eCZBeiQ==",
"dependencies": {
"NetTopologySuite": "2.5.0",
"NetTopologySuite.IO.PostGIS": "2.1.0",
"Npgsql": "8.0.3"
"Npgsql": "8.0.4"
}
},
"Polly": {
Expand Down Expand Up @@ -915,7 +915,7 @@
"Microsoft.EntityFrameworkCore": "[8.0.8, )",
"Microsoft.Extensions.Hosting": "[8.0.0, )",
"NLog.Extensions.Logging": "[5.3.14, )",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[8.0.4, )",
"Npgsql.EntityFrameworkCore.PostgreSQL": "[8.0.8, )",
"SuperLinq": "[6.2.0, )"
}
}
Expand Down
2 changes: 1 addition & 1 deletion c#/imagePipeline/tbm.ImagePipeline.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<ItemGroup>
<PackageReference Include="LanguageExt.Core" Version="4.4.9" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.8" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="8.0.4" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="8.0.8" />
<PackageReference Include="OpenCvSharp4" Version="4.10.0.20240616" />
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.10.0.20240616" />
<PackageReference Include="Sdcb.PaddleInference.runtime.win64.mkl" Version="2.6.1" />
Expand Down
24 changes: 12 additions & 12 deletions c#/shared/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,14 @@
},
"Npgsql.EntityFrameworkCore.PostgreSQL": {
"type": "Direct",
"requested": "[8.0.4, )",
"resolved": "8.0.4",
"contentHash": "/hHd9MqTRVDgIpsToCcxMDxZqla0HAQACiITkq1+L9J2hmHKV6lBAPlauF+dlNSfHpus7rrljWx4nAanKD6qAw==",
"requested": "[8.0.8, )",
"resolved": "8.0.8",
"contentHash": "D5WWJZJTgZYUmGv66BARXbTlinp2a5f5RueJqGYoHuWJw02J0i2va/RA+8N4A5hLORK5YKMRqXhFWtKsZdrksw==",
"dependencies": {
"Microsoft.EntityFrameworkCore": "8.0.4",
"Microsoft.EntityFrameworkCore.Abstractions": "8.0.4",
"Microsoft.EntityFrameworkCore.Relational": "8.0.4",
"Npgsql": "8.0.3"
"Microsoft.EntityFrameworkCore": "8.0.8",
"Microsoft.EntityFrameworkCore.Abstractions": "8.0.8",
"Microsoft.EntityFrameworkCore.Relational": "8.0.8",
"Npgsql": "8.0.4"
}
},
"SuperLinq": {
Expand Down Expand Up @@ -130,10 +130,10 @@
},
"Microsoft.EntityFrameworkCore.Relational": {
"type": "Transitive",
"resolved": "8.0.4",
"contentHash": "aWLT6e9a8oMzXgF0YQpYYa3mDeU+yb2UQSQ+RrIgyGgSpzPfSKgpA7v2kOVDuZr2AQ6NNAlWPaBG7wZuKQI96w==",
"resolved": "8.0.8",
"contentHash": "3WnrwdXxKg4L98cDx0lNEEau8U2lsfuBJCs0Yzht+5XVTmahboM7MukKfQHAzVsHUPszm6ci929S7Qas0WfVHA==",
"dependencies": {
"Microsoft.EntityFrameworkCore": "8.0.4",
"Microsoft.EntityFrameworkCore": "8.0.8",
"Microsoft.Extensions.Configuration.Abstractions": "8.0.0"
}
},
Expand Down Expand Up @@ -417,8 +417,8 @@
},
"Npgsql": {
"type": "Transitive",
"resolved": "8.0.3",
"contentHash": "6WEmzsQJCZAlUG1pThKg/RmeF6V+I0DmBBBE/8YzpRtEzhyZzKcK7ulMANDm5CkxrALBEC8H+5plxHWtIL7xnA==",
"resolved": "8.0.4",
"contentHash": "vaYEUlF/pB9m8bs21wQv3Da0kMHT4A9USe47VfY/L2BO97xz5KfIxhEu22QS9d68ZrLxvtL3wQDfDLPr2OjbjA==",
"dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "8.0.0"
}
Expand Down
4 changes: 2 additions & 2 deletions c#/shared/tbm.Shared.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.8" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.3.14" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.8" />
<PackageReference Include="SuperLinq" Version="6.2.0" />
</ItemGroup>
<Choose>
Expand All @@ -18,7 +18,7 @@
<PackageReference ExcludeAssets="compile" Include="codecracker.CSharp" Version="1.1.0" />
<PackageReference ExcludeAssets="compile" Include="CSharpGuidelinesAnalyzer" Version="3.8.5" />
<PackageReference ExcludeAssets="compile" Include="IDisposableAnalyzers" Version="4.0.8" />
<PackageReference ExcludeAssets="compile" Include="Meziantou.Analyzer" Version="2.0.168" />
<PackageReference ExcludeAssets="compile" Include="Meziantou.Analyzer" Version="2.0.169" />
<PackageReference ExcludeAssets="compile" Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" />
<PackageReference ExcludeAssets="compile" Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.11.20" />
<PackageReference ExcludeAssets="compile" Include="Roslynator.Analyzers" Version="4.12.6" />
Expand Down
22 changes: 11 additions & 11 deletions fe/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
"postinstall": "nuxt prepare"
},
"dependencies": {
"@ant-design-vue/nuxt": "^1.4.2",
"@ant-design-vue/nuxt": "^1.4.4",
"@fortawesome/free-brands-svg-icons": "^6.6.0",
"@fortawesome/free-regular-svg-icons": "^6.6.0",
"@fortawesome/free-solid-svg-icons": "^6.6.0",
"@hebilicious/vue-query-nuxt": "^0.3.0",
"@nuxtjs/seo": "^2.0.0-rc.21",
"@pinia/nuxt": "^0.5.4",
"@nuxtjs/seo": "^2.0.0-rc.23",
"@pinia/nuxt": "^0.5.5",
"@popperjs/core": "^2.11.8",
"@tanstack/vue-query": "^5.56.2",
"@vesp/nuxt-fontawesome": "^1.1.0",
Expand All @@ -32,26 +32,26 @@
"nuxt": "^3.13.2",
"scroll-into-view-if-needed": "^3.1.0",
"tippy.js": "^6.3.7",
"v-viewer": "^3.0.13",
"v-viewer": "^3.0.20",
"viewerjs": "^1.11.6",
"vue": "^3.5.8",
"vue": "^3.5.10",
"vue-router": "^4.4.5"
},
"devDependencies": {
"@eslint/compat": "^1.1.1",
"@eslint/eslintrc": "^3.1.0",
"@eslint/js": "^9.11.1",
"@nuxt/eslint": "^0.5.7",
"@tanstack/eslint-plugin-query": "^5.57.1",
"@tanstack/vue-query-devtools": "^5.56.2",
"@tanstack/eslint-plugin-query": "^5.58.1",
"@tanstack/vue-query-devtools": "^5.58.0",
"@types/bootstrap": "^5.2.10",
"@types/eslint": "^9.6.1",
"@types/grecaptcha": "^3.0.9",
"@types/lodash": "^4.17.9",
"@types/luxon": "^3.4.2",
"@types/node": "^22.6.1",
"@typescript-eslint/eslint-plugin": "^8.7.0",
"@typescript-eslint/parser": "^8.7.0",
"@types/node": "^22.7.4",
"@typescript-eslint/eslint-plugin": "^8.8.0",
"@typescript-eslint/parser": "^8.8.0",
"@vue/eslint-config-typescript": "^13.0.0",
"checkcss": "^2.0.9",
"eslint": "^9.11.1",
Expand All @@ -63,7 +63,7 @@
"type-coverage": "^2.29.1",
"typescript": "^5.6.2",
"typescript-eslint-parser-for-extra-files": "^0.7.0",
"vite-bundle-analyzer": "^0.11.1",
"vite-bundle-analyzer": "^0.12.1",
"vue-tsc": "^2.1.6"
},
"browserslist": [
Expand Down
Loading

0 comments on commit 716033d

Please sign in to comment.