Skip to content

Commit 61577b1

Browse files
committed
Delete Unused Files.
1 parent f770634 commit 61577b1

8 files changed

Lines changed: 54 additions & 344 deletions

File tree

WaapiCommandAddons/WaapiBridgeCS/WaapiBridgeCS.cs

Lines changed: 0 additions & 12 deletions
This file was deleted.

WaapiCommandAddons/WaapiBridgeCS/WaapiBridgeCS.csproj

Lines changed: 0 additions & 17 deletions
This file was deleted.

WaapiCommandAddons/WaapiCommandAddons.sln

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WaapiClientJson", "%WWISESD
1010
{BF45323C-2BD1-9F00-34E2-22F5A0ECFB00} = {BF45323C-2BD1-9F00-34E2-22F5A0ECFB00}
1111
EndProjectSection
1212
EndProject
13-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WaapiBridgeCS", "WaapiBridgeCS\WaapiBridgeCS.csproj", "{C01A9DE8-D27F-4113-A9F2-B3CE28A3B78A}"
14-
EndProject
1513
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WaapiCommandAddons", "WaapiCommandAddons\WaapiCommandAddons.csproj", "{FE282BD7-08F7-4762-A6C9-54BB0FD77DE6}"
1614
ProjectSection(ProjectDependencies) = postProject
1715
{BF45323C-2BD1-9F00-34E2-22F5A0ECFB00} = {BF45323C-2BD1-9F00-34E2-22F5A0ECFB00}
@@ -32,8 +30,6 @@ Global
3230
{102D363C-7CB8-A300-85C9-26F5F1D3FF00}.Debug|x64.Build.0 = Debug|x64
3331
{102D363C-7CB8-A300-85C9-26F5F1D3FF00}.Release|x64.ActiveCfg = Release|x64
3432
{102D363C-7CB8-A300-85C9-26F5F1D3FF00}.Release|x64.Build.0 = Release|x64
35-
{C01A9DE8-D27F-4113-A9F2-B3CE28A3B78A}.Debug|x64.ActiveCfg = Debug|x64
36-
{C01A9DE8-D27F-4113-A9F2-B3CE28A3B78A}.Release|x64.ActiveCfg = Release|x64
3733
{FE282BD7-08F7-4762-A6C9-54BB0FD77DE6}.Debug|x64.ActiveCfg = Debug|x64
3834
{FE282BD7-08F7-4762-A6C9-54BB0FD77DE6}.Debug|x64.Build.0 = Debug|x64
3935
{FE282BD7-08F7-4762-A6C9-54BB0FD77DE6}.Release|x64.ActiveCfg = Release|x64

WaapiCommandAddons/WaapiCommandAddons/WaapiCommandAddons.cs

Lines changed: 40 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
using System.Linq;
66
using System.Threading.Tasks;
77

8-
class WwiseMA
9-
{
10-
}
118

129
namespace AK.Wwise.Waapi
1310
{
@@ -117,46 +114,46 @@ static async Task waapiMain(AK.Wwise.Waapi.JsonClient client, string[] args)
117114
return;
118115
}
119116

120-
/* // Execute external application with Wwise info as argument
121-
if (args.Contains<string>("-x") || args.Contains<string>("--exe"))
122-
{
123-
var executeCommand = new ProcessStartInfo();
124-
executeCommand.UseShellExecute = true;
125-
126-
if (args.Contains<string>("-pn"))
127-
{
128-
JObject waapiArg_getProjectName = new JObject(
129-
new JProperty("from",
130-
new JObject(new JProperty("ofType",
131-
new JArray(new JValue("Project"))))));
132-
JObject waapOpt_getProjectName = new JObject(
133-
new JProperty("return",
134-
new JArray(new JValue("name"))));
135-
136-
var projectInfo = await client.Call(ak.wwise.core.@object.get, waapiArg_getProjectName, waapOpt_getProjectName);
137-
138-
executeCommand.Arguments = (string)projectInfo["return"][0]["name"];
139-
140-
//Console.WriteLine("projectName: {0}", exeArg);
141-
}
142-
else
143-
{
144-
Console.WriteLine("ERROR: No argument for -x(--exe) found!");
145-
return;
146-
}
147-
148-
// array range method for C#8.0 or later.
149-
//executeCommand.FileName = String.Join(" ", args[2..]);
150-
151-
if (executeCommand.FileName == null)
152-
{
153-
Console.WriteLine("Not found application to execute!");
154-
return;
155-
}
156-
157-
Process.Start(executeCommand);
158-
return;
159-
}*/
117+
/* // Execute external application with Wwise info as argument
118+
if (args.Contains<string>("-x") || args.Contains<string>("--exe"))
119+
{
120+
var executeCommand = new ProcessStartInfo();
121+
executeCommand.UseShellExecute = true;
122+
123+
if (args.Contains<string>("-pn"))
124+
{
125+
JObject waapiArg_getProjectName = new JObject(
126+
new JProperty("from",
127+
new JObject(new JProperty("ofType",
128+
new JArray(new JValue("Project"))))));
129+
JObject waapOpt_getProjectName = new JObject(
130+
new JProperty("return",
131+
new JArray(new JValue("name"))));
132+
133+
var projectInfo = await client.Call(ak.wwise.core.@object.get, waapiArg_getProjectName, waapOpt_getProjectName);
134+
135+
executeCommand.Arguments = (string)projectInfo["return"][0]["name"];
136+
137+
//Console.WriteLine("projectName: {0}", exeArg);
138+
}
139+
else
140+
{
141+
Console.WriteLine("ERROR: No argument for -x(--exe) found!");
142+
return;
143+
}
144+
145+
// array range method for C#8.0 or later.
146+
//executeCommand.FileName = String.Join(" ", args[2..]);
147+
148+
if (executeCommand.FileName == null)
149+
{
150+
Console.WriteLine("Not found application to execute!");
151+
return;
152+
}
153+
154+
Process.Start(executeCommand);
155+
return;
156+
}*/
160157
}
161158

162159
catch (Exception e)

WaapiCommandAddons/WaapiCommandAddons/WaapiCommandAddons.csproj

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
77
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
88
<ProjectGuid>{FE282BD7-08F7-4762-A6C9-54BB0FD77DE6}</ProjectGuid>
9-
<OutputType>Exe</OutputType>
9+
<OutputType>WinExe</OutputType>
1010
<RootNamespace>WaapiCommandAddons</RootNamespace>
1111
<AssemblyName>WaapiCommandAddons</AssemblyName>
1212
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
@@ -85,12 +85,6 @@
8585
<Compile Include="Properties\AssemblyInfo.cs" />
8686
<Compile Include="WaapiCommandAddons.cs" />
8787
</ItemGroup>
88-
<ItemGroup>
89-
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
90-
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
91-
</Reference>
92-
<Reference Include="System" />
93-
</ItemGroup>
9488
<ItemGroup>
9589
<WCFMetadata Include="Connected Services\" />
9690
</ItemGroup>
@@ -116,32 +110,25 @@
116110
<Install>false</Install>
117111
</BootstrapperPackage>
118112
</ItemGroup>
119-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
120-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
121-
<PropertyGroup>
122-
<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>
123-
</PropertyGroup>
124-
<Error Condition="!Exists('..\packages\ILMerge.3.0.29\build\ILMerge.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ILMerge.3.0.29\build\ILMerge.props'))" />
125-
</Target>
126-
<Target Name="CustomActionsAfterILMerge" AfterTargets="ILMerge" Condition="Exists('$(WWISEROOT)\Authoring\Data\Add-ons\Commands\')">
127-
<ItemGroup>
128-
<SourceItems Include="$(TargetDir)..\publish\$(TargetName).exe" />
129-
<SourceItems Include="$(SolutionDir)WaapiCommandAddons.json" />
130-
</ItemGroup>
131-
<Copy SourceFiles="@(SourceItems)" DestinationFolder="$(WWISEROOT)\Authoring\Data\Add-ons\Commands\" />
132-
</Target>
133113
<ItemGroup>
134-
<PackageReference Include="ILMerge" Version="3.0.29" />
114+
<Reference Include="System" />
135115
</ItemGroup>
136-
<Target Name="ILMerge">
137-
<!-- the ILMergePath property points to the location of ILMerge.exe console application -->
138-
<Exec Command="$(ILMergeConsolePath) /wildcards $(TargetPath) /out:$(TargetDir)ILMerge\$(TargetFileName) $(TargetDir)*.dll " />
139-
</Target>
116+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
140117
<PropertyGroup>
141118
<PostBuildEvent>if $(ConfigurationName) == Release (
142119
del /s /q "$(TargetDir)ILMerge\*.*"
143120
mkdir "$(TargetDir)ILMerge "
144-
"$(ILMergeConsolePath)" /ndebug /wildcards /out:"$(TargetDir)ILMerge\$(TargetFileName)" "$(TargetPath)" "$(TargetDir)*.dll"
121+
122+
"$(ILMergeConsolePath)" /ndebug /wildcards /out:"$(TargetDir)ILMerge\$(TargetFileName)" "$(TargetPath)" "$(TargetDir)*.dll"
123+
124+
xcopy /y /d /i "$(SolutionDir)WaapiCommandAddons.json" "$(WWISEROOT)\Authoring\Data\Add-ons\Commands\"
125+
xcopy /y /d /i "$(TargetDir)ILMerge\$(TargetFileName)" "$(WWISEROOT)\Authoring\Data\Add-ons\Commands\"
145126
)</PostBuildEvent>
146127
</PropertyGroup>
128+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
129+
<PropertyGroup>
130+
<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>
131+
</PropertyGroup>
132+
<Error Condition="!Exists('..\packages\ILMerge.3.0.29\build\ILMerge.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ILMerge.3.0.29\build\ILMerge.props'))" />
133+
</Target>
147134
</Project>

WaapiCommandAddons/WaapiCommandAddons_Core3/Properties/launchSettings.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

WaapiCommandAddons/WaapiCommandAddons_Core3/WaapiCommandAddons_Core3.cs

Lines changed: 0 additions & 168 deletions
This file was deleted.

0 commit comments

Comments
 (0)