diff --git a/.run/Agent 1.run.xml b/.run/Agent 1.run.xml index cf83e28..757278b 100644 --- a/.run/Agent 1.run.xml +++ b/.run/Agent 1.run.xml @@ -1,6 +1,6 @@ <component name="ProjectRunConfigurationManager"> <configuration default="false" name="Agent 1" type="DotNetProject" factoryName=".NET Project"> - <option name="EXE_PATH" value="$PROJECT_DIR$/Agent/Phantom.Agent/bin/Debug/net7.0/Phantom.Agent.exe" /> + <option name="EXE_PATH" value="$PROJECT_DIR$/.artifacts/bin/Phantom.Agent/debug/Phantom.Agent.exe" /> <option name="PROGRAM_PARAMETERS" value="" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.workdir/Agent1" /> <option name="PASS_PARENT_ENVS" value="1" /> @@ -22,7 +22,7 @@ <option name="PROJECT_ARGUMENTS_TRACKING" value="1" /> <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" /> <option name="PROJECT_KIND" value="DotNetCore" /> - <option name="PROJECT_TFM" value="net7.0" /> + <option name="PROJECT_TFM" value="net8.0" /> <method v="2"> <option name="Build" /> </method> diff --git a/.run/Agent 2.run.xml b/.run/Agent 2.run.xml index 29fecf0..72dbc3d 100644 --- a/.run/Agent 2.run.xml +++ b/.run/Agent 2.run.xml @@ -1,6 +1,6 @@ <component name="ProjectRunConfigurationManager"> <configuration default="false" name="Agent 2" type="DotNetProject" factoryName=".NET Project"> - <option name="EXE_PATH" value="$PROJECT_DIR$/Agent/Phantom.Agent/bin/Debug/net7.0/Phantom.Agent.exe" /> + <option name="EXE_PATH" value="$PROJECT_DIR$/.artifacts/bin/Phantom.Agent/debug/Phantom.Agent.exe" /> <option name="PROGRAM_PARAMETERS" value="" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.workdir/Agent2" /> <option name="PASS_PARENT_ENVS" value="1" /> @@ -22,7 +22,7 @@ <option name="PROJECT_ARGUMENTS_TRACKING" value="1" /> <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" /> <option name="PROJECT_KIND" value="DotNetCore" /> - <option name="PROJECT_TFM" value="net7.0" /> + <option name="PROJECT_TFM" value="net8.0" /> <method v="2"> <option name="Build" /> </method> diff --git a/.run/Agent 3.run.xml b/.run/Agent 3.run.xml index 1159ce2..7c4c26f 100644 --- a/.run/Agent 3.run.xml +++ b/.run/Agent 3.run.xml @@ -1,6 +1,6 @@ <component name="ProjectRunConfigurationManager"> <configuration default="false" name="Agent 3" type="DotNetProject" factoryName=".NET Project"> - <option name="EXE_PATH" value="$PROJECT_DIR$/Agent/Phantom.Agent/bin/Debug/net7.0/Phantom.Agent.exe" /> + <option name="EXE_PATH" value="$PROJECT_DIR$/.artifacts/bin/Phantom.Agent/debug/Phantom.Agent.exe" /> <option name="PROGRAM_PARAMETERS" value="" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.workdir/Agent3" /> <option name="PASS_PARENT_ENVS" value="1" /> @@ -22,7 +22,7 @@ <option name="PROJECT_ARGUMENTS_TRACKING" value="1" /> <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" /> <option name="PROJECT_KIND" value="DotNetCore" /> - <option name="PROJECT_TFM" value="net7.0" /> + <option name="PROJECT_TFM" value="net8.0" /> <method v="2"> <option name="Build" /> </method> diff --git a/.run/Server.run.xml b/.run/Server.run.xml index d546c34..68d5f1f 100644 --- a/.run/Server.run.xml +++ b/.run/Server.run.xml @@ -1,6 +1,6 @@ <component name="ProjectRunConfigurationManager"> <configuration default="false" name="Server" type="DotNetProject" factoryName=".NET Project"> - <option name="EXE_PATH" value="$PROJECT_DIR$/Server/Phantom.Server/bin/Debug/net7.0/Phantom.Server.exe" /> + <option name="EXE_PATH" value="$PROJECT_DIR$/.artifacts/bin/Phantom.Server/debug/Phantom.Server.exe" /> <option name="PROGRAM_PARAMETERS" value="" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.workdir/Server" /> <option name="PASS_PARENT_ENVS" value="1" /> @@ -22,9 +22,9 @@ <option name="PROJECT_ARGUMENTS_TRACKING" value="1" /> <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" /> <option name="PROJECT_KIND" value="DotNetCore" /> - <option name="PROJECT_TFM" value="net7.0" /> + <option name="PROJECT_TFM" value="net8.0" /> <method v="2"> <option name="Build" /> </method> </configuration> -</component> +</component> \ No newline at end of file diff --git a/AddMigration.bat b/AddMigration.bat index 5fda3ee..b77f9d0 100644 --- a/AddMigration.bat +++ b/AddMigration.bat @@ -5,4 +5,4 @@ if [%1]==[] ( exit ) -dotnet ef migrations add %~1 --project Server/Phantom.Server.Database.Postgres +dotnet ef migrations add %~1 --project Server/Phantom.Server.Database.Postgres --msbuildprojectextensionspath .artifacts/obj/Phantom.Server.Database.Postgres diff --git a/AddMigration.sh b/AddMigration.sh index 5a30da7..cb83748 100644 --- a/AddMigration.sh +++ b/AddMigration.sh @@ -3,4 +3,4 @@ if [ -z "$1" ]; then exit 1 fi -dotnet ef migrations add "$1" --project Server/Phantom.Server.Database.Postgres +dotnet ef migrations add "$1" --project Server/Phantom.Server.Database.Postgres --msbuildprojectextensionspath .artifacts/obj/Phantom.Server.Database.Postgres diff --git a/Directory.Build.props b/Directory.Build.props index b0a9b9f..648b8f7 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -9,4 +9,9 @@ <Version>0.0.1</Version> </PropertyGroup> + <PropertyGroup> + <UseArtifactsOutput>true</UseArtifactsOutput> + <ArtifactsPath>$(MSBuildThisFileDirectory).artifacts</ArtifactsPath> + </PropertyGroup> + </Project>