diff --git a/.dockerignore b/.dockerignore index 84eec5900b..0a5c0e76af 100644 --- a/.dockerignore +++ b/.dockerignore @@ -23,7 +23,7 @@ build/** !build/ControlPanelVersion.props !build/Common.props !build/NugetCommon.props -!build/manifest.xml +!build/uac_elevation_manifest.xml docs src/DMAPI src/Tgstation.Server.Host/ClientApp diff --git a/build/package/winget/Tgstation.Server.Host.Service.Configure/Tgstation.Server.Host.Service.Configure.csproj b/build/package/winget/Tgstation.Server.Host.Service.Configure/Tgstation.Server.Host.Service.Configure.csproj index 15716db084..e85561e603 100644 --- a/build/package/winget/Tgstation.Server.Host.Service.Configure/Tgstation.Server.Host.Service.Configure.csproj +++ b/build/package/winget/Tgstation.Server.Host.Service.Configure/Tgstation.Server.Host.Service.Configure.csproj @@ -4,11 +4,11 @@ Exe net6.0 enable - ../../../manifest.xml + ../../../uac_elevation_manifest.xml ../../../tgs.ico - + diff --git a/build/manifest.xml b/build/uac_elevation_manifest.xml similarity index 100% rename from build/manifest.xml rename to build/uac_elevation_manifest.xml diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj index 6c63de35d2..eebc126c92 100644 --- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj +++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj @@ -13,7 +13,7 @@ ClientApp/node_modules/.install-stamp Linux ..\.. - ../../build/manifest.xml + ../../build/uac_elevation_manifest.xml @@ -142,7 +142,7 @@ - + diff --git a/tgstation-server.sln b/tgstation-server.sln index 402b3ed787..7dac32ea6d 100644 --- a/tgstation-server.sln +++ b/tgstation-server.sln @@ -30,7 +30,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{6FF654E6 build\coverlet.runsettings = build\coverlet.runsettings build\Dockerfile = build\Dockerfile build\GenerateMigrations.sh = build\GenerateMigrations.sh - build\manifest.xml = build\manifest.xml + build\uac_elevation_manifest.xml = build\uac_elevation_manifest.xml build\NugetCommon.props = build\NugetCommon.props build\OpenApiValidationSettings.json = build\OpenApiValidationSettings.json build\stylecop.json = build\stylecop.json