mirror of
https://github.com/space-syndicate/space-station-14.git
synced 2026-02-14 23:14:45 +01:00
v269.0.0 RT update - .NET 10 (#41855)
* Make ServerPackaging automatically get extra server assemblies * Make the switch * Use Content.Server.deps.json instead * Remove debug * Rewrite Now recursively fetches dependencies from Content.Server Only copies dependencies not covered by Robust This removes the need to manually specify most of the dependencies, even the content ones! Also look at runtime key properly to figure out the proper dll name. This actually removes some assemblies that were duplicated between the main directory and assemblies (various Microsoft.Extensions stuff) * Fix test compile errors when updating dependencies Ran across this while updating dependencies on the RT .NET 10 update. Should be fine to merge immediately. * More .NET 10 prep * Convert to SLNX Hell yeah * slnx now has size-2 indents * Update SLNX with new RT system * Remove reference to RT test in toolshed test * Remove accidental usage of transitive RT dependencies * Move Robust project references to RobustApi * Update solution file * Fix warnings in pow3r * Fix nullable warnings in integration tests idk where these came from * gitignore binlog files * Fix transitive dependency warnings in Content.Benchmarks * Update slnx * Okay, the Robust API thing didn't pan out. New plan. It apparently broke clean builds, as the dependencies aren't in the project asset list or something anymore. I tried to fix this, but it seems impossible to do without relying on .NET SDK internals, as there's no point in the NuGet graph walk process that seems cleanly extensible. Instead let's just do the much dumber thing: a bunch of .props files for content to import. Hooray! This also means that I have to go through and *explicitly* disable transitive dependencies everywhere in RT. This thankfully isn't too hard. * Update RT to 269.0.0 * One last solution update * Fix more data definition issues * Update RT to 269.0.1 * Fix it again --------- Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
This commit is contained in:
committed by
GitHub
parent
fab0fe14cc
commit
787330f5c6
@@ -351,7 +351,7 @@ resharper_csharp_qualified_using_at_nested_scope = false
|
|||||||
resharper_csharp_prefer_qualified_reference = false
|
resharper_csharp_prefer_qualified_reference = false
|
||||||
resharper_csharp_allow_alias = false
|
resharper_csharp_allow_alias = false
|
||||||
|
|
||||||
[*.{csproj,xml,yml,yaml,dll.config,msbuildproj,targets,props}]
|
[*.{csproj,xml,yml,yaml,dll.config,msbuildproj,targets,props,slnx}]
|
||||||
indent_size = 2
|
indent_size = 2
|
||||||
|
|
||||||
[nuget.config]
|
[nuget.config]
|
||||||
|
|||||||
2
.github/workflows/build-docfx.yml
vendored
2
.github/workflows/build-docfx.yml
vendored
@@ -21,7 +21,7 @@ jobs:
|
|||||||
- name: Setup .NET Core
|
- name: Setup .NET Core
|
||||||
uses: actions/setup-dotnet@v4.1.0
|
uses: actions/setup-dotnet@v4.1.0
|
||||||
with:
|
with:
|
||||||
dotnet-version: 9.0.x
|
dotnet-version: 10.0.x
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: dotnet restore
|
run: dotnet restore
|
||||||
|
|||||||
2
.github/workflows/build-map-renderer.yml
vendored
2
.github/workflows/build-map-renderer.yml
vendored
@@ -36,7 +36,7 @@ jobs:
|
|||||||
- name: Setup .NET Core
|
- name: Setup .NET Core
|
||||||
uses: actions/setup-dotnet@v4.1.0
|
uses: actions/setup-dotnet@v4.1.0
|
||||||
with:
|
with:
|
||||||
dotnet-version: 9.0.x
|
dotnet-version: 10.0.x
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: dotnet restore
|
run: dotnet restore
|
||||||
|
|||||||
2
.github/workflows/build-test-debug.yml
vendored
2
.github/workflows/build-test-debug.yml
vendored
@@ -36,7 +36,7 @@ jobs:
|
|||||||
- name: Setup .NET Core
|
- name: Setup .NET Core
|
||||||
uses: actions/setup-dotnet@v4.1.0
|
uses: actions/setup-dotnet@v4.1.0
|
||||||
with:
|
with:
|
||||||
dotnet-version: 9.0.x
|
dotnet-version: 10.0.x
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: dotnet restore
|
run: dotnet restore
|
||||||
|
|||||||
2
.github/workflows/publish-testing.yml
vendored
2
.github/workflows/publish-testing.yml
vendored
@@ -20,7 +20,7 @@ jobs:
|
|||||||
- name: Setup .NET Core
|
- name: Setup .NET Core
|
||||||
uses: actions/setup-dotnet@v3.2.0
|
uses: actions/setup-dotnet@v3.2.0
|
||||||
with:
|
with:
|
||||||
dotnet-version: 9.0.x
|
dotnet-version: 10.0.x
|
||||||
|
|
||||||
- name: Get Engine Tag
|
- name: Get Engine Tag
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
2
.github/workflows/publish.yml
vendored
2
.github/workflows/publish.yml
vendored
@@ -27,7 +27,7 @@ jobs:
|
|||||||
- name: Setup .NET Core
|
- name: Setup .NET Core
|
||||||
uses: actions/setup-dotnet@v4.1.0
|
uses: actions/setup-dotnet@v4.1.0
|
||||||
with:
|
with:
|
||||||
dotnet-version: 9.0.x
|
dotnet-version: 10.0.x
|
||||||
|
|
||||||
- name: Get Engine Tag
|
- name: Get Engine Tag
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
2
.github/workflows/test-packaging.yml
vendored
2
.github/workflows/test-packaging.yml
vendored
@@ -51,7 +51,7 @@ jobs:
|
|||||||
- name: Setup .NET Core
|
- name: Setup .NET Core
|
||||||
uses: actions/setup-dotnet@v4.1.0
|
uses: actions/setup-dotnet@v4.1.0
|
||||||
with:
|
with:
|
||||||
dotnet-version: 9.0.x
|
dotnet-version: 10.0.x
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: dotnet restore
|
run: dotnet restore
|
||||||
|
|||||||
2
.github/workflows/yaml-linter.yml
vendored
2
.github/workflows/yaml-linter.yml
vendored
@@ -26,7 +26,7 @@ jobs:
|
|||||||
- name: Setup .NET Core
|
- name: Setup .NET Core
|
||||||
uses: actions/setup-dotnet@v4.1.0
|
uses: actions/setup-dotnet@v4.1.0
|
||||||
with:
|
with:
|
||||||
dotnet-version: 9.0.x
|
dotnet-version: 10.0.x
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: dotnet restore
|
run: dotnet restore
|
||||||
- name: Build
|
- name: Build
|
||||||
|
|||||||
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1,3 +1,6 @@
|
|||||||
|
# MSbuild binlog files
|
||||||
|
*.binlog
|
||||||
|
|
||||||
## Ignore Visual Studio temporary files, build results, and
|
## Ignore Visual Studio temporary files, build results, and
|
||||||
## files generated by popular Visual Studio add-ons.
|
## files generated by popular Visual Studio add-ons.
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import time
|
|||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import List
|
from typing import List
|
||||||
|
|
||||||
SOLUTION_PATH = Path("..") / "SpaceStation14.sln"
|
SOLUTION_PATH = Path("..") / "SpaceStation14.slnx"
|
||||||
# If this doesn't match the saved version we overwrite them all.
|
# If this doesn't match the saved version we overwrite them all.
|
||||||
CURRENT_HOOKS_VERSION = "4"
|
CURRENT_HOOKS_VERSION = "4"
|
||||||
QUIET = len(sys.argv) == 2 and sys.argv[1] == "--quiet"
|
QUIET = len(sys.argv) == 2 and sys.argv[1] == "--quiet"
|
||||||
|
|||||||
@@ -1,17 +1,20 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
|
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
|
|
||||||
<TargetFramework>$(TargetFramework)</TargetFramework>
|
|
||||||
<OutputPath>..\bin\Content.Benchmarks\</OutputPath>
|
<OutputPath>..\bin\Content.Benchmarks\</OutputPath>
|
||||||
<IsPackable>false</IsPackable>
|
|
||||||
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||||
<LangVersion>12</LangVersion>
|
<IsTestingPlatformApplication>false</IsTestingPlatformApplication>
|
||||||
|
<Nullable>disable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<Import Project="../MSBuild/Content.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="BenchmarkDotNet" />
|
<PackageReference Include="BenchmarkDotNet" />
|
||||||
|
|
||||||
|
<!-- pin transitive deps -->
|
||||||
|
<PackageReference Include="System.Management" />
|
||||||
|
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\Content.Client\Content.Client.csproj" />
|
<ProjectReference Include="..\Content.Client\Content.Client.csproj" />
|
||||||
@@ -19,10 +22,12 @@
|
|||||||
<ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
|
<ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
|
||||||
<ProjectReference Include="..\Content.Tests\Content.Tests.csproj" />
|
<ProjectReference Include="..\Content.Tests\Content.Tests.csproj" />
|
||||||
<ProjectReference Include="..\Content.IntegrationTests\Content.IntegrationTests.csproj" />
|
<ProjectReference Include="..\Content.IntegrationTests\Content.IntegrationTests.csproj" />
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Benchmarks\Robust.Benchmarks.csproj" />
|
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
|
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Server\Robust.Server.csproj" />
|
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
|
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Lidgren.props" />
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Client.props" />
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Server.props" />
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Shared.props" />
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Benchmarks.props" />
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Testing.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ using Robust.Client.UserInterface.Controls;
|
|||||||
using Robust.Client.UserInterface.XAML;
|
using Robust.Client.UserInterface.XAML;
|
||||||
using Robust.Shared.Prototypes;
|
using Robust.Shared.Prototypes;
|
||||||
using Robust.Shared.Timing;
|
using Robust.Shared.Timing;
|
||||||
using Serilog;
|
|
||||||
|
|
||||||
namespace Content.Client.Cargo.UI;
|
namespace Content.Client.Cargo.UI;
|
||||||
|
|
||||||
|
|||||||
@@ -1,26 +1,24 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
|
|
||||||
<TargetFramework>$(TargetFramework)</TargetFramework>
|
|
||||||
<LangVersion>12</LangVersion>
|
|
||||||
<IsPackable>false</IsPackable>
|
|
||||||
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
||||||
<OutputPath>..\bin\Content.Client\</OutputPath>
|
<OutputPath>..\bin\Content.Client\</OutputPath>
|
||||||
<OutputType Condition="'$(FullRelease)' != 'True'">Exe</OutputType>
|
<OutputType Condition="'$(FullRelease)' != 'True'">Exe</OutputType>
|
||||||
<WarningsAsErrors>RA0032;nullable</WarningsAsErrors>
|
<WarningsAsErrors>RA0032;nullable</WarningsAsErrors>
|
||||||
<Nullable>enable</Nullable>
|
|
||||||
<Configurations>Debug;Release;Tools;DebugOpt</Configurations>
|
|
||||||
<Platforms>AnyCPU</Platforms>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<Import Project="../MSBuild/Content.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Nett" />
|
<PackageReference Include="Nett" />
|
||||||
<PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
|
<PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
|
||||||
|
<PackageReference Include="SixLabors.ImageSharp" />
|
||||||
|
<PackageReference Include="Pidgin" />
|
||||||
|
<PackageReference Include="Robust.Shared.AuthLib" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Lidgren.props" />
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Client.props" />
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Shared.props" />
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\RobustToolbox\Lidgren.Network\Lidgren.Network.csproj" />
|
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
|
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
|
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
|
|
||||||
<ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
|
<ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
|
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
using System.Numerics;
|
using System.Numerics;
|
||||||
using Content.Client.UserInterface.Controls;
|
using Content.Client.UserInterface.Controls;
|
||||||
using Prometheus;
|
|
||||||
using Robust.Client.AutoGenerated;
|
using Robust.Client.AutoGenerated;
|
||||||
using Robust.Client.UserInterface;
|
using Robust.Client.UserInterface;
|
||||||
using Robust.Client.UserInterface.Controls;
|
using Robust.Client.UserInterface.Controls;
|
||||||
|
|||||||
@@ -1,12 +1,10 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
|
|
||||||
<TargetFramework>$(TargetFramework)</TargetFramework>
|
|
||||||
<OutputPath>..\bin\Content.IntegrationTests\</OutputPath>
|
<OutputPath>..\bin\Content.IntegrationTests\</OutputPath>
|
||||||
<IsPackable>false</IsPackable>
|
|
||||||
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
||||||
<LangVersion>12</LangVersion>
|
<Nullable>disable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<Import Project="../MSBuild/Content.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="NUnit" />
|
<PackageReference Include="NUnit" />
|
||||||
<PackageReference Include="NUnit3TestAdapter" />
|
<PackageReference Include="NUnit3TestAdapter" />
|
||||||
@@ -17,12 +15,12 @@
|
|||||||
<ProjectReference Include="..\Content.Server\Content.Server.csproj" />
|
<ProjectReference Include="..\Content.Server\Content.Server.csproj" />
|
||||||
<ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
|
<ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
|
||||||
<ProjectReference Include="..\Content.Tests\Content.Tests.csproj" />
|
<ProjectReference Include="..\Content.Tests\Content.Tests.csproj" />
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
|
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Server\Robust.Server.csproj" />
|
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
|
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
|
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.UnitTesting\Robust.UnitTesting.csproj" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
|
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
|
||||||
<Import Project="..\RobustToolbox\MSBuild\Robust.CompNetworkGenerator.targets" />
|
<Import Project="..\RobustToolbox\MSBuild\Robust.CompNetworkGenerator.targets" />
|
||||||
|
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Client.props" />
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Server.props" />
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Shared.props" />
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Testing.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ public sealed class ObjectiveCommandsTest
|
|||||||
});
|
});
|
||||||
|
|
||||||
Assert.That(mindEnt, Is.Not.Null);
|
Assert.That(mindEnt, Is.Not.Null);
|
||||||
var mindComp = mindEnt.Value.Comp;
|
var mindComp = mindEnt!.Value.Comp;
|
||||||
Assert.That(mindComp.Objectives, Is.Empty, "Dummy player started with objectives.");
|
Assert.That(mindComp.Objectives, Is.Empty, "Dummy player started with objectives.");
|
||||||
|
|
||||||
await pair.WaitCommand($"addobjective {playerSession.Name} {ObjectiveProtoId}");
|
await pair.WaitCommand($"addobjective {playerSession.Name} {ObjectiveProtoId}");
|
||||||
|
|||||||
@@ -112,7 +112,7 @@ public sealed partial class MindTests
|
|||||||
Assert.That(entMan.EntityExists(attachedEntity), Is.True);
|
Assert.That(entMan.EntityExists(attachedEntity), Is.True);
|
||||||
Assert.That(attachedEntity, Is.Not.EqualTo(playerEnt));
|
Assert.That(attachedEntity, Is.Not.EqualTo(playerEnt));
|
||||||
Assert.That(entMan.HasComponent<GhostComponent>(attachedEntity));
|
Assert.That(entMan.HasComponent<GhostComponent>(attachedEntity));
|
||||||
var transform = entMan.GetComponent<TransformComponent>(attachedEntity.Value);
|
var transform = entMan.GetComponent<TransformComponent>(attachedEntity!.Value);
|
||||||
Assert.That(transform.MapID, Is.Not.EqualTo(MapId.Nullspace));
|
Assert.That(transform.MapID, Is.Not.EqualTo(MapId.Nullspace));
|
||||||
Assert.That(transform.MapID, Is.Not.EqualTo(testMap.MapId));
|
Assert.That(transform.MapID, Is.Not.EqualTo(testMap.MapId));
|
||||||
#pragma warning restore NUnit2045
|
#pragma warning restore NUnit2045
|
||||||
@@ -175,7 +175,7 @@ public sealed partial class MindTests
|
|||||||
Assert.That(player.AttachedEntity, Is.Not.Null);
|
Assert.That(player.AttachedEntity, Is.Not.Null);
|
||||||
Assert.That(entMan.EntityExists(player.AttachedEntity));
|
Assert.That(entMan.EntityExists(player.AttachedEntity));
|
||||||
#pragma warning restore NUnit2045
|
#pragma warning restore NUnit2045
|
||||||
var originalEntity = player.AttachedEntity.Value;
|
var originalEntity = player.AttachedEntity!.Value;
|
||||||
|
|
||||||
EntityUid ghost = default!;
|
EntityUid ghost = default!;
|
||||||
await server.WaitAssertion(() =>
|
await server.WaitAssertion(() =>
|
||||||
@@ -248,7 +248,7 @@ public sealed partial class MindTests
|
|||||||
var mindId = player.ContentData()?.Mind;
|
var mindId = player.ContentData()?.Mind;
|
||||||
Assert.That(mindId, Is.Not.Null);
|
Assert.That(mindId, Is.Not.Null);
|
||||||
|
|
||||||
var mind = entMan.GetComponent<MindComponent>(mindId.Value);
|
var mind = entMan.GetComponent<MindComponent>(mindId!.Value);
|
||||||
Assert.That(mind.VisitingEntity, Is.Null);
|
Assert.That(mind.VisitingEntity, Is.Null);
|
||||||
|
|
||||||
await pair.CleanReturnAsync();
|
await pair.CleanReturnAsync();
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ public sealed class AdminTest : ToolshedTest
|
|||||||
var toolMan = Server.ResolveDependency<ToolshedManager>();
|
var toolMan = Server.ResolveDependency<ToolshedManager>();
|
||||||
var admin = Server.ResolveDependency<IAdminManager>();
|
var admin = Server.ResolveDependency<IAdminManager>();
|
||||||
var ignored = new HashSet<Assembly>()
|
var ignored = new HashSet<Assembly>()
|
||||||
{typeof(LocTest).Assembly, typeof(Robust.UnitTesting.Shared.Toolshed.LocTest).Assembly};
|
{typeof(LocTest).Assembly};
|
||||||
|
|
||||||
await Server.WaitAssertion(() =>
|
await Server.WaitAssertion(() =>
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ public sealed class LocTest : ToolshedTest
|
|||||||
var locStrings = new HashSet<string>();
|
var locStrings = new HashSet<string>();
|
||||||
|
|
||||||
var ignored = new HashSet<Assembly>()
|
var ignored = new HashSet<Assembly>()
|
||||||
{typeof(LocTest).Assembly, typeof(Robust.UnitTesting.Shared.Toolshed.LocTest).Assembly};
|
{typeof(LocTest).Assembly};
|
||||||
|
|
||||||
await Server.WaitAssertion(() =>
|
await Server.WaitAssertion(() =>
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -3,19 +3,27 @@
|
|||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<OutputPath>..\bin\Content.MapRenderer\</OutputPath>
|
<OutputPath>..\bin\Content.MapRenderer\</OutputPath>
|
||||||
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
||||||
<Nullable>enable</Nullable>
|
|
||||||
<ServerGarbageCollection>true</ServerGarbageCollection>
|
<ServerGarbageCollection>true</ServerGarbageCollection>
|
||||||
|
<IsTestingPlatformApplication>false</IsTestingPlatformApplication>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<Import Project="../MSBuild/Content.props" />
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\Content.IntegrationTests\Content.IntegrationTests.csproj" />
|
<ProjectReference Include="..\Content.IntegrationTests\Content.IntegrationTests.csproj" />
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.UnitTesting\Robust.UnitTesting.csproj" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="NUnit" />
|
<PackageReference Include="NUnit" />
|
||||||
|
<PackageReference Include="Moq" />
|
||||||
<PackageReference Include="SixLabors.ImageSharp" />
|
<PackageReference Include="SixLabors.ImageSharp" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
|
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
|
||||||
|
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Client.props" />
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Server.props" />
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Shared.props" />
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Testing.props" />
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -2,13 +2,13 @@
|
|||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
|
||||||
<ServerGarbageCollection>True</ServerGarbageCollection>
|
<ServerGarbageCollection>True</ServerGarbageCollection>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<Import Project="../MSBuild/Content.props" />
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Packaging\Robust.Packaging.csproj" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
|
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
|
||||||
|
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Shared.props" />
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Packaging.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
80
Content.Packaging/DepsHandler.cs
Normal file
80
Content.Packaging/DepsHandler.cs
Normal file
@@ -0,0 +1,80 @@
|
|||||||
|
using System.Text.Json;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
|
namespace Content.Packaging;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Helper class for working with <c>.deps.json</c> files.
|
||||||
|
/// </summary>
|
||||||
|
public sealed class DepsHandler
|
||||||
|
{
|
||||||
|
public readonly Dictionary<string, LibraryInfo> Libraries = new();
|
||||||
|
|
||||||
|
public DepsHandler(DepsData data)
|
||||||
|
{
|
||||||
|
if (data.Targets.Count != 1)
|
||||||
|
throw new Exception("Expected exactly one target");
|
||||||
|
|
||||||
|
var target = data.Targets.Single().Value;
|
||||||
|
|
||||||
|
foreach (var (libNameAndVersion, libInfo) in target)
|
||||||
|
{
|
||||||
|
var split = libNameAndVersion.Split('/', 2);
|
||||||
|
|
||||||
|
Libraries.Add(split[0], libInfo);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static DepsHandler Load(string depsFile)
|
||||||
|
{
|
||||||
|
using var f = File.OpenRead(depsFile);
|
||||||
|
var depsData = JsonSerializer.Deserialize<DepsData>(f) ?? throw new InvalidOperationException("Deps are null!");
|
||||||
|
|
||||||
|
return new DepsHandler(depsData);
|
||||||
|
}
|
||||||
|
|
||||||
|
public HashSet<string> RecursiveGetLibrariesFrom(string start)
|
||||||
|
{
|
||||||
|
var found = new HashSet<string>();
|
||||||
|
|
||||||
|
RecursiveAddLibraries(start, found);
|
||||||
|
|
||||||
|
return found;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void RecursiveAddLibraries(string start, HashSet<string> set)
|
||||||
|
{
|
||||||
|
if (!set.Add(start))
|
||||||
|
return;
|
||||||
|
|
||||||
|
var lib = Libraries[start];
|
||||||
|
if (lib.Dependencies == null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
foreach (var dep in lib.Dependencies.Keys)
|
||||||
|
{
|
||||||
|
RecursiveAddLibraries(dep, set);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public sealed class DepsData
|
||||||
|
{
|
||||||
|
[JsonInclude, JsonPropertyName("targets")]
|
||||||
|
public required Dictionary<string, Dictionary<string, LibraryInfo>> Targets;
|
||||||
|
}
|
||||||
|
|
||||||
|
public sealed class LibraryInfo
|
||||||
|
{
|
||||||
|
[JsonInclude, JsonPropertyName("dependencies")]
|
||||||
|
public Dictionary<string, string>? Dependencies;
|
||||||
|
|
||||||
|
[JsonInclude, JsonPropertyName("runtime")]
|
||||||
|
public Dictionary<string, object>? Runtime;
|
||||||
|
|
||||||
|
// Paths are like lib/netstandard2.0/JetBrains.Annotations.dll
|
||||||
|
public IEnumerable<string> GetDllNames()
|
||||||
|
{
|
||||||
|
return Runtime == null ? [] : Runtime.Keys.Select(p => p.Split('/')[^1]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -37,25 +37,9 @@ public static class ServerPackaging
|
|||||||
.Select(o => o.Rid)
|
.Select(o => o.Rid)
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
private static readonly List<string> ServerContentAssemblies = new()
|
|
||||||
{
|
|
||||||
"Content.Server.Database",
|
|
||||||
"Content.Server",
|
|
||||||
"Content.Shared",
|
|
||||||
"Content.Shared.Database",
|
|
||||||
};
|
|
||||||
|
|
||||||
private static readonly List<string> ServerExtraAssemblies = new()
|
|
||||||
{
|
|
||||||
// Python script had Npgsql. though we want Npgsql.dll as well soooo
|
|
||||||
"Npgsql",
|
|
||||||
"Microsoft",
|
|
||||||
"NetCord",
|
|
||||||
};
|
|
||||||
|
|
||||||
private static readonly List<string> ServerNotExtraAssemblies = new()
|
private static readonly List<string> ServerNotExtraAssemblies = new()
|
||||||
{
|
{
|
||||||
"Microsoft.CodeAnalysis",
|
"JetBrains.Annotations",
|
||||||
};
|
};
|
||||||
|
|
||||||
private static readonly HashSet<string> BinSkipFolders = new()
|
private static readonly HashSet<string> BinSkipFolders = new()
|
||||||
@@ -181,23 +165,13 @@ public static class ServerPackaging
|
|||||||
|
|
||||||
var inputPassCore = graph.InputCore;
|
var inputPassCore = graph.InputCore;
|
||||||
var inputPassResources = graph.InputResources;
|
var inputPassResources = graph.InputResources;
|
||||||
var contentAssemblies = new List<string>(ServerContentAssemblies);
|
|
||||||
|
|
||||||
// Additional assemblies that need to be copied such as EFCore.
|
// Additional assemblies that need to be copied such as EFCore.
|
||||||
var sourcePath = Path.Combine(contentDir, "bin", "Content.Server");
|
var sourcePath = Path.Combine(contentDir, "bin", "Content.Server");
|
||||||
|
|
||||||
// Should this be an asset pass?
|
var deps = DepsHandler.Load(Path.Combine(sourcePath, "Content.Server.deps.json"));
|
||||||
// For future archaeologists I just want audio rework to work and need the audio pass so
|
|
||||||
// just porting this as is from python.
|
|
||||||
foreach (var fullPath in Directory.EnumerateFiles(sourcePath, "*.*", SearchOption.AllDirectories))
|
|
||||||
{
|
|
||||||
var fileName = Path.GetFileNameWithoutExtension(fullPath);
|
|
||||||
|
|
||||||
if (!ServerNotExtraAssemblies.Any(o => fileName.StartsWith(o)) && ServerExtraAssemblies.Any(o => fileName.StartsWith(o)))
|
var contentAssemblies = GetContentAssemblyNamesToCopy(deps);
|
||||||
{
|
|
||||||
contentAssemblies.Add(fileName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
await RobustSharedPackaging.DoResourceCopy(
|
await RobustSharedPackaging.DoResourceCopy(
|
||||||
Path.Combine("RobustToolbox", "bin", "Server",
|
Path.Combine("RobustToolbox", "bin", "Server",
|
||||||
@@ -229,5 +203,21 @@ public static class ServerPackaging
|
|||||||
inputPassResources.InjectFinished();
|
inputPassResources.InjectFinished();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// This returns both content assemblies (e.g. Content.Server.dll) and dependencies (e.g. Npgsql)
|
||||||
|
private static IEnumerable<string> GetContentAssemblyNamesToCopy(DepsHandler deps)
|
||||||
|
{
|
||||||
|
var depsContent = deps.RecursiveGetLibrariesFrom("Content.Server").SelectMany(GetLibraryNames);
|
||||||
|
var depsRobust = deps.RecursiveGetLibrariesFrom("Robust.Server").SelectMany(GetLibraryNames);
|
||||||
|
|
||||||
|
var depsContentExclusive = depsContent.Except(depsRobust).ToHashSet();
|
||||||
|
|
||||||
|
// Remove .dll suffix and apply filtering.
|
||||||
|
var names = depsContentExclusive.Select(p => p[..^4]).Where(p => !ServerNotExtraAssemblies.Any(p.StartsWith));
|
||||||
|
|
||||||
|
return names;
|
||||||
|
|
||||||
|
IEnumerable<string> GetLibraryNames(string library) => deps.Libraries[library].GetDllNames();
|
||||||
|
}
|
||||||
|
|
||||||
private readonly record struct PlatformReg(string Rid, string TargetOs, bool BuildByDefault);
|
private readonly record struct PlatformReg(string Rid, string TargetOs, bool BuildByDefault);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFramework>net9.0</TargetFramework>
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
||||||
|
|||||||
@@ -1,26 +1,23 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>$(TargetFramework)</TargetFramework>
|
|
||||||
<LangVersion>12</LangVersion>
|
|
||||||
<IsPackable>false</IsPackable>
|
|
||||||
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
||||||
<OutputPath>..\bin\Content.Replay\</OutputPath>
|
<OutputPath>..\bin\Content.Replay\</OutputPath>
|
||||||
<OutputType Condition="'$(FullRelease)' != 'True'">Exe</OutputType>
|
<OutputType Condition="'$(FullRelease)' != 'True'">Exe</OutputType>
|
||||||
<WarningsAsErrors>RA0032;nullable</WarningsAsErrors>
|
<WarningsAsErrors>RA0032;nullable</WarningsAsErrors>
|
||||||
<Nullable>enable</Nullable>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<Import Project="../MSBuild/Content.props" />
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Nett" />
|
<PackageReference Include="Nett" />
|
||||||
<PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
|
<PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\RobustToolbox\Lidgren.Network\Lidgren.Network.csproj" />
|
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
|
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
|
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
|
|
||||||
<ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
|
<ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
|
||||||
<ProjectReference Include="..\Content.Client\Content.Client.csproj" />
|
<ProjectReference Include="..\Content.Client\Content.Client.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="..\RobustToolbox\MSBuild\XamlIL.targets" />
|
<Import Project="..\RobustToolbox\MSBuild\XamlIL.targets" />
|
||||||
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
|
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
|
||||||
|
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Client.props" />
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Shared.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -1,16 +1,13 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
|
|
||||||
<TargetFramework>$(TargetFramework)</TargetFramework>
|
|
||||||
<LangVersion>12</LangVersion>
|
|
||||||
<IsPackable>false</IsPackable>
|
|
||||||
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
||||||
<OutputPath>..\bin\Content.Server.Database\</OutputPath>
|
<OutputPath>..\bin\Content.Server.Database\</OutputPath>
|
||||||
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
|
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
|
||||||
<Nullable>enable</Nullable>
|
|
||||||
<NoWarn>RA0003</NoWarn>
|
<NoWarn>RA0003</NoWarn>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<Import Project="../MSBuild/Content.props" />
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design">
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Design">
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
|
|||||||
@@ -10,11 +10,11 @@ public sealed partial class CodewordFactionPrototype : IPrototype
|
|||||||
{
|
{
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
[IdDataField]
|
[IdDataField]
|
||||||
public string ID { get; } = default!;
|
public string ID { get; private set; } = default!;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The generator to use for this faction.
|
/// The generator to use for this faction.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[DataField(required:true)]
|
[DataField(required:true)]
|
||||||
public ProtoId<CodewordGeneratorPrototype> Generator { get; } = default!;
|
public ProtoId<CodewordGeneratorPrototype> Generator { get; private set; } = default!;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,13 +11,13 @@ public sealed partial class CodewordGeneratorPrototype : IPrototype
|
|||||||
{
|
{
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
[IdDataField]
|
[IdDataField]
|
||||||
public string ID { get; } = default!;
|
public string ID { get; private set; } = default!;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// List of datasets to use for word generation. All values will be concatenated into one list and then randomly chosen from
|
/// List of datasets to use for word generation. All values will be concatenated into one list and then randomly chosen from
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[DataField]
|
[DataField]
|
||||||
public List<ProtoId<LocalizedDatasetPrototype>> Words { get; } =
|
public List<ProtoId<LocalizedDatasetPrototype>> Words { get; private set; } =
|
||||||
[
|
[
|
||||||
"Adjectives",
|
"Adjectives",
|
||||||
"Verbs",
|
"Verbs",
|
||||||
|
|||||||
@@ -1,31 +1,30 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
|
|
||||||
<TargetFramework>$(TargetFramework)</TargetFramework>
|
|
||||||
<LangVersion>12</LangVersion>
|
|
||||||
<IsPackable>false</IsPackable>
|
|
||||||
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
||||||
<OutputPath>..\bin\Content.Server\</OutputPath>
|
<OutputPath>..\bin\Content.Server\</OutputPath>
|
||||||
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
|
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
|
||||||
<OutputType Condition="'$(FullRelease)' != 'True'">Exe</OutputType>
|
<OutputType Condition="'$(FullRelease)' != 'True'">Exe</OutputType>
|
||||||
<NoWarn>1998</NoWarn>
|
<NoWarn>1998</NoWarn>
|
||||||
<WarningsAsErrors>RA0032;nullable</WarningsAsErrors>
|
<WarningsAsErrors>RA0032;nullable</WarningsAsErrors>
|
||||||
<Nullable>enable</Nullable>
|
|
||||||
<ServerGarbageCollection>true</ServerGarbageCollection>
|
<ServerGarbageCollection>true</ServerGarbageCollection>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<Import Project="../MSBuild/Content.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
|
<PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
|
||||||
<PackageReference Include="NetCord" />
|
<PackageReference Include="NetCord" />
|
||||||
|
<PackageReference Include="prometheus-net" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.ObjectPool" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\Content.Packaging\Content.Packaging.csproj" />
|
<ProjectReference Include="..\Content.Packaging\Content.Packaging.csproj" />
|
||||||
<ProjectReference Include="..\Content.Server.Database\Content.Server.Database.csproj" />
|
<ProjectReference Include="..\Content.Server.Database\Content.Server.Database.csproj" />
|
||||||
<ProjectReference Include="..\Content.Shared.Database\Content.Shared.Database.csproj" />
|
<ProjectReference Include="..\Content.Shared.Database\Content.Shared.Database.csproj" />
|
||||||
<ProjectReference Include="..\RobustToolbox\Lidgren.Network\Lidgren.Network.csproj" />
|
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
|
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
|
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Server\Robust.Server.csproj" />
|
|
||||||
<ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
|
<ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
|
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
|
||||||
|
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Lidgren.props" />
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Server.props" />
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Shared.props" />
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Packaging.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
using Content.Server.Administration;
|
using Content.Server.Administration;
|
||||||
using Content.Server.GameTicking.Presets;
|
using Content.Server.GameTicking.Presets;
|
||||||
using Content.Shared.Administration;
|
using Content.Shared.Administration;
|
||||||
using Linguini.Shared.Util;
|
|
||||||
using Robust.Shared.Console;
|
using Robust.Shared.Console;
|
||||||
|
|
||||||
namespace Content.Server.GameTicking.Commands
|
namespace Content.Server.GameTicking.Commands
|
||||||
@@ -18,7 +17,7 @@ namespace Content.Server.GameTicking.Commands
|
|||||||
|
|
||||||
public void Execute(IConsoleShell shell, string argStr, string[] args)
|
public void Execute(IConsoleShell shell, string argStr, string[] args)
|
||||||
{
|
{
|
||||||
if (!args.Length.InRange(1, 3))
|
if (args.Length is <= 1 or >= 3)
|
||||||
{
|
{
|
||||||
shell.WriteError(Loc.GetString("shell-need-between-arguments", ("lower", 1), ("upper", 3), ("currentAmount", args.Length)));
|
shell.WriteError(Loc.GetString("shell-need-between-arguments", ("lower", 1), ("upper", 3), ("currentAmount", args.Length)));
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ using Robust.Shared.Configuration;
|
|||||||
using Robust.Shared.Network;
|
using Robust.Shared.Network;
|
||||||
using Robust.Shared.Player;
|
using Robust.Shared.Player;
|
||||||
using Robust.Shared.Prototypes;
|
using Robust.Shared.Prototypes;
|
||||||
using Serilog;
|
|
||||||
|
|
||||||
namespace Content.Server.Players.JobWhitelist;
|
namespace Content.Server.Players.JobWhitelist;
|
||||||
|
|
||||||
@@ -22,8 +21,10 @@ public sealed class JobWhitelistManager : IPostInjectInit
|
|||||||
[Dependency] private readonly IPlayerManager _player = default!;
|
[Dependency] private readonly IPlayerManager _player = default!;
|
||||||
[Dependency] private readonly IPrototypeManager _prototypes = default!;
|
[Dependency] private readonly IPrototypeManager _prototypes = default!;
|
||||||
[Dependency] private readonly UserDbDataManager _userDb = default!;
|
[Dependency] private readonly UserDbDataManager _userDb = default!;
|
||||||
|
[Dependency] private readonly ILogManager _logManager = default!;
|
||||||
|
|
||||||
private readonly Dictionary<NetUserId, HashSet<string>> _whitelists = new();
|
private readonly Dictionary<NetUserId, HashSet<string>> _whitelists = new();
|
||||||
|
private ISawmill _sawmill = default!;
|
||||||
|
|
||||||
public void Initialize()
|
public void Initialize()
|
||||||
{
|
{
|
||||||
@@ -79,7 +80,7 @@ public sealed class JobWhitelistManager : IPostInjectInit
|
|||||||
{
|
{
|
||||||
if (!_whitelists.TryGetValue(player, out var whitelists))
|
if (!_whitelists.TryGetValue(player, out var whitelists))
|
||||||
{
|
{
|
||||||
Log.Error("Unable to check if player {Player} is whitelisted for {Job}. Stack trace:\\n{StackTrace}",
|
_sawmill.Error("Unable to check if player {Player} is whitelisted for {Job}. Stack trace:\\n{StackTrace}",
|
||||||
player,
|
player,
|
||||||
job,
|
job,
|
||||||
Environment.StackTrace);
|
Environment.StackTrace);
|
||||||
@@ -113,5 +114,6 @@ public sealed class JobWhitelistManager : IPostInjectInit
|
|||||||
_userDb.AddOnLoadPlayer(LoadData);
|
_userDb.AddOnLoadPlayer(LoadData);
|
||||||
_userDb.AddOnFinishLoad(FinishLoad);
|
_userDb.AddOnFinishLoad(FinishLoad);
|
||||||
_userDb.AddOnPlayerDisconnect(ClientDisconnected);
|
_userDb.AddOnPlayerDisconnect(ClientDisconnected);
|
||||||
|
_sawmill = _logManager.GetSawmill("job_whitelist");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<Import Project="../MSBuild/Content.props" />
|
||||||
|
|
||||||
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
|
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -197,7 +197,7 @@ public sealed partial class ActionComponent : Component
|
|||||||
}
|
}
|
||||||
|
|
||||||
[DataRecord, Serializable, NetSerializable]
|
[DataRecord, Serializable, NetSerializable]
|
||||||
public record struct ActionCooldown
|
public partial record struct ActionCooldown
|
||||||
{
|
{
|
||||||
[DataField(required: true, customTypeSerializer: typeof(TimeOffsetSerializer))]
|
[DataField(required: true, customTypeSerializer: typeof(TimeOffsetSerializer))]
|
||||||
public TimeSpan Start;
|
public TimeSpan Start;
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ public sealed partial class EmoteSoundsPrototype : IPrototype, IInheritingProtot
|
|||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
[AbstractDataField]
|
[AbstractDataField]
|
||||||
[NeverPushInheritance]
|
[NeverPushInheritance]
|
||||||
public bool Abstract { get; }
|
public bool Abstract { get; private set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Optional fallback sound that will play if collection
|
/// Optional fallback sound that will play if collection
|
||||||
|
|||||||
@@ -20,11 +20,11 @@ public sealed partial class InjectorModePrototype : IPrototype, IInheritingProto
|
|||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
[ParentDataField(typeof(AbstractPrototypeIdArraySerializer<InjectorModePrototype>))]
|
[ParentDataField(typeof(AbstractPrototypeIdArraySerializer<InjectorModePrototype>))]
|
||||||
public string[]? Parents { get; }
|
public string[]? Parents { get; private set; }
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
[AbstractDataField, NeverPushInheritance]
|
[AbstractDataField, NeverPushInheritance]
|
||||||
public bool Abstract { get; }
|
public bool Abstract { get; private set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The name of the mode that will be shown on the label UI.
|
/// The name of the mode that will be shown on the label UI.
|
||||||
|
|||||||
@@ -1,28 +1,21 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
|
|
||||||
<TargetFramework>$(TargetFramework)</TargetFramework>
|
|
||||||
<LangVersion>12</LangVersion>
|
|
||||||
<IsPackable>false</IsPackable>
|
|
||||||
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
||||||
<WarningsAsErrors>RA0032;nullable</WarningsAsErrors>
|
<WarningsAsErrors>RA0032;nullable</WarningsAsErrors>
|
||||||
<Nullable>enable</Nullable>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<Import Project="../MSBuild/Content.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
|
<PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
|
||||||
|
<PackageReference Include="YamlDotNet" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Lidgren.props" />
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Shared.props" />
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\Content.Shared.Database\Content.Shared.Database.csproj" />
|
<ProjectReference Include="..\Content.Shared.Database\Content.Shared.Database.csproj" />
|
||||||
<ProjectReference Include="..\RobustToolbox\Lidgren.Network\Lidgren.Network.csproj">
|
|
||||||
<Private>false</Private>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj">
|
|
||||||
<Private>false</Private>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj">
|
|
||||||
<Private>false</Private>
|
|
||||||
</ProjectReference>
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
|
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
|
||||||
<Import Project="..\RobustToolbox\MSBuild\Robust.CompNetworkGenerator.targets" />
|
<Import Project="..\RobustToolbox\MSBuild\Robust.CompNetworkGenerator.targets" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
using Content.Shared.Eui;
|
using Content.Shared.Eui;
|
||||||
using NetSerializer;
|
|
||||||
using Robust.Shared.Serialization;
|
using Robust.Shared.Serialization;
|
||||||
|
|
||||||
namespace Content.Shared.CrewManifest;
|
namespace Content.Shared.CrewManifest;
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
using Content.Shared.Research.Prototypes;
|
using Content.Shared.Research.Prototypes;
|
||||||
using NetSerializer;
|
|
||||||
using Robust.Shared.Prototypes;
|
using Robust.Shared.Prototypes;
|
||||||
using Robust.Shared.Serialization;
|
using Robust.Shared.Serialization;
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ public sealed partial class EdiblePrototype : IPrototype
|
|||||||
{
|
{
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
[IdDataField]
|
[IdDataField]
|
||||||
public string ID { get; } = default!;
|
public string ID { get; private set; } = default!;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The sound we make when eaten.
|
/// The sound we make when eaten.
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ public sealed partial class LoadoutGroupPrototype : IPrototype, IInheritingProto
|
|||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
[NeverPushInheritance]
|
[NeverPushInheritance]
|
||||||
[AbstractDataField]
|
[AbstractDataField]
|
||||||
public bool Abstract { get; }
|
public bool Abstract { get; private set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// User-friendly name for the group.
|
/// User-friendly name for the group.
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ public sealed partial class SmartFridgeComponent : Component
|
|||||||
}
|
}
|
||||||
|
|
||||||
[Serializable, NetSerializable, DataRecord]
|
[Serializable, NetSerializable, DataRecord]
|
||||||
public record struct SmartFridgeEntry
|
public partial record struct SmartFridgeEntry
|
||||||
{
|
{
|
||||||
public string Name;
|
public string Name;
|
||||||
|
|
||||||
|
|||||||
@@ -1,26 +1,25 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
|
|
||||||
<TargetFramework>$(TargetFramework)</TargetFramework>
|
|
||||||
<LangVersion>12</LangVersion>
|
|
||||||
<IsPackable>false</IsPackable>
|
|
||||||
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
||||||
<OutputPath>..\bin\Content.Tests\</OutputPath>
|
<OutputPath>..\bin\Content.Tests\</OutputPath>
|
||||||
|
<Nullable>disable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<Import Project="../MSBuild/Content.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="NUnit" />
|
<PackageReference Include="NUnit" />
|
||||||
<PackageReference Include="NUnit3TestAdapter" />
|
<PackageReference Include="NUnit3TestAdapter" />
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" />
|
||||||
|
<PackageReference Include="Moq" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Client.props" />
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Server.props" />
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Shared.props" />
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Testing.props" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\Content.Client\Content.Client.csproj" />
|
<ProjectReference Include="..\Content.Client\Content.Client.csproj" />
|
||||||
<ProjectReference Include="..\Content.Server\Content.Server.csproj" />
|
<ProjectReference Include="..\Content.Server\Content.Server.csproj" />
|
||||||
<ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
|
<ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
|
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Server\Robust.Server.csproj" />
|
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
|
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
|
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.UnitTesting\Robust.UnitTesting.csproj" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
|
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
|
||||||
|
|||||||
@@ -1,16 +1,15 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFramework>$(TargetFramework)</TargetFramework>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<Import Project="../MSBuild/Content.props" />
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="YamlDotNet" />
|
<PackageReference Include="YamlDotNet" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
|
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
|
||||||
|
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Shared.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -1,21 +1,20 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFramework>$(TargetFramework)</TargetFramework>
|
|
||||||
<OutputPath>..\bin\Content.YAMLLinter\</OutputPath>
|
<OutputPath>..\bin\Content.YAMLLinter\</OutputPath>
|
||||||
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
||||||
<ServerGarbageCollection>true</ServerGarbageCollection>
|
<ServerGarbageCollection>true</ServerGarbageCollection>
|
||||||
|
<IsTestingPlatformApplication>false</IsTestingPlatformApplication>
|
||||||
|
<Nullable>disable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<Import Project="../MSBuild/Content.props" />
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\Content.Client\Content.Client.csproj" />
|
<ProjectReference Include="..\Content.Client\Content.Client.csproj" />
|
||||||
<ProjectReference Include="..\Content.Server\Content.Server.csproj" />
|
<ProjectReference Include="..\Content.Server\Content.Server.csproj" />
|
||||||
<ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
|
<ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
|
||||||
<ProjectReference Include="..\Content.IntegrationTests\Content.IntegrationTests.csproj" />
|
<ProjectReference Include="..\Content.IntegrationTests\Content.IntegrationTests.csproj" />
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
|
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Server\Robust.Server.csproj" />
|
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
|
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@@ -23,4 +22,10 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
|
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
|
||||||
|
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Client.props" />
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Server.props" />
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Shared.props" />
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Testing.props" />
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -6,17 +6,17 @@
|
|||||||
-->
|
-->
|
||||||
<PackageVersion Remove="Npgsql.EntityFrameworkCore.PostgreSQL" />
|
<PackageVersion Remove="Npgsql.EntityFrameworkCore.PostgreSQL" />
|
||||||
<PackageVersion Remove="Microsoft.EntityFrameworkCore.Design" />
|
<PackageVersion Remove="Microsoft.EntityFrameworkCore.Design" />
|
||||||
<PackageVersion Include="CsvHelper" Version="33.0.1" />
|
<PackageVersion Include="CsvHelper" Version="33.1.0" />
|
||||||
<PackageVersion Include="ImGui.NET" Version="1.87.3" />
|
<PackageVersion Include="ImGui.NET" Version="1.87.3" />
|
||||||
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.1">
|
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageVersion>
|
</PackageVersion>
|
||||||
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="9.0.1" />
|
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="10.0.0" />
|
||||||
<PackageVersion Include="NetCord" Version="1.0.0-alpha.388" />
|
<PackageVersion Include="NetCord" Version="1.0.0-alpha.388" />
|
||||||
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.3" />
|
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0" />
|
||||||
<PackageVersion Include="OpenTK" Version="4.9.4" />
|
<PackageVersion Include="OpenTK" Version="4.9.4" />
|
||||||
<PackageVersion Include="Veldrid" Version="4.8.0" />
|
<PackageVersion Include="Veldrid" Version="4.8.0" />
|
||||||
<PackageVersion Include="Veldrid.SPIRV" Version="1.0.15" />
|
<PackageVersion Include="Veldrid.SPIRV" Version="1.0.15" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
12
MSBuild/Content.props
Normal file
12
MSBuild/Content.props
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
<Project>
|
||||||
|
<!--
|
||||||
|
Content specific properties
|
||||||
|
Import *before* Robust.Properties.targets
|
||||||
|
-->
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<LangVersion Condition="'$(LangVersion)' == ''">14</LangVersion>
|
||||||
|
<IsPackable Condition="'$(IsPackable)' == ''">false</IsPackable>
|
||||||
|
<Nullable Condition="'$(Nullable)' == ''">enable</Nullable>
|
||||||
|
</PropertyGroup>
|
||||||
|
</Project>
|
||||||
@@ -1,10 +1,12 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFramework>$(TargetFramework)</TargetFramework>
|
|
||||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||||
|
<Nullable>disable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<Import Project="../MSBuild/Content.props" />
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="ImGui.NET" />
|
<PackageReference Include="ImGui.NET" />
|
||||||
<PackageReference Include="OpenTK" />
|
<PackageReference Include="OpenTK" />
|
||||||
@@ -14,9 +16,10 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\Content.Server\Content.Server.csproj" />
|
<ProjectReference Include="..\Content.Server\Content.Server.csproj" />
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
|
|
||||||
<ProjectReference Include="..\RobustToolbox\Robust.UnitTesting\Robust.UnitTesting.csproj" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
|
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
|
||||||
|
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Shared.props" />
|
||||||
|
<Import Project="..\RobustToolbox\Imports\Testing.props" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
Submodule RobustToolbox updated: dbde8023ed...c7ba63ed8e
@@ -1,494 +0,0 @@
|
|||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
|
||||||
# Visual Studio Version 17
|
|
||||||
VisualStudioVersion = 17.8.34330.188
|
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Shared", "Content.Shared\Content.Shared.csproj", "{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}"
|
|
||||||
EndProject
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Server", "Content.Server\Content.Server.csproj", "{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}"
|
|
||||||
ProjectSection(ProjectDependencies) = postProject
|
|
||||||
{59250BAF-0000-0000-0000-000000000000} = {59250BAF-0000-0000-0000-000000000000}
|
|
||||||
{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5} = {26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}
|
|
||||||
EndProjectSection
|
|
||||||
EndProject
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Client", "Content.Client\Content.Client.csproj", "{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}"
|
|
||||||
ProjectSection(ProjectDependencies) = postProject
|
|
||||||
{59250BAF-0000-0000-0000-000000000000} = {59250BAF-0000-0000-0000-000000000000}
|
|
||||||
EndProjectSection
|
|
||||||
EndProject
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build Checker", "Build Checker", "{3202E94D-E985-4181-9F69-F458A7F6574F}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildChecker", "BuildChecker\BuildChecker.csproj", "{C899FCA4-7037-4E49-ABC2-44DE72487110}"
|
|
||||||
EndProject
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Tests", "Content.Tests\Content.Tests.csproj", "{8EDF4429-251A-416D-BB68-93F227191BCF}"
|
|
||||||
EndProject
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RobustToolbox", "RobustToolbox", "{83B4CBBA-547A-42F0-A7CD-8A67D93196CE}"
|
|
||||||
EndProject
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lidgren.Network", "RobustToolbox\Lidgren.Network\Lidgren.Network.csproj", "{59250BAF-0000-0000-0000-000000000000}"
|
|
||||||
EndProject
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Client", "RobustToolbox\Robust.Client\Robust.Client.csproj", "{83429BD6-6358-4B18-BE51-401DF8EA2673}"
|
|
||||||
EndProject
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Server", "RobustToolbox\Robust.Server\Robust.Server.csproj", "{B04AAE71-0000-0000-0000-000000000000}"
|
|
||||||
EndProject
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Shared.Maths", "RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj", "{93F23A82-00C5-4572-964E-E7C9457726D4}"
|
|
||||||
EndProject
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.UnitTesting", "RobustToolbox\Robust.UnitTesting\Robust.UnitTesting.csproj", "{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}"
|
|
||||||
EndProject
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Shared", "RobustToolbox\Robust.Shared\Robust.Shared.csproj", "{0529F740-0000-0000-0000-000000000000}"
|
|
||||||
EndProject
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.IntegrationTests", "Content.IntegrationTests\Content.IntegrationTests.csproj", "{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}"
|
|
||||||
EndProject
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Benchmarks", "Content.Benchmarks\Content.Benchmarks.csproj", "{7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}"
|
|
||||||
EndProject
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenToolkit.GraphicsLibraryFramework", "RobustToolbox\OpenToolkit.GraphicsLibraryFramework\OpenToolkit.GraphicsLibraryFramework.csproj", "{4809F412-3132-419E-BF9D-CCF7593C3533}"
|
|
||||||
EndProject
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Server.Database", "Content.Server.Database\Content.Server.Database.csproj", "{45C9B43F-305D-4651-9863-F6384CBC847F}"
|
|
||||||
EndProject
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MSBuild", "MSBuild", "{50404922-9637-4394-BF59-165D0850ADC8}"
|
|
||||||
ProjectSection(SolutionItems) = preProject
|
|
||||||
RobustToolbox\MSBuild\Robust.Analyzers.targets = RobustToolbox\MSBuild\Robust.Analyzers.targets
|
|
||||||
RobustToolbox\MSBuild\Robust.CompNetworkGenerator.targets = RobustToolbox\MSBuild\Robust.CompNetworkGenerator.targets
|
|
||||||
RobustToolbox\MSBuild\Robust.Configurations.props = RobustToolbox\MSBuild\Robust.Configurations.props
|
|
||||||
RobustToolbox\MSBuild\Robust.DefineConstants.targets = RobustToolbox\MSBuild\Robust.DefineConstants.targets
|
|
||||||
RobustToolbox\MSBuild\Robust.Engine.props = RobustToolbox\MSBuild\Robust.Engine.props
|
|
||||||
RobustToolbox\MSBuild\Robust.Engine.targets = RobustToolbox\MSBuild\Robust.Engine.targets
|
|
||||||
RobustToolbox\MSBuild\Robust.Engine.Version.props = RobustToolbox\MSBuild\Robust.Engine.Version.props
|
|
||||||
RobustToolbox\MSBuild\Robust.Platform.props = RobustToolbox\MSBuild\Robust.Platform.props
|
|
||||||
RobustToolbox\MSBuild\Robust.Properties.targets = RobustToolbox\MSBuild\Robust.Properties.targets
|
|
||||||
RobustToolbox\MSBuild\Robust.Trimming.targets = RobustToolbox\MSBuild\Robust.Trimming.targets
|
|
||||||
RobustToolbox\MSBuild\XamlIL.targets = RobustToolbox\MSBuild\XamlIL.targets
|
|
||||||
EndProjectSection
|
|
||||||
EndProject
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{806ED41A-411B-4B3B-BEB6-DEC6DCA4C205}"
|
|
||||||
ProjectSection(SolutionItems) = preProject
|
|
||||||
Tools\generate_hashes.ps1 = Tools\generate_hashes.ps1
|
|
||||||
EndProjectSection
|
|
||||||
EndProject
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Robust.Shared.Scripting", "RobustToolbox\Robust.Shared.Scripting\Robust.Shared.Scripting.csproj", "{41B450C0-A361-4CD7-8121-7072B8995CFC}"
|
|
||||||
EndProject
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetSerializer", "RobustToolbox\NetSerializer\NetSerializer\NetSerializer.csproj", "{7B9472D3-79D4-48D1-9B22-BCDE518FE842}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.LoaderApi", "RobustToolbox\Robust.LoaderApi\Robust.LoaderApi\Robust.LoaderApi.csproj", "{1FAE651D-29D8-437A-9864-47CE0D180016}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Client.NameGenerator", "RobustToolbox\Robust.Client.NameGenerator\Robust.Client.NameGenerator.csproj", "{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Client.Injectors", "RobustToolbox\Robust.Client.Injectors\Robust.Client.Injectors.csproj", "{8922428F-17C3-47A7-BFE9-570DEB2464DA}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlX.IL.Cecil", "RobustToolbox\XamlX\src\XamlX.IL.Cecil\XamlX.IL.Cecil.csproj", "{16F7DE32-0186-44B9-9345-0C20D1BF2422}"
|
|
||||||
EndProject
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XamlX", "XamlX", "{AFF53804-115F-4E67-B81F-26265EA27880}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlX", "RobustToolbox\XamlX\src\XamlX\XamlX.csproj", "{23F09C45-950E-4DB7-A465-E937450FF008}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlX.Runtime", "RobustToolbox\XamlX\src\XamlX.Runtime\XamlX.Runtime.csproj", "{440426C1-8DCA-43F6-967F-94439B8DAF47}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.Tools", "Content.Tools\Content.Tools.csproj", "{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Analyzers", "RobustToolbox\Robust.Analyzers\Robust.Analyzers.csproj", "{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.YAMLLinter", "Content.YAMLLinter\Content.YAMLLinter.csproj", "{A59E2FCC-93CF-4886-8EA7-94F021A7475D}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Base", "RobustToolbox\Avalonia.Base\Avalonia.Base.csproj", "{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Benchmarks", "RobustToolbox\Robust.Benchmarks\Robust.Benchmarks.csproj", "{8A21C7CA-2EB8-40E5-8043-33582C06D139}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pow3r", "Pow3r\Pow3r.csproj", "{1C048C9F-00A9-4796-BE4D-BB36B7769720}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.Shared.Database", "Content.Shared.Database\Content.Shared.Database.csproj", "{8842381D-3426-4BA8-93DA-599AB14D88E9}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.MapRenderer", "Content.MapRenderer\Content.MapRenderer.csproj", "{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Packaging", "RobustToolbox\Robust.Packaging\Robust.Packaging.csproj", "{952AAF2A-DF63-4A7D-8094-3453893EBA80}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.Packaging", "Content.Packaging\Content.Packaging.csproj", "{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}"
|
|
||||||
EndProject
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project Files", "Project Files", "{EC27A16C-9412-4AA6-AE68-CAAB28882802}"
|
|
||||||
ProjectSection(SolutionItems) = preProject
|
|
||||||
.editorconfig = .editorconfig
|
|
||||||
.gitattributes = .gitattributes
|
|
||||||
.gitignore = .gitignore
|
|
||||||
Directory.Packages.props = Directory.Packages.props
|
|
||||||
README.md = README.md
|
|
||||||
EndProjectSection
|
|
||||||
EndProject
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project Files", "Project Files", "{A965CB3B-FD31-44AF-8872-85ABA436098D}"
|
|
||||||
ProjectSection(SolutionItems) = preProject
|
|
||||||
RobustToolbox\Directory.Packages.props = RobustToolbox\Directory.Packages.props
|
|
||||||
RobustToolbox\README.md = RobustToolbox\README.md
|
|
||||||
RobustToolbox\RELEASE-NOTES.md = RobustToolbox\RELEASE-NOTES.md
|
|
||||||
EndProjectSection
|
|
||||||
EndProject
|
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Content.Replay", "Content.Replay\Content.Replay.csproj", "{A493616C-338D-47B7-8072-A7F14D034D0B}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Shared.CompNetworkGenerator", "RobustToolbox\Robust.Shared.CompNetworkGenerator\Robust.Shared.CompNetworkGenerator.csproj", "{07CA34A1-1D37-4771-A2E3-495A1044AE0B}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Serialization.Generator", "RobustToolbox\Robust.Serialization.Generator\Robust.Serialization.Generator.csproj", "{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.PatreonParser", "Content.PatreonParser\Content.PatreonParser.csproj", "{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Analyzers.Tests", "RobustToolbox\Robust.Analyzers.Tests\Robust.Analyzers.Tests.csproj", "{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}"
|
|
||||||
EndProject
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Roslyn", "Roslyn", "{7844DA69-B0F0-49FB-A05E-ECA37372277A}"
|
|
||||||
ProjectSection(SolutionItems) = preProject
|
|
||||||
RobustToolbox\Robust.Roslyn.Shared\Robust.Roslyn.Shared.props = RobustToolbox\Robust.Roslyn.Shared\Robust.Roslyn.Shared.props
|
|
||||||
EndProjectSection
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Xaml", "RobustToolbox\Robust.Xaml\Robust.Xaml.csproj", "{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}"
|
|
||||||
EndProject
|
|
||||||
Global
|
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
|
||||||
Debug|Any CPU = Debug|Any CPU
|
|
||||||
DebugOpt|Any CPU = DebugOpt|Any CPU
|
|
||||||
Release|Any CPU = Release|Any CPU
|
|
||||||
Tools|Any CPU = Tools|Any CPU
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
|
||||||
{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
|
|
||||||
{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
|
|
||||||
{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
|
|
||||||
{26AEEBB3-DDE7-443A-9F43-7BC7F4ACF6B5}.Tools|Any CPU.Build.0 = Tools|Any CPU
|
|
||||||
{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
|
|
||||||
{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
|
|
||||||
{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
|
|
||||||
{B38DBBD0-04C2-4D1A-84E2-B3446F6ADF2A}.Tools|Any CPU.Build.0 = Tools|Any CPU
|
|
||||||
{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
|
|
||||||
{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
|
|
||||||
{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
|
|
||||||
{A2E5F175-78AF-4DDD-8F97-E2D2552372ED}.Tools|Any CPU.Build.0 = Tools|Any CPU
|
|
||||||
{C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{C899FCA4-7037-4E49-ABC2-44DE72487110}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{C899FCA4-7037-4E49-ABC2-44DE72487110}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
|
|
||||||
{C899FCA4-7037-4E49-ABC2-44DE72487110}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
|
|
||||||
{C899FCA4-7037-4E49-ABC2-44DE72487110}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{C899FCA4-7037-4E49-ABC2-44DE72487110}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
|
|
||||||
{C899FCA4-7037-4E49-ABC2-44DE72487110}.Tools|Any CPU.Build.0 = Tools|Any CPU
|
|
||||||
{8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{8EDF4429-251A-416D-BB68-93F227191BCF}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
|
|
||||||
{8EDF4429-251A-416D-BB68-93F227191BCF}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
|
|
||||||
{8EDF4429-251A-416D-BB68-93F227191BCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{8EDF4429-251A-416D-BB68-93F227191BCF}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{8EDF4429-251A-416D-BB68-93F227191BCF}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
|
|
||||||
{8EDF4429-251A-416D-BB68-93F227191BCF}.Tools|Any CPU.Build.0 = Tools|Any CPU
|
|
||||||
{59250BAF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{59250BAF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{59250BAF-0000-0000-0000-000000000000}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
|
|
||||||
{59250BAF-0000-0000-0000-000000000000}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
|
|
||||||
{59250BAF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{59250BAF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{59250BAF-0000-0000-0000-000000000000}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
|
|
||||||
{59250BAF-0000-0000-0000-000000000000}.Tools|Any CPU.Build.0 = Tools|Any CPU
|
|
||||||
{83429BD6-6358-4B18-BE51-401DF8EA2673}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{83429BD6-6358-4B18-BE51-401DF8EA2673}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{83429BD6-6358-4B18-BE51-401DF8EA2673}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
|
|
||||||
{83429BD6-6358-4B18-BE51-401DF8EA2673}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
|
|
||||||
{83429BD6-6358-4B18-BE51-401DF8EA2673}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{83429BD6-6358-4B18-BE51-401DF8EA2673}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{83429BD6-6358-4B18-BE51-401DF8EA2673}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
|
|
||||||
{83429BD6-6358-4B18-BE51-401DF8EA2673}.Tools|Any CPU.Build.0 = Tools|Any CPU
|
|
||||||
{B04AAE71-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{B04AAE71-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{B04AAE71-0000-0000-0000-000000000000}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
|
|
||||||
{B04AAE71-0000-0000-0000-000000000000}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
|
|
||||||
{B04AAE71-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{B04AAE71-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{B04AAE71-0000-0000-0000-000000000000}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
|
|
||||||
{B04AAE71-0000-0000-0000-000000000000}.Tools|Any CPU.Build.0 = Tools|Any CPU
|
|
||||||
{93F23A82-00C5-4572-964E-E7C9457726D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{93F23A82-00C5-4572-964E-E7C9457726D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{93F23A82-00C5-4572-964E-E7C9457726D4}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
|
|
||||||
{93F23A82-00C5-4572-964E-E7C9457726D4}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
|
|
||||||
{93F23A82-00C5-4572-964E-E7C9457726D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{93F23A82-00C5-4572-964E-E7C9457726D4}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{93F23A82-00C5-4572-964E-E7C9457726D4}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
|
|
||||||
{93F23A82-00C5-4572-964E-E7C9457726D4}.Tools|Any CPU.Build.0 = Tools|Any CPU
|
|
||||||
{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
|
|
||||||
{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
|
|
||||||
{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
|
|
||||||
{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9}.Tools|Any CPU.Build.0 = Tools|Any CPU
|
|
||||||
{0529F740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{0529F740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{0529F740-0000-0000-0000-000000000000}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
|
|
||||||
{0529F740-0000-0000-0000-000000000000}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
|
|
||||||
{0529F740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{0529F740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{0529F740-0000-0000-0000-000000000000}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
|
|
||||||
{0529F740-0000-0000-0000-000000000000}.Tools|Any CPU.Build.0 = Tools|Any CPU
|
|
||||||
{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
|
|
||||||
{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
|
|
||||||
{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
|
|
||||||
{AB7AF1C8-30FF-4436-9DF0-179BE5B0C132}.Tools|Any CPU.Build.0 = Tools|Any CPU
|
|
||||||
{7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
|
|
||||||
{7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
|
|
||||||
{7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
|
|
||||||
{7AC832A1-2461-4EB5-AC26-26F6AFFA9E46}.Tools|Any CPU.Build.0 = Tools|Any CPU
|
|
||||||
{4809F412-3132-419E-BF9D-CCF7593C3533}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{4809F412-3132-419E-BF9D-CCF7593C3533}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{4809F412-3132-419E-BF9D-CCF7593C3533}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
|
|
||||||
{4809F412-3132-419E-BF9D-CCF7593C3533}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
|
|
||||||
{4809F412-3132-419E-BF9D-CCF7593C3533}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{4809F412-3132-419E-BF9D-CCF7593C3533}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{4809F412-3132-419E-BF9D-CCF7593C3533}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
|
|
||||||
{4809F412-3132-419E-BF9D-CCF7593C3533}.Tools|Any CPU.Build.0 = Tools|Any CPU
|
|
||||||
{45C9B43F-305D-4651-9863-F6384CBC847F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{45C9B43F-305D-4651-9863-F6384CBC847F}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{45C9B43F-305D-4651-9863-F6384CBC847F}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
|
|
||||||
{45C9B43F-305D-4651-9863-F6384CBC847F}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
|
|
||||||
{45C9B43F-305D-4651-9863-F6384CBC847F}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{45C9B43F-305D-4651-9863-F6384CBC847F}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{45C9B43F-305D-4651-9863-F6384CBC847F}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
|
|
||||||
{45C9B43F-305D-4651-9863-F6384CBC847F}.Tools|Any CPU.Build.0 = Tools|Any CPU
|
|
||||||
{41B450C0-A361-4CD7-8121-7072B8995CFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{41B450C0-A361-4CD7-8121-7072B8995CFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{41B450C0-A361-4CD7-8121-7072B8995CFC}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
|
|
||||||
{41B450C0-A361-4CD7-8121-7072B8995CFC}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
|
|
||||||
{41B450C0-A361-4CD7-8121-7072B8995CFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{41B450C0-A361-4CD7-8121-7072B8995CFC}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{41B450C0-A361-4CD7-8121-7072B8995CFC}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
|
|
||||||
{41B450C0-A361-4CD7-8121-7072B8995CFC}.Tools|Any CPU.Build.0 = Tools|Any CPU
|
|
||||||
{7B9472D3-79D4-48D1-9B22-BCDE518FE842}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{7B9472D3-79D4-48D1-9B22-BCDE518FE842}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{7B9472D3-79D4-48D1-9B22-BCDE518FE842}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{7B9472D3-79D4-48D1-9B22-BCDE518FE842}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{7B9472D3-79D4-48D1-9B22-BCDE518FE842}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{7B9472D3-79D4-48D1-9B22-BCDE518FE842}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{7B9472D3-79D4-48D1-9B22-BCDE518FE842}.Tools|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{7B9472D3-79D4-48D1-9B22-BCDE518FE842}.Tools|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{1FAE651D-29D8-437A-9864-47CE0D180016}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{1FAE651D-29D8-437A-9864-47CE0D180016}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{1FAE651D-29D8-437A-9864-47CE0D180016}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{1FAE651D-29D8-437A-9864-47CE0D180016}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{1FAE651D-29D8-437A-9864-47CE0D180016}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{1FAE651D-29D8-437A-9864-47CE0D180016}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{1FAE651D-29D8-437A-9864-47CE0D180016}.Tools|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{1FAE651D-29D8-437A-9864-47CE0D180016}.Tools|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}.Tools|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA}.Tools|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{8922428F-17C3-47A7-BFE9-570DEB2464DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{8922428F-17C3-47A7-BFE9-570DEB2464DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{8922428F-17C3-47A7-BFE9-570DEB2464DA}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{8922428F-17C3-47A7-BFE9-570DEB2464DA}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{8922428F-17C3-47A7-BFE9-570DEB2464DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{8922428F-17C3-47A7-BFE9-570DEB2464DA}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{8922428F-17C3-47A7-BFE9-570DEB2464DA}.Tools|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{8922428F-17C3-47A7-BFE9-570DEB2464DA}.Tools|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{16F7DE32-0186-44B9-9345-0C20D1BF2422}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{16F7DE32-0186-44B9-9345-0C20D1BF2422}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{16F7DE32-0186-44B9-9345-0C20D1BF2422}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{16F7DE32-0186-44B9-9345-0C20D1BF2422}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{16F7DE32-0186-44B9-9345-0C20D1BF2422}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{16F7DE32-0186-44B9-9345-0C20D1BF2422}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{16F7DE32-0186-44B9-9345-0C20D1BF2422}.Tools|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{16F7DE32-0186-44B9-9345-0C20D1BF2422}.Tools|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{23F09C45-950E-4DB7-A465-E937450FF008}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{23F09C45-950E-4DB7-A465-E937450FF008}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{23F09C45-950E-4DB7-A465-E937450FF008}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{23F09C45-950E-4DB7-A465-E937450FF008}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{23F09C45-950E-4DB7-A465-E937450FF008}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{23F09C45-950E-4DB7-A465-E937450FF008}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{23F09C45-950E-4DB7-A465-E937450FF008}.Tools|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{23F09C45-950E-4DB7-A465-E937450FF008}.Tools|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{440426C1-8DCA-43F6-967F-94439B8DAF47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{440426C1-8DCA-43F6-967F-94439B8DAF47}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{440426C1-8DCA-43F6-967F-94439B8DAF47}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{440426C1-8DCA-43F6-967F-94439B8DAF47}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{440426C1-8DCA-43F6-967F-94439B8DAF47}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{440426C1-8DCA-43F6-967F-94439B8DAF47}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{440426C1-8DCA-43F6-967F-94439B8DAF47}.Tools|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{440426C1-8DCA-43F6-967F-94439B8DAF47}.Tools|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
|
|
||||||
{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
|
|
||||||
{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
|
|
||||||
{75AB8F8D-9E56-4B12-85E3-E03A852B31CC}.Tools|Any CPU.Build.0 = Tools|Any CPU
|
|
||||||
{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}.Tools|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{88B0FC0F-7209-40E2-AF16-EB90AF727C5B}.Tools|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{A59E2FCC-93CF-4886-8EA7-94F021A7475D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{A59E2FCC-93CF-4886-8EA7-94F021A7475D}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{A59E2FCC-93CF-4886-8EA7-94F021A7475D}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
|
|
||||||
{A59E2FCC-93CF-4886-8EA7-94F021A7475D}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
|
|
||||||
{A59E2FCC-93CF-4886-8EA7-94F021A7475D}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{A59E2FCC-93CF-4886-8EA7-94F021A7475D}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{A59E2FCC-93CF-4886-8EA7-94F021A7475D}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
|
|
||||||
{A59E2FCC-93CF-4886-8EA7-94F021A7475D}.Tools|Any CPU.Build.0 = Tools|Any CPU
|
|
||||||
{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}.Tools|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12}.Tools|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{8A21C7CA-2EB8-40E5-8043-33582C06D139}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{8A21C7CA-2EB8-40E5-8043-33582C06D139}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{8A21C7CA-2EB8-40E5-8043-33582C06D139}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
|
|
||||||
{8A21C7CA-2EB8-40E5-8043-33582C06D139}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
|
|
||||||
{8A21C7CA-2EB8-40E5-8043-33582C06D139}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{8A21C7CA-2EB8-40E5-8043-33582C06D139}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{8A21C7CA-2EB8-40E5-8043-33582C06D139}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
|
|
||||||
{8A21C7CA-2EB8-40E5-8043-33582C06D139}.Tools|Any CPU.Build.0 = Tools|Any CPU
|
|
||||||
{1C048C9F-00A9-4796-BE4D-BB36B7769720}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{1C048C9F-00A9-4796-BE4D-BB36B7769720}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{1C048C9F-00A9-4796-BE4D-BB36B7769720}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
|
|
||||||
{1C048C9F-00A9-4796-BE4D-BB36B7769720}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
|
|
||||||
{1C048C9F-00A9-4796-BE4D-BB36B7769720}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{1C048C9F-00A9-4796-BE4D-BB36B7769720}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{1C048C9F-00A9-4796-BE4D-BB36B7769720}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
|
|
||||||
{1C048C9F-00A9-4796-BE4D-BB36B7769720}.Tools|Any CPU.Build.0 = Tools|Any CPU
|
|
||||||
{8842381D-3426-4BA8-93DA-599AB14D88E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{8842381D-3426-4BA8-93DA-599AB14D88E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{8842381D-3426-4BA8-93DA-599AB14D88E9}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
|
|
||||||
{8842381D-3426-4BA8-93DA-599AB14D88E9}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
|
|
||||||
{8842381D-3426-4BA8-93DA-599AB14D88E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{8842381D-3426-4BA8-93DA-599AB14D88E9}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{8842381D-3426-4BA8-93DA-599AB14D88E9}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
|
|
||||||
{8842381D-3426-4BA8-93DA-599AB14D88E9}.Tools|Any CPU.Build.0 = Tools|Any CPU
|
|
||||||
{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
|
|
||||||
{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
|
|
||||||
{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
|
|
||||||
{199BBEA1-7627-434B-B6F6-0F52A7C0E1E0}.Tools|Any CPU.Build.0 = Tools|Any CPU
|
|
||||||
{952AAF2A-DF63-4A7D-8094-3453893EBA80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{952AAF2A-DF63-4A7D-8094-3453893EBA80}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{952AAF2A-DF63-4A7D-8094-3453893EBA80}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
|
|
||||||
{952AAF2A-DF63-4A7D-8094-3453893EBA80}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
|
|
||||||
{952AAF2A-DF63-4A7D-8094-3453893EBA80}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{952AAF2A-DF63-4A7D-8094-3453893EBA80}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{952AAF2A-DF63-4A7D-8094-3453893EBA80}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
|
|
||||||
{952AAF2A-DF63-4A7D-8094-3453893EBA80}.Tools|Any CPU.Build.0 = Tools|Any CPU
|
|
||||||
{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
|
|
||||||
{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
|
|
||||||
{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
|
|
||||||
{424445D4-F5D9-4CA9-A435-0A36E8AA28F3}.Tools|Any CPU.Build.0 = Tools|Any CPU
|
|
||||||
{A493616C-338D-47B7-8072-A7F14D034D0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{A493616C-338D-47B7-8072-A7F14D034D0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{A493616C-338D-47B7-8072-A7F14D034D0B}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
|
|
||||||
{A493616C-338D-47B7-8072-A7F14D034D0B}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
|
|
||||||
{A493616C-338D-47B7-8072-A7F14D034D0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{A493616C-338D-47B7-8072-A7F14D034D0B}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{A493616C-338D-47B7-8072-A7F14D034D0B}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
|
|
||||||
{A493616C-338D-47B7-8072-A7F14D034D0B}.Tools|Any CPU.Build.0 = Tools|Any CPU
|
|
||||||
{07CA34A1-1D37-4771-A2E3-495A1044AE0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{07CA34A1-1D37-4771-A2E3-495A1044AE0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{07CA34A1-1D37-4771-A2E3-495A1044AE0B}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
|
|
||||||
{07CA34A1-1D37-4771-A2E3-495A1044AE0B}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
|
|
||||||
{07CA34A1-1D37-4771-A2E3-495A1044AE0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{07CA34A1-1D37-4771-A2E3-495A1044AE0B}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{07CA34A1-1D37-4771-A2E3-495A1044AE0B}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
|
|
||||||
{07CA34A1-1D37-4771-A2E3-495A1044AE0B}.Tools|Any CPU.Build.0 = Tools|Any CPU
|
|
||||||
{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}.Tools|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2}.Tools|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}.Tools|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{D97D8258-D915-4D1D-B1E3-1A8D00CF9EB5}.Tools|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.DebugOpt|Any CPU.ActiveCfg = DebugOpt|Any CPU
|
|
||||||
{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.DebugOpt|Any CPU.Build.0 = DebugOpt|Any CPU
|
|
||||||
{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.Tools|Any CPU.ActiveCfg = Tools|Any CPU
|
|
||||||
{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}.Tools|Any CPU.Build.0 = Tools|Any CPU
|
|
||||||
{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.DebugOpt|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.DebugOpt|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Tools|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6}.Tools|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
|
||||||
HideSolutionNode = FALSE
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(NestedProjects) = preSolution
|
|
||||||
{C899FCA4-7037-4E49-ABC2-44DE72487110} = {3202E94D-E985-4181-9F69-F458A7F6574F}
|
|
||||||
{59250BAF-0000-0000-0000-000000000000} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
|
|
||||||
{83429BD6-6358-4B18-BE51-401DF8EA2673} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
|
|
||||||
{B04AAE71-0000-0000-0000-000000000000} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
|
|
||||||
{93F23A82-00C5-4572-964E-E7C9457726D4} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
|
|
||||||
{F0ADA779-40B8-4F7E-BA6C-CDB19F3065D9} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
|
|
||||||
{0529F740-0000-0000-0000-000000000000} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
|
|
||||||
{4809F412-3132-419E-BF9D-CCF7593C3533} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
|
|
||||||
{50404922-9637-4394-BF59-165D0850ADC8} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
|
|
||||||
{41B450C0-A361-4CD7-8121-7072B8995CFC} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
|
|
||||||
{7B9472D3-79D4-48D1-9B22-BCDE518FE842} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
|
|
||||||
{1FAE651D-29D8-437A-9864-47CE0D180016} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
|
|
||||||
{8922428F-17C3-47A7-BFE9-570DEB2464DA} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
|
|
||||||
{16F7DE32-0186-44B9-9345-0C20D1BF2422} = {AFF53804-115F-4E67-B81F-26265EA27880}
|
|
||||||
{AFF53804-115F-4E67-B81F-26265EA27880} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
|
|
||||||
{23F09C45-950E-4DB7-A465-E937450FF008} = {AFF53804-115F-4E67-B81F-26265EA27880}
|
|
||||||
{440426C1-8DCA-43F6-967F-94439B8DAF47} = {AFF53804-115F-4E67-B81F-26265EA27880}
|
|
||||||
{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
|
|
||||||
{8A21C7CA-2EB8-40E5-8043-33582C06D139} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
|
|
||||||
{952AAF2A-DF63-4A7D-8094-3453893EBA80} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
|
|
||||||
{A965CB3B-FD31-44AF-8872-85ABA436098D} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
|
|
||||||
{7844DA69-B0F0-49FB-A05E-ECA37372277A} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
|
|
||||||
{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA} = {7844DA69-B0F0-49FB-A05E-ECA37372277A}
|
|
||||||
{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2} = {7844DA69-B0F0-49FB-A05E-ECA37372277A}
|
|
||||||
{07CA34A1-1D37-4771-A2E3-495A1044AE0B} = {7844DA69-B0F0-49FB-A05E-ECA37372277A}
|
|
||||||
{88B0FC0F-7209-40E2-AF16-EB90AF727C5B} = {7844DA69-B0F0-49FB-A05E-ECA37372277A}
|
|
||||||
{83F510FE-9B50-4D96-AFAB-CC13998D6AFE} = {7844DA69-B0F0-49FB-A05E-ECA37372277A}
|
|
||||||
{5C05B9B4-6AFE-4884-AA6A-5A26C0FFF2F6} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
|
||||||
SolutionGuid = {AA37ED9F-F8D6-468E-A101-658AD605B09A}
|
|
||||||
EndGlobalSection
|
|
||||||
EndGlobal
|
|
||||||
168
SpaceStation14.slnx
Normal file
168
SpaceStation14.slnx
Normal file
@@ -0,0 +1,168 @@
|
|||||||
|
<Solution>
|
||||||
|
<Configurations>
|
||||||
|
<BuildType Name="Debug" />
|
||||||
|
<BuildType Name="DebugOpt" />
|
||||||
|
<BuildType Name="Release" />
|
||||||
|
<BuildType Name="Tools" />
|
||||||
|
</Configurations>
|
||||||
|
<Folder Name="/Build Checker/">
|
||||||
|
<Project Path="BuildChecker/BuildChecker.csproj">
|
||||||
|
<Build Solution="Release|*" Project="false" />
|
||||||
|
</Project>
|
||||||
|
</Folder>
|
||||||
|
<Folder Name="/Build/">
|
||||||
|
<File Path="Tools/generate_hashes.ps1" />
|
||||||
|
</Folder>
|
||||||
|
<Folder Name="/MSBuild/">
|
||||||
|
<File Path="MSBuild/Content.props" />
|
||||||
|
</Folder>
|
||||||
|
<Folder Name="/Project Files/">
|
||||||
|
<File Path=".editorconfig" />
|
||||||
|
<File Path=".gitattributes" />
|
||||||
|
<File Path=".gitignore" />
|
||||||
|
<File Path="Directory.Packages.props" />
|
||||||
|
<File Path="README.md" />
|
||||||
|
</Folder>
|
||||||
|
<Project Path="Content.Benchmarks/Content.Benchmarks.csproj" />
|
||||||
|
<Project Path="Content.Client/Content.Client.csproj" />
|
||||||
|
<Project Path="Content.IntegrationTests/Content.IntegrationTests.csproj" />
|
||||||
|
<Project Path="Content.MapRenderer/Content.MapRenderer.csproj" />
|
||||||
|
<Project Path="Content.Packaging/Content.Packaging.csproj" />
|
||||||
|
<Project Path="Content.PatreonParser/Content.PatreonParser.csproj">
|
||||||
|
<BuildType Solution="DebugOpt|*" Project="Debug" />
|
||||||
|
<BuildType Solution="Tools|*" Project="Debug" />
|
||||||
|
</Project>
|
||||||
|
<Project Path="Content.Replay/Content.Replay.csproj" />
|
||||||
|
<Project Path="Content.Server.Database/Content.Server.Database.csproj" />
|
||||||
|
<Project Path="Content.Server/Content.Server.csproj" />
|
||||||
|
<Project Path="Content.Shared.Database/Content.Shared.Database.csproj" />
|
||||||
|
<Project Path="Content.Shared/Content.Shared.csproj" />
|
||||||
|
<Project Path="Content.Tests/Content.Tests.csproj" />
|
||||||
|
<Project Path="Content.Tools/Content.Tools.csproj" />
|
||||||
|
<Project Path="Content.YAMLLinter/Content.YAMLLinter.csproj" />
|
||||||
|
<Project Path="Pow3r/Pow3r.csproj" />
|
||||||
|
<Folder Name="/RobustToolbox/.github/workflows/">
|
||||||
|
<File Path="RobustToolbox/.github/workflows/benchmarks.yml" />
|
||||||
|
<File Path="RobustToolbox/.github/workflows/build-all-configurations.yml" />
|
||||||
|
<File Path="RobustToolbox/.github/workflows/build-docfx.yml" />
|
||||||
|
<File Path="RobustToolbox/.github/workflows/build-test.yml" />
|
||||||
|
<File Path="RobustToolbox/.github/workflows/codeql-analysis.yml" />
|
||||||
|
<File Path="RobustToolbox/.github/workflows/publish-client.yml" />
|
||||||
|
<File Path="RobustToolbox/.github/workflows/test-content.yml" />
|
||||||
|
</Folder>
|
||||||
|
<Folder Name="/RobustToolbox/Imports/">
|
||||||
|
<File Path="RobustToolbox/Imports/Benchmarks.props" />
|
||||||
|
<File Path="RobustToolbox/Imports/Client.props" />
|
||||||
|
<File Path="RobustToolbox/Imports/Lidgren.props" />
|
||||||
|
<File Path="RobustToolbox/Imports/Packaging.props" />
|
||||||
|
<File Path="RobustToolbox/Imports/Server.props" />
|
||||||
|
<File Path="RobustToolbox/Imports/Shared.props" />
|
||||||
|
<File Path="RobustToolbox/Imports/Testing.props" />
|
||||||
|
<File Path="RobustToolbox/Imports/WebView.props" />
|
||||||
|
</Folder>
|
||||||
|
<Folder Name="/RobustToolbox/MSBuild/">
|
||||||
|
<File Path="RobustToolbox/MSBuild/Robust.Analyzers.targets" />
|
||||||
|
<File Path="RobustToolbox/MSBuild/Robust.CompNetworkGenerator.targets" />
|
||||||
|
<File Path="RobustToolbox/MSBuild/Robust.Configurations.props" />
|
||||||
|
<File Path="RobustToolbox/MSBuild/Robust.DefineConstants.targets" />
|
||||||
|
<File Path="RobustToolbox/MSBuild/Robust.Engine.props" />
|
||||||
|
<File Path="RobustToolbox/MSBuild/Robust.Engine.targets" />
|
||||||
|
<File Path="RobustToolbox/MSBuild/Robust.Engine.Version.props" />
|
||||||
|
<File Path="RobustToolbox/MSBuild/Robust.Platform.props" />
|
||||||
|
<File Path="RobustToolbox/MSBuild/Robust.ProjectReferences.targets" />
|
||||||
|
<File Path="RobustToolbox/MSBuild/Robust.Properties.targets" />
|
||||||
|
<File Path="RobustToolbox/MSBuild/Robust.Trimming.targets" />
|
||||||
|
<File Path="RobustToolbox/MSBuild/XamlIL.targets" />
|
||||||
|
</Folder>
|
||||||
|
<Folder Name="/RobustToolbox/NetSerializer/">
|
||||||
|
<Project Path="RobustToolbox/NetSerializer/NetSerializer/NetSerializer.csproj">
|
||||||
|
<BuildType Solution="DebugOpt|*" Project="Debug" />
|
||||||
|
<BuildType Solution="Tools|*" Project="Release" />
|
||||||
|
</Project>
|
||||||
|
</Folder>
|
||||||
|
<Folder Name="/RobustToolbox/Project Files/">
|
||||||
|
<File Path="RobustToolbox/Directory.Build.props" />
|
||||||
|
<File Path="RobustToolbox/Directory.Packages.props" />
|
||||||
|
<File Path="RobustToolbox/README.md" />
|
||||||
|
<File Path="RobustToolbox/RELEASE-NOTES.md" />
|
||||||
|
</Folder>
|
||||||
|
<Folder Name="/RobustToolbox/Robust.LoaderApi/">
|
||||||
|
<Project Path="RobustToolbox/Robust.LoaderApi/Robust.LoaderApi/Robust.LoaderApi.csproj">
|
||||||
|
<BuildType Solution="DebugOpt|*" Project="Debug" />
|
||||||
|
<BuildType Solution="Tools|*" Project="Release" />
|
||||||
|
</Project>
|
||||||
|
</Folder>
|
||||||
|
<Folder Name="/RobustToolbox/Roslyn/">
|
||||||
|
<Project Path="RobustToolbox/Robust.Analyzers.Tests/Robust.Analyzers.Tests.csproj" />
|
||||||
|
<Project Path="RobustToolbox/Robust.Analyzers/Robust.Analyzers.csproj">
|
||||||
|
<BuildType Solution="DebugOpt|*" Project="Debug" />
|
||||||
|
<BuildType Solution="Tools|*" Project="Release" />
|
||||||
|
</Project>
|
||||||
|
<Project Path="RobustToolbox/Robust.Client.NameGenerator/Robust.Client.NameGenerator.csproj">
|
||||||
|
<BuildType Solution="DebugOpt|*" Project="Debug" />
|
||||||
|
<BuildType Solution="Tools|*" Project="Release" />
|
||||||
|
</Project>
|
||||||
|
<Project Path="RobustToolbox/Robust.Serialization.Generator/Robust.Serialization.Generator.csproj">
|
||||||
|
<BuildType Solution="DebugOpt|*" Project="Debug" />
|
||||||
|
<BuildType Solution="Tools|*" Project="Release" />
|
||||||
|
</Project>
|
||||||
|
<Project Path="RobustToolbox/Robust.Shared.CompNetworkGenerator/Robust.Shared.CompNetworkGenerator.csproj">
|
||||||
|
<BuildType Solution="DebugOpt|*" Project="Debug" />
|
||||||
|
<BuildType Solution="Tools|*" Project="Release" />
|
||||||
|
</Project>
|
||||||
|
</Folder>
|
||||||
|
<Folder Name="/RobustToolbox/Tools/">
|
||||||
|
<Project Path="RobustToolbox/Tools/Robust.SolutionGen/Robust.SolutionGen.csproj">
|
||||||
|
<BuildType Solution="DebugOpt|*" Project="Debug" />
|
||||||
|
<BuildType Solution="Tools|*" Project="Release" />
|
||||||
|
</Project>
|
||||||
|
</Folder>
|
||||||
|
<Folder Name="/RobustToolbox/XamlX/">
|
||||||
|
<Project Path="RobustToolbox/XamlX/src/XamlX.IL.Cecil/XamlX.IL.Cecil.csproj">
|
||||||
|
<BuildType Solution="DebugOpt|*" Project="Debug" />
|
||||||
|
<BuildType Solution="Tools|*" Project="Release" />
|
||||||
|
</Project>
|
||||||
|
<Project Path="RobustToolbox/XamlX/src/XamlX.Runtime/XamlX.Runtime.csproj">
|
||||||
|
<BuildType Solution="DebugOpt|*" Project="Debug" />
|
||||||
|
<BuildType Solution="Tools|*" Project="Release" />
|
||||||
|
</Project>
|
||||||
|
<Project Path="RobustToolbox/XamlX/src/XamlX/XamlX.csproj">
|
||||||
|
<BuildType Solution="DebugOpt|*" Project="Debug" />
|
||||||
|
<BuildType Solution="Tools|*" Project="Release" />
|
||||||
|
</Project>
|
||||||
|
</Folder>
|
||||||
|
<Folder Name="/RobustToolbox/">
|
||||||
|
<Project Path="RobustToolbox/Avalonia.Base/Avalonia.Base.csproj">
|
||||||
|
<BuildType Solution="DebugOpt|*" Project="Debug" />
|
||||||
|
<BuildType Solution="Tools|*" Project="Release" />
|
||||||
|
</Project>
|
||||||
|
<Project Path="RobustToolbox/Lidgren.Network/Lidgren.Network.csproj" />
|
||||||
|
<Project Path="RobustToolbox/Robust.Benchmarks/Robust.Benchmarks.csproj" />
|
||||||
|
<Project Path="RobustToolbox/Robust.Client.Injectors/Robust.Client.Injectors.csproj">
|
||||||
|
<BuildType Solution="DebugOpt|*" Project="Debug" />
|
||||||
|
<BuildType Solution="Tools|*" Project="Release" />
|
||||||
|
</Project>
|
||||||
|
<Project Path="RobustToolbox/Robust.Client.IntegrationTests/Robust.Client.IntegrationTests.csproj" />
|
||||||
|
<Project Path="RobustToolbox/Robust.Client.Tests/Robust.Client.Tests.csproj" />
|
||||||
|
<Project Path="RobustToolbox/Robust.Client/Robust.Client.csproj" />
|
||||||
|
<Project Path="RobustToolbox/Robust.Packaging.Tests/Robust.Packaging.Tests.csproj" />
|
||||||
|
<Project Path="RobustToolbox/Robust.Packaging/Robust.Packaging.csproj" />
|
||||||
|
<Project Path="RobustToolbox/Robust.Server.IntegrationTests/Robust.Server.IntegrationTests.csproj" />
|
||||||
|
<Project Path="RobustToolbox/Robust.Server.Testing/Robust.Server.Testing.csproj" />
|
||||||
|
<Project Path="RobustToolbox/Robust.Server/Robust.Server.csproj" />
|
||||||
|
<Project Path="RobustToolbox/Robust.Shared.IntegrationTests/Robust.Shared.IntegrationTests.csproj" />
|
||||||
|
<Project Path="RobustToolbox/Robust.Shared.Maths.Testing/Robust.Shared.Maths.Testing.csproj" />
|
||||||
|
<Project Path="RobustToolbox/Robust.Shared.Maths.Tests/Robust.Shared.Maths.Tests.csproj" />
|
||||||
|
<Project Path="RobustToolbox/Robust.Shared.Maths/Robust.Shared.Maths.csproj" />
|
||||||
|
<Project Path="RobustToolbox/Robust.Shared.Scripting/Robust.Shared.Scripting.csproj" />
|
||||||
|
<Project Path="RobustToolbox/Robust.Shared.Testing/Robust.Shared.Testing.csproj" />
|
||||||
|
<Project Path="RobustToolbox/Robust.Shared.Tests/Robust.Shared.Tests.csproj" />
|
||||||
|
<Project Path="RobustToolbox/Robust.Shared/Robust.Shared.csproj" />
|
||||||
|
<Project Path="RobustToolbox/Robust.UnitTesting/Robust.UnitTesting.csproj" />
|
||||||
|
<Project Path="RobustToolbox/Robust.Xaml/Robust.Xaml.csproj">
|
||||||
|
<BuildType Solution="DebugOpt|*" Project="Debug" />
|
||||||
|
<BuildType Solution="Tools|*" Project="Release" />
|
||||||
|
</Project>
|
||||||
|
<File Path="RobustToolbox/RobustToolbox.slnx" />
|
||||||
|
</Folder>
|
||||||
|
</Solution>
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"sdk": {
|
"sdk": {
|
||||||
"version": "9.0.100",
|
"version": "10.0.100",
|
||||||
"rollForward": "latestFeature"
|
"rollForward": "latestFeature"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user