From a27f32ecbfc7390ceb9e3a8d8651c57ada88bfa0 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期五, 19 十二月 2025 20:51:42 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/XB_MES_API
---
StandardPda/MES.Service/obj/MES.Service.csproj.nuget.dgspec.json | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/StandardPda/MES.Service/obj/MES.Service.csproj.nuget.dgspec.json b/StandardPda/MES.Service/obj/MES.Service.csproj.nuget.dgspec.json
index 959cd32..b230838 100644
--- a/StandardPda/MES.Service/obj/MES.Service.csproj.nuget.dgspec.json
+++ b/StandardPda/MES.Service/obj/MES.Service.csproj.nuget.dgspec.json
@@ -1,24 +1,25 @@
{
"format": 1,
"restore": {
- "D:\\GS\\椤圭洰\\灏忔api\\StandardPda\\MES.Service\\MES.Service.csproj": {}
+ "D:\\Workspace\\gs\\XB_MES_API\\StandardPda\\MES.Service\\MES.Service.csproj": {}
},
"projects": {
- "D:\\GS\\椤圭洰\\灏忔api\\StandardPda\\MES.Service\\MES.Service.csproj": {
+ "D:\\Workspace\\gs\\XB_MES_API\\StandardPda\\MES.Service\\MES.Service.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "D:\\GS\\椤圭洰\\灏忔api\\StandardPda\\MES.Service\\MES.Service.csproj",
+ "projectUniqueName": "D:\\Workspace\\gs\\XB_MES_API\\StandardPda\\MES.Service\\MES.Service.csproj",
"projectName": "MES.Service",
- "projectPath": "D:\\GS\\椤圭洰\\灏忔api\\StandardPda\\MES.Service\\MES.Service.csproj",
- "packagesPath": "C:\\Users\\22078\\.nuget\\packages\\",
- "outputPath": "D:\\GS\\椤圭洰\\灏忔api\\StandardPda\\MES.Service\\obj\\",
+ "projectPath": "D:\\Workspace\\gs\\XB_MES_API\\StandardPda\\MES.Service\\MES.Service.csproj",
+ "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
+ "outputPath": "D:\\Workspace\\gs\\XB_MES_API\\StandardPda\\MES.Service\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
+ "D:\\Program Files\\DevExpress 22.2\\Components\\Offline Packages",
+ "D:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
],
"configFilePaths": [
- "C:\\Users\\22078\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.2.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
@@ -27,6 +28,7 @@
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "D:\\Program Files\\DevExpress 22.2\\Components\\System\\Components\\Packages": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
@@ -51,6 +53,10 @@
"net8.0": {
"targetAlias": "net8.0",
"dependencies": {
+ "EPPlus": {
+ "target": "Package",
+ "version": "[7.0.0, )"
+ },
"Masuit.Tools.Core": {
"target": "Package",
"version": "[2024.3.4, )"
@@ -76,7 +82,7 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.302/PortableRuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.306/PortableRuntimeIdentifierGraph.json"
}
}
}
--
Gitblit v1.9.3