diff --git a/Dalamud.Common/Dalamud.Common.csproj b/Dalamud.Common/Dalamud.Common.csproj index 54a182210..774b551ad 100644 --- a/Dalamud.Common/Dalamud.Common.csproj +++ b/Dalamud.Common/Dalamud.Common.csproj @@ -6,7 +6,7 @@ - + diff --git a/Dalamud.CorePlugin/Dalamud.CorePlugin.csproj b/Dalamud.CorePlugin/Dalamud.CorePlugin.csproj index 0c6a86e8d..9b355a40b 100644 --- a/Dalamud.CorePlugin/Dalamud.CorePlugin.csproj +++ b/Dalamud.CorePlugin/Dalamud.CorePlugin.csproj @@ -25,9 +25,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Dalamud.Injector/Dalamud.Injector.csproj b/Dalamud.Injector/Dalamud.Injector.csproj index e4b46ccab..4a55174a1 100644 --- a/Dalamud.Injector/Dalamud.Injector.csproj +++ b/Dalamud.Injector/Dalamud.Injector.csproj @@ -52,18 +52,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Dalamud.Test/Dalamud.Test.csproj b/Dalamud.Test/Dalamud.Test.csproj index c6c8f8e8a..488534e5e 100644 --- a/Dalamud.Test/Dalamud.Test.csproj +++ b/Dalamud.Test/Dalamud.Test.csproj @@ -42,19 +42,19 @@ - - - - - - - - - + + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Dalamud.sln b/Dalamud.sln index fe1c9b19d..c3af00f44 100644 --- a/Dalamud.sln +++ b/Dalamud.sln @@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution targets\Dalamud.Plugin.targets = targets\Dalamud.Plugin.targets tools\dalamud.ruleset = tools\dalamud.ruleset Directory.Build.props = Directory.Build.props + Directory.Packages.props = Directory.Packages.props EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "build", "build\build.csproj", "{94E5B016-02B1-459B-97D9-E783F28764B2}" diff --git a/Dalamud/Dalamud.csproj b/Dalamud/Dalamud.csproj index b4cfd0a35..75ec61ec3 100644 --- a/Dalamud/Dalamud.csproj +++ b/Dalamud/Dalamud.csproj @@ -61,37 +61,38 @@ - - - - - - - - - + + + + + + + + + all - - - - - - - - - - + + + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - + + + + + + + imgui-frag.hlsl.bytes @@ -100,6 +101,7 @@ imgui-vertex.hlsl.bytes + diff --git a/Directory.Build.props b/Directory.Build.props index b5330709f..4ed87c809 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -8,15 +8,9 @@ 13.0 - - - 6.5.1 - 13.0.3 - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/build.csproj b/build/build.csproj index 37a4d3252..b4aaa959d 100644 --- a/build/build.csproj +++ b/build/build.csproj @@ -8,6 +8,7 @@ .. 1 true + false diff --git a/imgui/Dalamud.Bindings.ImGui/Dalamud.Bindings.ImGui.csproj b/imgui/Dalamud.Bindings.ImGui/Dalamud.Bindings.ImGui.csproj index fc5894857..8668e9b8f 100644 --- a/imgui/Dalamud.Bindings.ImGui/Dalamud.Bindings.ImGui.csproj +++ b/imgui/Dalamud.Bindings.ImGui/Dalamud.Bindings.ImGui.csproj @@ -9,7 +9,7 @@ - + diff --git a/imgui/Dalamud.Bindings.ImGuizmo/Dalamud.Bindings.ImGuizmo.csproj b/imgui/Dalamud.Bindings.ImGuizmo/Dalamud.Bindings.ImGuizmo.csproj index 650381100..6cdd80470 100644 --- a/imgui/Dalamud.Bindings.ImGuizmo/Dalamud.Bindings.ImGuizmo.csproj +++ b/imgui/Dalamud.Bindings.ImGuizmo/Dalamud.Bindings.ImGuizmo.csproj @@ -9,7 +9,7 @@ - + diff --git a/imgui/Dalamud.Bindings.ImPlot/Dalamud.Bindings.ImPlot.csproj b/imgui/Dalamud.Bindings.ImPlot/Dalamud.Bindings.ImPlot.csproj index 650381100..6cdd80470 100644 --- a/imgui/Dalamud.Bindings.ImPlot/Dalamud.Bindings.ImPlot.csproj +++ b/imgui/Dalamud.Bindings.ImPlot/Dalamud.Bindings.ImPlot.csproj @@ -9,7 +9,7 @@ - + diff --git a/imgui/StandaloneImGuiTestbed/StandaloneImGuiTestbed.csproj b/imgui/StandaloneImGuiTestbed/StandaloneImGuiTestbed.csproj index 21a6a4c66..d56faa31e 100644 --- a/imgui/StandaloneImGuiTestbed/StandaloneImGuiTestbed.csproj +++ b/imgui/StandaloneImGuiTestbed/StandaloneImGuiTestbed.csproj @@ -1,10 +1,10 @@  - Exe enable enable true + false @@ -36,5 +36,4 @@ - diff --git a/tools/Dalamud.LocExporter/Dalamud.LocExporter.csproj b/tools/Dalamud.LocExporter/Dalamud.LocExporter.csproj index aa6cabedc..c0d31c3d6 100644 --- a/tools/Dalamud.LocExporter/Dalamud.LocExporter.csproj +++ b/tools/Dalamud.LocExporter/Dalamud.LocExporter.csproj @@ -1,5 +1,4 @@  - Exe enable @@ -11,7 +10,6 @@ - + -