microsoft
/
MixedRealityCompanionKit
зеркало из https://github.com/microsoft/MixedRealityCompanionKit.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

fix race condition when updating connection address

This commit is contained in:
David Kline (ANALOG) 2017-11-10 15:36:11 -08:00
Родитель 363ae14438
Коммит 46bf7b751f
4 изменённых файлов: 1200 добавлений и 1193 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1753
HoloLensCommander/HoloLensCommander/Controls/DeviceMonitorControlViewModel.cs
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

510
HoloLensCommander/HoloLensCommander/HoloLensCommander.csproj
Просмотреть файл

@ -1,256 +1,256 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProjectGuid>{8B5388DA-FE17-430A-85C1-5EF7C9AF0F7D}</ProjectGuid>
<OutputType>AppContainerExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>HoloLensCommander</RootNamespace>
<AssemblyName>HoloLensCommander</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion>10.0.10586.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<PackageCertificateKeyFile>HoloLensCommander_TemporaryKey.pfx</PackageCertificateKeyFile>
<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
<AppxBundle>Always</AppxBundle>
<AppxBundlePlatforms>x86</AppxBundlePlatforms>
<PackageCertificateThumbprint>A4B49ABD7F86BC59443864123563E3BB0CCBC3A9</PackageCertificateThumbprint>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<NoWarn>;2008</NoWarn>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<Optimize>true</Optimize>
<NoWarn>;2008</NoWarn>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\ARM\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<NoWarn>;2008</NoWarn>
<DebugType>full</DebugType>
<PlatformTarget>ARM</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
<OutputPath>bin\ARM\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<Optimize>true</Optimize>
<NoWarn>;2008</NoWarn>
<DebugType>pdbonly</DebugType>
<PlatformTarget>ARM</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<NoWarn>;2008</NoWarn>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<Optimize>true</Optimize>
<NoWarn>;2008</NoWarn>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
</PropertyGroup>
<ItemGroup>
<!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
<None Include="HoloLensCommander_TemporaryKey.pfx" />
<None Include="project.json" />
</ItemGroup>
<ItemGroup>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
</Compile>
<Compile Include="Controls\DeviceMonitorControl.xaml.cs">
<DependentUpon>DeviceMonitorControl.xaml</DependentUpon>
</Compile>
<Compile Include="Controls\DeviceMonitorControlViewModel.cs" />
<Compile Include="Controls\DeviceMonitorControlViewModelCommands.cs" />
<Compile Include="Controls\DeviceMonitorControlViewModelProperties.cs" />
<Compile Include="Device\DeviceMonitor.cs" />
<Compile Include="Device\DeviceMonitorCommands.cs" />
<Compile Include="Device\DeviceMonitorProperties.cs" />
<Compile Include="Dialogs\ConnectToDeviceDialog.xaml.cs">
<DependentUpon>ConnectToDeviceDialog.xaml</DependentUpon>
</Compile>
<Compile Include="Dialogs\ConnectToDeviceDialogViewModel.cs" />
<Compile Include="Dialogs\ConnectToDeviceDialogViewModelProperties.cs" />
<Compile Include="Dialogs\ConnectToDeviceDialogViewModelCommands.cs" />
<Compile Include="Dialogs\DeviceInformationDialog.xaml.cs">
<DependentUpon>DeviceInformationDialog.xaml</DependentUpon>
</Compile>
<Compile Include="Dialogs\DeviceInformationDialogViewModel.cs" />
<Compile Include="Dialogs\DeviceInformationDialogViewModelProperties.cs" />
<Compile Include="Dialogs\GetAppInstallFilesDialog.xaml.cs">
<DependentUpon>GetAppInstallFilesDialog.xaml</DependentUpon>
</Compile>
<Compile Include="Dialogs\GetAppInstallFilesDialogViewModel.cs" />
<Compile Include="Dialogs\GetAppInstallFilesDialogViewModelProperties.cs" />
<Compile Include="Dialogs\GetAppInstallFilesDialogViewModelCommands.cs" />
<Compile Include="Dialogs\ManageAppsDialogViewModel.cs" />
<Compile Include="Dialogs\ManageAppsDialogViewModelCommands.cs" />
<Compile Include="Dialogs\ManageAppsDialogViewModelProperties.cs" />
<Compile Include="Dialogs\MixedRealityViewDialogViewModel.cs" />
<Compile Include="Dialogs\MixedRealityViewDialogViewModelProperties.cs" />
<Compile Include="Dialogs\SetCredentialsDialogViewModel.cs" />
<Compile Include="Dialogs\SetCredentialsDialogViewModelProperties.cs" />
<Compile Include="Dialogs\SetIpdDialog.xaml.cs">
<DependentUpon>SetIpdDialog.xaml</DependentUpon>
</Compile>
<Compile Include="Dialogs\SetIpdDialogViewModel.cs" />
<Compile Include="Dialogs\SetIpdDialogViewModelProperties.cs" />
<Compile Include="Dialogs\SettingsDialogViewModel.cs" />
<Compile Include="Dialogs\SettingsDialogViewModelProperties.cs" />
<Compile Include="Dialogs\TagDeviceDialog.xaml.cs">
<DependentUpon>TagDeviceDialog.xaml</DependentUpon>
</Compile>
<Compile Include="Dialogs\TagDeviceDialogViewModel.cs" />
<Compile Include="Dialogs\TagDeviceDialogViewModelProperties.cs" />
<Compile Include="MainWindowViewModel.cs" />
<Compile Include="MainPage.xaml.cs">
<DependentUpon>MainPage.xaml</DependentUpon>
</Compile>
<Compile Include="MainWindowViewModelCommands.cs" />
<Compile Include="MainWindowViewModelProperties.cs" />
<Compile Include="Dialogs\MixedRealityViewDialog.xaml.cs">
<DependentUpon>MixedRealityViewDialog.xaml</DependentUpon>
</Compile>
<Compile Include="Dialogs\ManageAppsDialog.xaml.cs">
<DependentUpon>ManageAppsDialog.xaml</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Dialogs\SetCredentialsDialog.xaml.cs">
<DependentUpon>SetCredentialsDialog.xaml</DependentUpon>
</Compile>
<Compile Include="Dialogs\SettingsDialog.xaml.cs">
<DependentUpon>SettingsDialog.xaml</DependentUpon>
</Compile>
<Compile Include="Utilities\AppInstallFiles.cs" />
<Compile Include="Utilities\ConnectionInformation.cs" />
<Compile Include="Utilities\ConnectOptions.cs" />
<Compile Include="Utilities\DeviceMonitorControlComparer.cs" />
<Compile Include="Utilities\Enums.cs" />
<Compile Include="Utilities\Command.cs" />
<Compile Include="Dialogs\YesNoMessageDialog.cs" />
<Compile Include="Utilities\Settings.cs" />
<Compile Include="Utilities\TagInformation.cs" />
<Compile Include="Utilities\UserInformation.cs" />
<Compile Include="Utilities\Utilities.cs" />
</ItemGroup>
<ItemGroup>
<AppxManifest Include="Package.appxmanifest">
<SubType>Designer</SubType>
</AppxManifest>
</ItemGroup>
<ItemGroup>
<Content Include="Assets\SplashScreen.scale-200.png" />
<Content Include="Assets\Wide310x150Logo.scale-200.png" />
<Content Include="Properties\Default.rd.xml" />
<Content Include="Assets\LockScreenLogo.scale-200.png" />
<Content Include="Assets\Square150x150Logo.scale-200.png" />
<Content Include="Assets\Square44x44Logo.scale-200.png" />
<Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
<Content Include="Assets\StoreLogo.png" />
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="App.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Page Include="Controls\DeviceMonitorControl.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Dialogs\ConnectToDeviceDialog.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Dialogs\DeviceInformationDialog.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Dialogs\GetAppInstallFilesDialog.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Dialogs\SetIpdDialog.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Dialogs\TagDeviceDialog.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="MainPage.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Dialogs\MixedRealityViewDialog.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Dialogs\ManageAppsDialog.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Dialogs\SetCredentialsDialog.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Dialogs\SettingsDialog.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0' ">
<VisualStudioVersion>15.0</VisualStudioVersion>
</PropertyGroup>
<PropertyGroup />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProjectGuid>{8B5388DA-FE17-430A-85C1-5EF7C9AF0F7D}</ProjectGuid>
<OutputType>AppContainerExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>HoloLensCommander</RootNamespace>
<AssemblyName>HoloLensCommander</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion>10.0.10586.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<PackageCertificateKeyFile>HoloLensCommander_TemporaryKey.pfx</PackageCertificateKeyFile>
<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
<AppxBundle>Always</AppxBundle>
<AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
<PackageCertificateThumbprint>A4B49ABD7F86BC59443864123563E3BB0CCBC3A9</PackageCertificateThumbprint>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<NoWarn>;2008</NoWarn>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<Optimize>true</Optimize>
<NoWarn>;2008</NoWarn>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\ARM\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<NoWarn>;2008</NoWarn>
<DebugType>full</DebugType>
<PlatformTarget>ARM</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
<OutputPath>bin\ARM\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<Optimize>true</Optimize>
<NoWarn>;2008</NoWarn>
<DebugType>pdbonly</DebugType>
<PlatformTarget>ARM</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<NoWarn>;2008</NoWarn>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<Optimize>true</Optimize>
<NoWarn>;2008</NoWarn>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
</PropertyGroup>
<ItemGroup>
<!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
<None Include="HoloLensCommander_TemporaryKey.pfx" />
<None Include="project.json" />
</ItemGroup>
<ItemGroup>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
</Compile>
<Compile Include="Controls\DeviceMonitorControl.xaml.cs">
<DependentUpon>DeviceMonitorControl.xaml</DependentUpon>
</Compile>
<Compile Include="Controls\DeviceMonitorControlViewModel.cs" />
<Compile Include="Controls\DeviceMonitorControlViewModelCommands.cs" />
<Compile Include="Controls\DeviceMonitorControlViewModelProperties.cs" />
<Compile Include="Device\DeviceMonitor.cs" />
<Compile Include="Device\DeviceMonitorCommands.cs" />
<Compile Include="Device\DeviceMonitorProperties.cs" />
<Compile Include="Dialogs\ConnectToDeviceDialog.xaml.cs">
<DependentUpon>ConnectToDeviceDialog.xaml</DependentUpon>
</Compile>
<Compile Include="Dialogs\ConnectToDeviceDialogViewModel.cs" />
<Compile Include="Dialogs\ConnectToDeviceDialogViewModelProperties.cs" />
<Compile Include="Dialogs\ConnectToDeviceDialogViewModelCommands.cs" />
<Compile Include="Dialogs\DeviceInformationDialog.xaml.cs">
<DependentUpon>DeviceInformationDialog.xaml</DependentUpon>
</Compile>
<Compile Include="Dialogs\DeviceInformationDialogViewModel.cs" />
<Compile Include="Dialogs\DeviceInformationDialogViewModelProperties.cs" />
<Compile Include="Dialogs\GetAppInstallFilesDialog.xaml.cs">
<DependentUpon>GetAppInstallFilesDialog.xaml</DependentUpon>
</Compile>
<Compile Include="Dialogs\GetAppInstallFilesDialogViewModel.cs" />
<Compile Include="Dialogs\GetAppInstallFilesDialogViewModelProperties.cs" />
<Compile Include="Dialogs\GetAppInstallFilesDialogViewModelCommands.cs" />
<Compile Include="Dialogs\ManageAppsDialogViewModel.cs" />
<Compile Include="Dialogs\ManageAppsDialogViewModelCommands.cs" />
<Compile Include="Dialogs\ManageAppsDialogViewModelProperties.cs" />
<Compile Include="Dialogs\MixedRealityViewDialogViewModel.cs" />
<Compile Include="Dialogs\MixedRealityViewDialogViewModelProperties.cs" />
<Compile Include="Dialogs\SetCredentialsDialogViewModel.cs" />
<Compile Include="Dialogs\SetCredentialsDialogViewModelProperties.cs" />
<Compile Include="Dialogs\SetIpdDialog.xaml.cs">
<DependentUpon>SetIpdDialog.xaml</DependentUpon>
</Compile>
<Compile Include="Dialogs\SetIpdDialogViewModel.cs" />
<Compile Include="Dialogs\SetIpdDialogViewModelProperties.cs" />
<Compile Include="Dialogs\SettingsDialogViewModel.cs" />
<Compile Include="Dialogs\SettingsDialogViewModelProperties.cs" />
<Compile Include="Dialogs\TagDeviceDialog.xaml.cs">
<DependentUpon>TagDeviceDialog.xaml</DependentUpon>
</Compile>
<Compile Include="Dialogs\TagDeviceDialogViewModel.cs" />
<Compile Include="Dialogs\TagDeviceDialogViewModelProperties.cs" />
<Compile Include="MainWindowViewModel.cs" />
<Compile Include="MainPage.xaml.cs">
<DependentUpon>MainPage.xaml</DependentUpon>
</Compile>
<Compile Include="MainWindowViewModelCommands.cs" />
<Compile Include="MainWindowViewModelProperties.cs" />
<Compile Include="Dialogs\MixedRealityViewDialog.xaml.cs">
<DependentUpon>MixedRealityViewDialog.xaml</DependentUpon>
</Compile>
<Compile Include="Dialogs\ManageAppsDialog.xaml.cs">
<DependentUpon>ManageAppsDialog.xaml</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Dialogs\SetCredentialsDialog.xaml.cs">
<DependentUpon>SetCredentialsDialog.xaml</DependentUpon>
</Compile>
<Compile Include="Dialogs\SettingsDialog.xaml.cs">
<DependentUpon>SettingsDialog.xaml</DependentUpon>
</Compile>
<Compile Include="Utilities\AppInstallFiles.cs" />
<Compile Include="Utilities\ConnectionInformation.cs" />
<Compile Include="Utilities\ConnectOptions.cs" />
<Compile Include="Utilities\DeviceMonitorControlComparer.cs" />
<Compile Include="Utilities\Enums.cs" />
<Compile Include="Utilities\Command.cs" />
<Compile Include="Dialogs\YesNoMessageDialog.cs" />
<Compile Include="Utilities\Settings.cs" />
<Compile Include="Utilities\TagInformation.cs" />
<Compile Include="Utilities\UserInformation.cs" />
<Compile Include="Utilities\Utilities.cs" />
</ItemGroup>
<ItemGroup>
<AppxManifest Include="Package.appxmanifest">
<SubType>Designer</SubType>
</AppxManifest>
</ItemGroup>
<ItemGroup>
<Content Include="Assets\SplashScreen.scale-200.png" />
<Content Include="Assets\Wide310x150Logo.scale-200.png" />
<Content Include="Properties\Default.rd.xml" />
<Content Include="Assets\LockScreenLogo.scale-200.png" />
<Content Include="Assets\Square150x150Logo.scale-200.png" />
<Content Include="Assets\Square44x44Logo.scale-200.png" />
<Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
<Content Include="Assets\StoreLogo.png" />
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="App.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Page Include="Controls\DeviceMonitorControl.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Dialogs\ConnectToDeviceDialog.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Dialogs\DeviceInformationDialog.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Dialogs\GetAppInstallFilesDialog.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Dialogs\SetIpdDialog.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Dialogs\TagDeviceDialog.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="MainPage.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Dialogs\MixedRealityViewDialog.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Dialogs\ManageAppsDialog.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Dialogs\SetCredentialsDialog.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Dialogs\SettingsDialog.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0' ">
<VisualStudioVersion>15.0</VisualStudioVersion>
</PropertyGroup>
<PropertyGroup />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

66
HoloLensCommander/HoloLensCommander/Package.appxmanifest
Просмотреть файл

@ -1,34 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
<Identity Name="HoloLensCommander" Publisher="CN=HoloLensCommander" Version="2.1706.0.0" />
<mp:PhoneIdentity PhoneProductId="2ddfe2f3-79a6-4751-9a5c-56c49317682a" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>Windows Mixed Reality Commander</DisplayName>
<PublisherDisplayName>HoloLensCommander</PublisherDisplayName>
<Logo>Assets\StoreLogo.png</Logo>
</Properties>
<Dependencies>
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
</Dependencies>
<Resources>
<Resource Language="x-generate" />
</Resources>
<Applications>
<Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="HoloLensCommander.App">
<uap:VisualElements DisplayName="Windows Mixed Reality Commander" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="Application to monitor and manage multiple Windows Mixed Reality devices." BackgroundColor="transparent">
<uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png">
<uap:ShowNameOnTiles>
<uap:ShowOn Tile="wide310x150Logo" />
</uap:ShowNameOnTiles>
</uap:DefaultTile>
<uap:SplashScreen Image="Assets\SplashScreen.png" />
</uap:VisualElements>
</Application>
</Applications>
<Capabilities>
<Capability Name="internetClient" />
<Capability Name="privateNetworkClientServer" />
<uap:Capability Name="removableStorage" />
<uap:Capability Name="picturesLibrary" />
</Capabilities>
<?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
<Identity Name="HoloLensCommander" Publisher="CN=HoloLensCommander" Version="2.1706.2.0" />
<mp:PhoneIdentity PhoneProductId="2ddfe2f3-79a6-4751-9a5c-56c49317682a" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>Windows Mixed Reality Commander</DisplayName>
<PublisherDisplayName>HoloLensCommander</PublisherDisplayName>
<Logo>Assets\StoreLogo.png</Logo>
</Properties>
<Dependencies>
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
</Dependencies>
<Resources>
<Resource Language="x-generate" />
</Resources>
<Applications>
<Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="HoloLensCommander.App">
<uap:VisualElements DisplayName="Windows Mixed Reality Commander" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="Application to monitor and manage multiple Windows Mixed Reality devices." BackgroundColor="transparent">
<uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png">
<uap:ShowNameOnTiles>
<uap:ShowOn Tile="wide310x150Logo" />
</uap:ShowNameOnTiles>
</uap:DefaultTile>
<uap:SplashScreen Image="Assets\SplashScreen.png" />
</uap:VisualElements>
</Application>
</Applications>
<Capabilities>
<Capability Name="internetClient" />
<Capability Name="privateNetworkClientServer" />
<uap:Capability Name="removableStorage" />
<uap:Capability Name="picturesLibrary" />
</Capabilities>
</Package>

64
HoloLensCommander/HoloLensCommander/Properties/AssemblyInfo.cs
Просмотреть файл

@ -1,32 +1,32 @@
using System.Resources;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("HoloLensCommander")]
[assembly: AssemblyDescription("Monitor and manage multiple Windows Mixed Reality devices.")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("HoloLensCommander")]
[assembly: AssemblyCopyright("Copyright © 2016-2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.1706.0.0")]
[assembly: AssemblyFileVersion("2.1706.0.0")]
[assembly: ComVisible(false)]
[assembly: NeutralResourcesLanguage("en-US")]
using System.Resources;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("HoloLensCommander")]
[assembly: AssemblyDescription("Monitor and manage multiple Windows Mixed Reality devices.")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("HoloLensCommander")]
[assembly: AssemblyCopyright("Copyright © 2016-2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.1706.1.0")]
[assembly: AssemblyFileVersion("2.1706.1.0")]
[assembly: ComVisible(false)]
[assembly: NeutralResourcesLanguage("en-US")]