Skip to content

Commit

Permalink
Delete Unused Files.
Browse files Browse the repository at this point in the history
  • Loading branch information
@yskeno
yskeno committed Feb 29, 2020
1 parent f770634 commit 61577b1
Show file tree
Hide file tree
Showing 8 changed files with 54 additions and 344 deletions.
12 changes: 0 additions & 12 deletions WaapiCommandAddons/WaapiBridgeCS/WaapiBridgeCS.cs
View file

This file was deleted.

17 changes: 0 additions & 17 deletions WaapiCommandAddons/WaapiBridgeCS/WaapiBridgeCS.csproj
View file

This file was deleted.

4 changes: 0 additions & 4 deletions WaapiCommandAddons/WaapiCommandAddons.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WaapiClientJson", "%WWISESD
{BF45323C-2BD1-9F00-34E2-22F5A0ECFB00} = {BF45323C-2BD1-9F00-34E2-22F5A0ECFB00}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WaapiBridgeCS", "WaapiBridgeCS\WaapiBridgeCS.csproj", "{C01A9DE8-D27F-4113-A9F2-B3CE28A3B78A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WaapiCommandAddons", "WaapiCommandAddons\WaapiCommandAddons.csproj", "{FE282BD7-08F7-4762-A6C9-54BB0FD77DE6}"
ProjectSection(ProjectDependencies) = postProject
{BF45323C-2BD1-9F00-34E2-22F5A0ECFB00} = {BF45323C-2BD1-9F00-34E2-22F5A0ECFB00}
Expand All @@ -32,8 +30,6 @@ Global
{102D363C-7CB8-A300-85C9-26F5F1D3FF00}.Debug|x64.Build.0 = Debug|x64
{102D363C-7CB8-A300-85C9-26F5F1D3FF00}.Release|x64.ActiveCfg = Release|x64
{102D363C-7CB8-A300-85C9-26F5F1D3FF00}.Release|x64.Build.0 = Release|x64
{C01A9DE8-D27F-4113-A9F2-B3CE28A3B78A}.Debug|x64.ActiveCfg = Debug|x64
{C01A9DE8-D27F-4113-A9F2-B3CE28A3B78A}.Release|x64.ActiveCfg = Release|x64
{FE282BD7-08F7-4762-A6C9-54BB0FD77DE6}.Debug|x64.ActiveCfg = Debug|x64
{FE282BD7-08F7-4762-A6C9-54BB0FD77DE6}.Debug|x64.Build.0 = Debug|x64
{FE282BD7-08F7-4762-A6C9-54BB0FD77DE6}.Release|x64.ActiveCfg = Release|x64
Expand Down
83 changes: 40 additions & 43 deletions WaapiCommandAddons/WaapiCommandAddons/WaapiCommandAddons.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
using System.Linq;
using System.Threading.Tasks;

class WwiseMA
{
}

namespace AK.Wwise.Waapi
{
Expand Down Expand Up @@ -117,46 +114,46 @@ static async Task waapiMain(AK.Wwise.Waapi.JsonClient client, string[] args)
return;
}

/* // Execute external application with Wwise info as argument
if (args.Contains<string>("-x") || args.Contains<string>("--exe"))
{
var executeCommand = new ProcessStartInfo();
executeCommand.UseShellExecute = true;
if (args.Contains<string>("-pn"))
{
JObject waapiArg_getProjectName = new JObject(
new JProperty("from",
new JObject(new JProperty("ofType",
new JArray(new JValue("Project"))))));
JObject waapOpt_getProjectName = new JObject(
new JProperty("return",
new JArray(new JValue("name"))));
var projectInfo = await client.Call(ak.wwise.core.@object.get, waapiArg_getProjectName, waapOpt_getProjectName);
executeCommand.Arguments = (string)projectInfo["return"][0]["name"];
//Console.WriteLine("projectName: {0}", exeArg);
}
else
{
Console.WriteLine("ERROR: No argument for -x(--exe) found!");
return;
}
// array range method for C#8.0 or later.
//executeCommand.FileName = String.Join(" ", args[2..]);
if (executeCommand.FileName == null)
{
Console.WriteLine("Not found application to execute!");
return;
}
Process.Start(executeCommand);
return;
}*/
/* // Execute external application with Wwise info as argument
if (args.Contains<string>("-x") || args.Contains<string>("--exe"))
{
var executeCommand = new ProcessStartInfo();
executeCommand.UseShellExecute = true;
if (args.Contains<string>("-pn"))
{
JObject waapiArg_getProjectName = new JObject(
new JProperty("from",
new JObject(new JProperty("ofType",
new JArray(new JValue("Project"))))));
JObject waapOpt_getProjectName = new JObject(
new JProperty("return",
new JArray(new JValue("name"))));
var projectInfo = await client.Call(ak.wwise.core.@object.get, waapiArg_getProjectName, waapOpt_getProjectName);
executeCommand.Arguments = (string)projectInfo["return"][0]["name"];
//Console.WriteLine("projectName: {0}", exeArg);
}
else
{
Console.WriteLine("ERROR: No argument for -x(--exe) found!");
return;
}
// array range method for C#8.0 or later.
//executeCommand.FileName = String.Join(" ", args[2..]);
if (executeCommand.FileName == null)
{
Console.WriteLine("Not found application to execute!");
return;
}
Process.Start(executeCommand);
return;
}*/
}

catch (Exception e)
Expand Down
41 changes: 14 additions & 27 deletions WaapiCommandAddons/WaapiCommandAddons/WaapiCommandAddons.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{FE282BD7-08F7-4762-A6C9-54BB0FD77DE6}</ProjectGuid>
<OutputType>Exe</OutputType>
<OutputType>WinExe</OutputType>
<RootNamespace>WaapiCommandAddons</RootNamespace>
<AssemblyName>WaapiCommandAddons</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
Expand Down Expand Up @@ -85,12 +85,6 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="WaapiCommandAddons.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Connected Services\" />
</ItemGroup>
Expand All @@ -116,32 +110,25 @@
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\ILMerge.3.0.29\build\ILMerge.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ILMerge.3.0.29\build\ILMerge.props'))" />
</Target>
<Target Name="CustomActionsAfterILMerge" AfterTargets="ILMerge" Condition="Exists('$(WWISEROOT)\Authoring\Data\Add-ons\Commands\')">
<ItemGroup>
<SourceItems Include="$(TargetDir)..\publish\$(TargetName).exe" />
<SourceItems Include="$(SolutionDir)WaapiCommandAddons.json" />
</ItemGroup>
<Copy SourceFiles="@(SourceItems)" DestinationFolder="$(WWISEROOT)\Authoring\Data\Add-ons\Commands\" />
</Target>
<ItemGroup>
<PackageReference Include="ILMerge" Version="3.0.29" />
<Reference Include="System" />
</ItemGroup>
<Target Name="ILMerge">
<!-- the ILMergePath property points to the location of ILMerge.exe console application -->
<Exec Command="$(ILMergeConsolePath) /wildcards $(TargetPath) /out:$(TargetDir)ILMerge\$(TargetFileName) $(TargetDir)*.dll " />
</Target>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>if $(ConfigurationName) == Release (
del /s /q "$(TargetDir)ILMerge\*.*"
mkdir "$(TargetDir)ILMerge "
"$(ILMergeConsolePath)" /ndebug /wildcards /out:"$(TargetDir)ILMerge\$(TargetFileName)" "$(TargetPath)" "$(TargetDir)*.dll"

"$(ILMergeConsolePath)" /ndebug /wildcards /out:"$(TargetDir)ILMerge\$(TargetFileName)" "$(TargetPath)" "$(TargetDir)*.dll"

xcopy /y /d /i "$(SolutionDir)WaapiCommandAddons.json" "$(WWISEROOT)\Authoring\Data\Add-ons\Commands\"
xcopy /y /d /i "$(TargetDir)ILMerge\$(TargetFileName)" "$(WWISEROOT)\Authoring\Data\Add-ons\Commands\"
)</PostBuildEvent>
</PropertyGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\ILMerge.3.0.29\build\ILMerge.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ILMerge.3.0.29\build\ILMerge.props'))" />
</Target>
</Project>
8 changes: 0 additions & 8 deletions WaapiCommandAddons/WaapiCommandAddons_Core3/Properties/launchSettings.json
View file

This file was deleted.

168 changes: 0 additions & 168 deletions WaapiCommandAddons/WaapiCommandAddons_Core3/WaapiCommandAddons_Core3.cs
View file

This file was deleted.

Loading

0 comments on commit 61577b1

Please sign in to comment.