Skip to content

Commit ffaa6a7

Browse files
author
Jordan Ellis
committed
XboxConsole Ver 2.0.41105.0
1 parent 956e7c1 commit ffaa6a7

File tree

96 files changed

+9235
-103
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+9235
-103
lines changed

‎Documentation/XboxConsole - Getting Started Guide.docx

14.6 KB
Binary file not shown.

‎XboxConsole.Adapter.April2014/XboxConsoleAdapter.PackageManagement.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ namespace Microsoft.Internal.GamesTest.Xbox.Adapter.April2014
1313
using System.Runtime.Serialization;
1414
using System.Runtime.Serialization.Json;
1515
using System.Text;
16+
using System.Threading;
1617
using System.Threading.Tasks;
1718
using System.Xml;
1819
using Microsoft.Internal.GamesTest.Xbox.Deployment;
@@ -281,7 +282,7 @@ protected async override Task<XboxPackageDefinition> DeployPushImplAsync(string
281282

282283
// In the April 2014 XDK the format of the string returned by the XDK is a JSON object with this schema:
283284
// {"Applications":["XboxConsole.XboxSample_zjr0dfhgjwvde!App"],"Identity":{"FullName":"XboxConsole.XboxSample_1.0.0.0_x64__zjr0dfhgjwvde"}}
284-
string xdkOutput = await this.XboxXdk.DeployPushAsync(systemIpAddress, deployFilePath, removeExtraFiles, progressMetric, progressError, progressExtraFile);
285+
string xdkOutput = await this.XboxXdk.DeployPushAsync(systemIpAddress, deployFilePath, removeExtraFiles, CancellationToken.None, progressMetric, progressError, progressExtraFile);
285286

286287
DeploymentPackage package;
287288
try

‎XboxConsole.Adapter.April2014/XboxXdk.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ namespace Microsoft.Internal.GamesTest.Xbox.Adapter.April2014
1414
using System.Linq;
1515
using System.Net;
1616
using System.Runtime.InteropServices;
17+
using System.Threading;
1718
using System.Threading.Tasks;
1819
using Microsoft.Internal.GamesTest.Xbox.Deployment;
1920
using Microsoft.Internal.GamesTest.Xbox.Input;
@@ -575,11 +576,12 @@ public override IVirtualGamepad CreateXboxGamepad(string systemIpAddress)
575576
/// <param name="systemIpAddress">The tools IP address of the console.</param>
576577
/// <param name="deployFilePath">The path to the folder to deploy.</param>
577578
/// <param name="removeExtraFiles"><c>true</c> to remove any extra files, <c>false</c> otherwise.</param>
579+
/// <param name="cancellationToken">A CancellationToken to observe while waiting for the deployment to complete.</param>
578580
/// <param name="progressMetric">The progress handler that the calling app uses to receive progress updates about metrics. This may be null.</param>
579581
/// <param name="progressError">The progress handler that the calling app uses to receive progress updates about errors. This may be null.</param>
580582
/// <param name="progressExtraFile">The progress handler that the calling app uses to receive progress updates about extra files. This may be null.</param>
581583
/// <returns>The task object representing the asynchronous operation whose result is a json string describing the deployed package.</returns>
582-
public override async Task<string> DeployPushAsync(string systemIpAddress, string deployFilePath, bool removeExtraFiles, IProgress<XboxDeploymentMetric> progressMetric, IProgress<XboxDeploymentError> progressError, IProgress<XboxDeploymentExtraFile> progressExtraFile)
584+
public override async Task<string> DeployPushAsync(string systemIpAddress, string deployFilePath, bool removeExtraFiles, CancellationToken cancellationToken, IProgress<XboxDeploymentMetric> progressMetric, IProgress<XboxDeploymentError> progressError, IProgress<XboxDeploymentExtraFile> progressExtraFile)
583585
{
584586
return await Task.Run(() =>
585587
{

‎XboxConsole.Adapter.August2014/AdapterConfigurationKeyMapping.cs

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
//------------------------------------------------------------------------------
2+
// <copyright file="AdapterConfigurationKeyMapping.cs" company="Microsoft">
3+
// Copyright (c) Microsoft Corporation. All rights reserved.
4+
// </copyright>
5+
//------------------------------------------------------------------------------
6+
7+
namespace Microsoft.Internal.GamesTest.Xbox.Adapter.August2014
8+
{
9+
using System;
10+
using System.Collections.Generic;
11+
using System.Linq;
12+
using System.Text;
13+
using System.Threading.Tasks;
14+
15+
/// <summary>
16+
/// This class holds mappings for configuration keys for Global XboxConsole keys to keys for the specific XDK.
17+
/// </summary>
18+
internal static class AdapterConfigurationKeyMapping
19+
{
20+
private static readonly Dictionary<string, string> KeyMappings = new Dictionary<string, string>()
21+
{
22+
{ "SessionKey", "AccessKey" },
23+
};
24+
25+
/// <summary>
26+
/// Maps the global XboxConsole configuration key to the XDK specific key.
27+
/// </summary>
28+
/// <param name="key">The key to map.</param>
29+
/// <returns>The XDK specific key.</returns>
30+
public static string MapKey(string key)
31+
{
32+
if (KeyMappings.ContainsKey(key))
33+
{
34+
return KeyMappings[key];
35+
}
36+
else
37+
{
38+
return key;
39+
}
40+
}
41+
}
42+
}

‎XboxConsole.Adapter.August2014/GlobalSuppressions.cs

4.46 KB
Binary file not shown.

‎XboxConsole.Adapter.August2014/Properties/AssemblyInfo.cs

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
//------------------------------------------------------------------------------
2+
// <copyright file="AssemblyInfo.cs" company="Microsoft">
3+
// Copyright (c) Microsoft Corporation. All rights reserved.
4+
// </copyright>
5+
//------------------------------------------------------------------------------
6+
7+
using System;
8+
using System.Reflection;
9+
using System.Runtime.CompilerServices;
10+
using System.Runtime.InteropServices;
11+
12+
// General Information about an assembly is controlled through the following
13+
// set of attributes. Change these attribute values to modify the information
14+
// associated with an assembly.
15+
[assembly: AssemblyTitle("GamesTest.XboxConsole.Adapter.August2014")]
16+
[assembly: AssemblyDescription("GamesTest.XboxConsole.Adapter.August2014")]
17+
[assembly: AssemblyTrademark("")]
18+
[assembly: AssemblyCulture("")]
19+
20+
// Setting ComVisible to false makes the types in this assembly not visible
21+
// to COM components. If you need to access a type in this assembly from
22+
// COM, set the ComVisible attribute to true on that type.
23+
[assembly: ComVisible(false)]
24+
[assembly: CLSCompliant(false)]
25+
26+
[assembly: InternalsVisibleTo("GamesTest.XboxConsole")]
27+
[assembly: InternalsVisibleTo("GamesTest.XboxConsole.Adapter.Tests")]
28+
[assembly: InternalsVisibleTo("GamesTest.XboxConsole.TestApp")]
29+
30+
// The following GUID is for the ID of the typelib if this project is exposed to COM
31+
[assembly: Guid("51A48353-38F9-459E-BE58-62E8713E6A82")]

‎XboxConsole.Adapter.August2014/XboxConsole.Adapter.August2014.csproj

+154
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
7+
<ProjectGuid>{8EF1C23A-85B2-4EFF-AA17-19FED06F7BF6}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>Microsoft.Internal.GamesTest.Xbox.Adapter.August2014</RootNamespace>
11+
<AssemblyName>GamesTest.XboxConsole.Adapter.August2014</AssemblyName>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
<SccProjectName>SAK</SccProjectName>
15+
<SccLocalPath>SAK</SccLocalPath>
16+
<SccAuxPath>SAK</SccAuxPath>
17+
<SccProvider>SAK</SccProvider>
18+
</PropertyGroup>
19+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
20+
<DebugSymbols>true</DebugSymbols>
21+
<OutputPath>bin\x64\Debug\</OutputPath>
22+
<DefineConstants>DEBUG;TRACE</DefineConstants>
23+
<DebugType>full</DebugType>
24+
<PlatformTarget>x64</PlatformTarget>
25+
<ErrorReport>prompt</ErrorReport>
26+
<CodeAnalysisRuleSet>..\dependencies\CodeAnalysis\Level3.ruleset</CodeAnalysisRuleSet>
27+
</PropertyGroup>
28+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
29+
<OutputPath>bin\x64\Release\</OutputPath>
30+
<DefineConstants>TRACE</DefineConstants>
31+
<Optimize>true</Optimize>
32+
<DebugType>pdbonly</DebugType>
33+
<PlatformTarget>x64</PlatformTarget>
34+
<ErrorReport>prompt</ErrorReport>
35+
<CodeAnalysisRuleSet>..\dependencies\CodeAnalysis\Level3.ruleset</CodeAnalysisRuleSet>
36+
</PropertyGroup>
37+
<ItemGroup>
38+
<Reference Include="Microsoft.Xbox.Xtf">
39+
<HintPath>..\dependencies\GamesTest.ManagedXtf.2014.11.1.0.41103.0\lib\net45\Microsoft.Xbox.Xtf.dll</HintPath>
40+
</Reference>
41+
<Reference Include="Microsoft.Xbox.Xtf.Application">
42+
<HintPath>..\dependencies\GamesTest.ManagedXtf.2014.11.1.0.41103.0\lib\net45\Microsoft.Xbox.Xtf.Application.dll</HintPath>
43+
</Reference>
44+
<Reference Include="Microsoft.Xbox.Xtf.ConsoleControl">
45+
<HintPath>..\dependencies\GamesTest.ManagedXtf.2014.11.1.0.41103.0\lib\net45\Microsoft.Xbox.Xtf.ConsoleControl.dll</HintPath>
46+
</Reference>
47+
<Reference Include="Microsoft.Xbox.Xtf.ConsoleManager">
48+
<HintPath>..\dependencies\GamesTest.ManagedXtf.2014.11.1.0.41103.0\lib\net45\Microsoft.Xbox.Xtf.ConsoleManager.dll</HintPath>
49+
</Reference>
50+
<Reference Include="Microsoft.Xbox.Xtf.DebugMonitor">
51+
<HintPath>..\dependencies\GamesTest.ManagedXtf.2014.11.1.0.41103.0\lib\net45\Microsoft.Xbox.Xtf.DebugMonitor.dll</HintPath>
52+
</Reference>
53+
<Reference Include="Microsoft.Xbox.Xtf.FileIO">
54+
<HintPath>..\dependencies\GamesTest.ManagedXtf.2014.11.1.0.41103.0\lib\net45\Microsoft.Xbox.Xtf.FileIO.dll</HintPath>
55+
</Reference>
56+
<Reference Include="Microsoft.Xbox.Xtf.Input">
57+
<HintPath>..\dependencies\GamesTest.ManagedXtf.2014.11.1.0.41103.0\lib\net45\Microsoft.Xbox.Xtf.Input.dll</HintPath>
58+
</Reference>
59+
<Reference Include="Microsoft.Xbox.Xtf.Interop">
60+
<HintPath>$(DurangoXDK)\bin\Microsoft.Xbox.Xtf.Interop.dll</HintPath>
61+
<EmbedInteropTypes>False</EmbedInteropTypes>
62+
<Private>False</Private>
63+
</Reference>
64+
<Reference Include="Microsoft.Xbox.Xtf.RemoteRun">
65+
<HintPath>..\dependencies\GamesTest.ManagedXtf.2014.11.1.0.41103.0\lib\net45\Microsoft.Xbox.Xtf.RemoteRun.dll</HintPath>
66+
</Reference>
67+
<Reference Include="Microsoft.Xbox.Xtf.User">
68+
<HintPath>..\dependencies\GamesTest.ManagedXtf.2014.11.1.0.41103.0\lib\net45\Microsoft.Xbox.Xtf.User.dll</HintPath>
69+
</Reference>
70+
<Reference Include="System" />
71+
<Reference Include="System.Core" />
72+
<Reference Include="System.Runtime.Serialization" />
73+
<Reference Include="System.Xml.Linq" />
74+
<Reference Include="System.Data.DataSetExtensions" />
75+
<Reference Include="Microsoft.CSharp" />
76+
<Reference Include="System.Data" />
77+
<Reference Include="System.Xml" />
78+
</ItemGroup>
79+
<ItemGroup>
80+
<Compile Include="..\AssemblyInfoCore.cs">
81+
<Link>Properties\AssemblyInfoCore.cs</Link>
82+
</Compile>
83+
<Compile Include="AdapterConfigurationKeyMapping.cs" />
84+
<Compile Include="XboxConsoleAdapter.User.cs" />
85+
<Compile Include="GlobalSuppressions.cs" />
86+
<Compile Include="XboxConsoleAdapter.Input.cs" />
87+
<Compile Include="XboxConsoleAdapter.COMExceptionWhenConnectingHandler.cs" />
88+
<Compile Include="XboxConsoleAdapter.ExecutableManagement.cs" />
89+
<Compile Include="XboxDebugMonitorClient.cs" />
90+
<Compile Include="XboxConsoleAdapter.ConsoleControl.cs" />
91+
<Compile Include="XboxConsoleAdapter.cs" />
92+
<Compile Include="Properties\AssemblyInfo.cs" />
93+
<Compile Include="XboxConsoleAdapter.Debug.cs" />
94+
<Compile Include="XboxConsoleAdapter.FileIO.cs" />
95+
<Compile Include="XboxGamepadAdapter.cs">
96+
<ExcludeFromStyleCop>False</ExcludeFromStyleCop>
97+
</Compile>
98+
<Compile Include="XboxXdk.cs" />
99+
</ItemGroup>
100+
<ItemGroup>
101+
<ProjectReference Include="..\XboxConsole.Infrastructure\XboxConsole.Infrastructure.csproj">
102+
<Project>{e0785338-9f71-4d35-95a8-6388bc7f5518}</Project>
103+
<Name>XboxConsole.Infrastructure</Name>
104+
</ProjectReference>
105+
</ItemGroup>
106+
<ItemGroup>
107+
<Compile Include="XboxConsoleAdapter.PackageManagement.cs" />
108+
</ItemGroup>
109+
<ItemGroup>
110+
<CodeAnalysisDictionary Include="..\dependencies\CodeAnalysis\CustomDictionary.xml">
111+
<Link>CustomDictionary.xml</Link>
112+
</CodeAnalysisDictionary>
113+
</ItemGroup>
114+
<ItemGroup>
115+
<EmbeddedResource Include="..\dependencies\GamesTest.ManagedXtf.2014.11.1.0.41103.0\lib\net45\Microsoft.Xbox.Xtf.Application.dll">
116+
<Link>Microsoft.Xbox.Xtf.Application.dll</Link>
117+
</EmbeddedResource>
118+
<EmbeddedResource Include="..\dependencies\GamesTest.ManagedXtf.2014.11.1.0.41103.0\lib\net45\Microsoft.Xbox.Xtf.ConsoleControl.dll">
119+
<Link>Microsoft.Xbox.Xtf.ConsoleControl.dll</Link>
120+
</EmbeddedResource>
121+
<EmbeddedResource Include="..\dependencies\GamesTest.ManagedXtf.2014.11.1.0.41103.0\lib\net45\Microsoft.Xbox.Xtf.ConsoleManager.dll">
122+
<Link>Microsoft.Xbox.Xtf.ConsoleManager.dll</Link>
123+
</EmbeddedResource>
124+
<EmbeddedResource Include="..\dependencies\GamesTest.ManagedXtf.2014.11.1.0.41103.0\lib\net45\Microsoft.Xbox.Xtf.DebugMonitor.dll">
125+
<Link>Microsoft.Xbox.Xtf.DebugMonitor.dll</Link>
126+
</EmbeddedResource>
127+
<EmbeddedResource Include="..\dependencies\GamesTest.ManagedXtf.2014.11.1.0.41103.0\lib\net45\Microsoft.Xbox.Xtf.dll">
128+
<Link>Microsoft.Xbox.Xtf.dll</Link>
129+
</EmbeddedResource>
130+
<EmbeddedResource Include="..\dependencies\GamesTest.ManagedXtf.2014.11.1.0.41103.0\lib\net45\Microsoft.Xbox.Xtf.FileIO.dll">
131+
<Link>Microsoft.Xbox.Xtf.FileIO.dll</Link>
132+
</EmbeddedResource>
133+
<EmbeddedResource Include="..\dependencies\GamesTest.ManagedXtf.2014.11.1.0.41103.0\lib\net45\Microsoft.Xbox.Xtf.Input.dll">
134+
<Link>Microsoft.Xbox.Xtf.Input.dll</Link>
135+
</EmbeddedResource>
136+
<EmbeddedResource Include="..\dependencies\GamesTest.ManagedXtf.2014.11.1.0.41103.0\lib\net45\Microsoft.Xbox.Xtf.RemoteRun.dll">
137+
<Link>Microsoft.Xbox.Xtf.RemoteRun.dll</Link>
138+
</EmbeddedResource>
139+
<EmbeddedResource Include="..\dependencies\GamesTest.ManagedXtf.2014.11.1.0.41103.0\lib\net45\Microsoft.Xbox.Xtf.User.dll">
140+
<Link>Microsoft.Xbox.Xtf.User.dll</Link>
141+
</EmbeddedResource>
142+
</ItemGroup>
143+
<ItemGroup>
144+
<None Include="packages.config" />
145+
</ItemGroup>
146+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
147+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
148+
Other similar extension points exist, see Microsoft.Common.targets.
149+
<Target Name="BeforeBuild">
150+
</Target>
151+
<Target Name="AfterBuild">
152+
</Target>
153+
-->
154+
</Project>

0 commit comments

Comments
 (0)