update dependencies

megurte · Aug 18, 2024 · 9780461 · 9780461
1 parent aeb208f
commit 9780461
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 8 deletions.
diff --git a/DalamudInjector b/DalamudInjector
diff --git a/WhichMount.sln b/WhichMount.sln
@@ -5,6 +5,10 @@ VisualStudioVersion = 16.0.29709.97
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WhichMount", "WhichMount\WhichMount.csproj", "{13C812E9-0D42-4B95-8646-40EEBF30636F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DalamudInjector", "DalamudInjector", "{27507861-C582-4A6D-8C3E-453BCA93EA48}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DalamudInjector", "DalamudInjector\DalamudInjector\DalamudInjector.csproj", "{E5AF2D71-C60A-4967-882B-F69625E25E21}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -15,11 +19,18 @@ Global
 		{13C812E9-0D42-4B95-8646-40EEBF30636F}.Debug|x64.Build.0 = Debug|x64
 		{13C812E9-0D42-4B95-8646-40EEBF30636F}.Release|x64.ActiveCfg = Release|x64
 		{13C812E9-0D42-4B95-8646-40EEBF30636F}.Release|x64.Build.0 = Release|x64
+		{E5AF2D71-C60A-4967-882B-F69625E25E21}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E5AF2D71-C60A-4967-882B-F69625E25E21}.Debug|x64.Build.0 = Debug|Any CPU
+		{E5AF2D71-C60A-4967-882B-F69625E25E21}.Release|x64.ActiveCfg = Release|Any CPU
+		{E5AF2D71-C60A-4967-882B-F69625E25E21}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B17E85B1-5F60-4440-9F9A-3DDE877E8CDF}
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{E5AF2D71-C60A-4967-882B-F69625E25E21} = {27507861-C582-4A6D-8C3E-453BCA93EA48}
+	EndGlobalSection
 EndGlobal
diff --git a/WhichMount/ServiceInstaller.cs b/WhichMount/ServiceInstaller.cs
@@ -1,5 +1,4 @@
-using Dalamud.IoC;
-using Dalamud.Plugin;
+using Dalamud.Plugin;
 using Dalamud.Plugin.Services;
 using DalamudInjector;
 

diff --git a/WhichMount/WhichMount.csproj b/WhichMount/WhichMount.csproj
@@ -3,7 +3,7 @@
   <Import Project="Dalamud.Plugin.Bootstrap.targets"/>
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework> <!-- или другая версия, соответствующая вашим требованиям -->
+    <TargetFramework>net8.0-windows</TargetFramework>
     <Version>1.0.0.0</Version>
     <Description>Searching for other player's mount</Description>
     <PackageProjectUrl>https://github.com/megurte/whichmount</PackageProjectUrl>
@@ -24,8 +24,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Visible>false</Visible>
     </Content>
-    <Reference Include="DalamudInjector">
-      <HintPath>..\..\..\DalamudInjector\DalamudInjector\bin\Release\DalamudInjector.dll</HintPath>
-    </Reference>
+  </ItemGroup>
+
+  <ItemGroup>
+  	<ProjectReference Include="..\DalamudInjector\DalamudInjector\DalamudInjector.csproj" />
   </ItemGroup>
 </Project>
diff --git a/WhichMount/packages.lock.json b/WhichMount/packages.lock.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "dependencies": {
-    "net8.0": {
+    "net8.0-windows7.0": {
       "DalamudPackager": {
         "type": "Direct",
         "requested": "[2.1.13, )",
@@ -110,6 +110,13 @@
         "type": "Transitive",
         "resolved": "8.0.0",
         "contentHash": "7V0I8tPa9V7UxMx/+7DIwkhls5ouaEMQx6l/GwGm1Y8kJQ61On9B/PxCXFLbgu5/C47g0BP2CUYs+nMv1+Oaqw=="
+      },
+      "dalamudinjector": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Build": "[17.10.4, )",
+          "Microsoft.Extensions.DependencyInjection": "[9.0.0-preview.6.24327.7, )"
+        }
       }
     }
   }